Provide /var/lib/openqa/share mount point in helm charts

Some work on the worker charts. The worker container is configured to wait for
the webui pods before try to run itself. in its configuration will try to
connect using the internal Kubernetes network. However it fails to connect as
for now. This is might be due to the ingress-nginx and because the webui
container sets up an apache proxy.

poo: https://progress.opensuse.org/issues/183608
Signed-off-by: Ioannis Bonatakis <[email protected]>

Author: d3flex

container/helm/charts/webui/templates/configmap.yaml

@@ -17,6 +17,10 @@ data:
     [{{ .Chart.Name }}-websockets]
     key = {{ .Values.key }}
     secret = {{ .Values.secret }}
+
+    [{{ .Release.Name }}-webui:9529]
+    key = {{ .Values.key }}
+    secret = {{ .Values.secret }}
   database_ini: |
     [production]
     dsn = DBI:Pg:dbname={{ .Values.postgresql.auth.database }};host=db;user={{ .Values.postgresql.auth.username }};password={{ .Values.postgresql.auth.password }}
@@ -30,7 +34,7 @@ data:
     base_url = {{ .Values.useHttps | ternary "https://" "http://" }}{{ .Values.baseUrl }}
 
     [auth]
-    method = OpenID
+    method = Fake
 
     [logging]
     level = info

container/helm/charts/webui/templates/deployment.yaml

@@ -20,6 +20,12 @@ spec:
         - name: wait-for-db
           image: "postgres:latest"
           command: ["sh", "-c", "until pg_isready -h db -p 5432; do echo waiting for database; sleep 2; done;"]
+        - name: setup-factory-dirs
+          image: "busybox:latest"
+          command: ["sh", "-c", "mkdir -p /var/lib/openqa/share/factory/hdd /var/lib/openqa/share/factory/iso /var/lib/openqa/share/factory/repos /var/lib/openqa/share/factory/tmp /var/lib/openqa/share/factory/other"]
+          volumeMounts:
+            - name: factory-data
+              mountPath: /var/lib/openqa/share/factory
       containers:
         # Future enhancement option: a container with rsync for setup with cache service
         - name: {{ include "webui.fullname" . }}-scheduler
@@ -109,6 +115,8 @@ spec:
             - name: config
               mountPath: /data/conf
               readOnly: true
+            - name: factory-data
+              mountPath: /var/lib/openqa/share/factory
           env:
             - name: MODE
               value: "webui"
@@ -135,3 +143,5 @@ spec:
                 path: openqa.ini
               - key: database_ini
                 path: database.ini
+        - name: factory-data
+          emptyDir: {}

container/helm/charts/worker/templates/configmap.yaml

@@ -7,7 +7,7 @@ metadata:
 data:
   workers_ini: |
     [global]
-    HOST = {{ .Values.openqa.host }}
+    HOST = {{ .Release.Name }}-webui:9529
     BACKEND = qemu
     {{ if .Values.workerClass -}}
     WORKER_CLASS = {{ .Values.workerClass }}
@@ -21,6 +21,9 @@ data:
     TESTPOOLSERVER = rsync://{{ .Values.openqa.host }}/tests
     {{ end }}
   client_conf: |
-    [{{ .Values.openqa.host }}]
+    [localhost]
+    key = {{ .Values.openqa.key }}
+    secret = {{ .Values.openqa.secret }}
+    [{{ .Release.Name }}-webui:9529]
     key = {{ .Values.openqa.key }}
     secret = {{ .Values.openqa.secret }}

container/helm/charts/worker/templates/deployment.yaml

@@ -16,6 +16,10 @@ spec:
       labels:
         {{- include "worker.selectorLabels" . | nindent 8 }}
     spec:
+      initContainers:
+        - name: wait-for-webui
+          image: busybox:latest
+          command: ['sh', '-c', 'until nc -vz {{ .Release.Name }}-webui 9526; do echo "Waiting for webui service"; sleep 15; done;']
       # Future enhancement option: initContainer for git-pulling tests into /data
       containers:
         {{ if .Values.cacheService -}}

container/helm/charts/worker/values.yaml

@@ -4,7 +4,6 @@ image:
   pullPolicy: Always
   tag: "latest"
 openqa:
-  host: openqa.host.org
   key: 1234567890ABCDEF
   secret: 1234567890ABCDEF
 cacheService: false