cleanup a bit the qwc-data storage stuff

camptocamp · Feb 1, 2023 · d761978 · d761978
1 parent 42e7f58
commit d761978
Show file tree

Hide file tree

Showing 5 changed files with 226 additions and 77 deletions.
diff --git a/Chart.yaml b/Chart.yaml
@@ -7,8 +7,8 @@ dependencies:
   - name: custom-pod
     repository: https://camptocamp.github.io/helm-custom-pod/
     alias: qgis
-    version: 0.4.2
+    version: 0.4.3
   - name: custom-pod
     repository: https://camptocamp.github.io/helm-custom-pod/
     alias: qwc
-    version: 0.4.2
+    version: 0.4.3
diff --git a/Makefile b/Makefile
@@ -1,8 +1,8 @@
 HELM ?= helm
 
 gen-expected:
-	${HELM} template --namespace=default qwc . > tests/expected.yaml || \
-		${HELM} template --debug --namespace=default qwc .
+	${HELM} template --namespace=default --values=tests/values-emptydir.yaml qwc . > tests/expected.yaml || \
+		${HELM} template --debug --namespace=default --values=tests/values-emptydir.yaml qwc .
 	sed -i 's/[[:blank:]]\+$$//g'  tests/expected.yaml
 
 #start-local:

diff --git a/tests/expected.yaml b/tests/expected.yaml
@@ -249,7 +249,7 @@ data:
   # retrieve the secret data using lookup function and when not exists, return an empty dictionary / map as result
   # set $jwtSecret to existing secret data or generate a random one when not exists
   # generate 32 chars long random string, base64 encode it and then double-quote the result string.
-  JWT_SECRET_KEY: "TkRaTVJGQlBVbVExUmpoMGRtaExiVEZNYTJkNVozbG5OVlZIVEdOUFVrND0="
+  JWT_SECRET_KEY: "Wm5sMmNtMUdObVpOY2pKeWN6Y3lVR0pQTlhGWFNHWlNSMlpWZWtWcGJtRT0="
 ---
 # Source: qwc/templates/pg-conf-secret.yaml
 apiVersion: v1
@@ -265,7 +265,7 @@ data:
 apiVersion: v1
 kind: Service
 metadata:
-  name: qwc-qgis-qgis-serv
+  name: qwc-qgis-server
   labels:
     helm.sh/chart: qgis
     app.kubernetes.io/version: "1.0"
@@ -667,14 +667,6 @@ spec:
               name: v-qwc-data
               readOnly: true
               subPath: qgs-resources
-            - mountPath: /srv/pg_service.conf
-              name: pg-service-conf-secret
-              readOnly: true
-              subPath: pg_service.conf
-            - mountPath: /srv/qwc_service/config
-              name: v-qwc-data
-              readOnly: true
-              subPath: config
 
           ports:
             - name: http
@@ -687,10 +679,6 @@ spec:
             - key: pg_service_conf
               path: pg_service.conf
             secretName: pg-service-conf-secret
-        - name: v-qwc-data
-          persistentVolumeClaim:
-            claimName: pvc-qwc-data
-            readOnly: true
 ---
 # Source: qwc/charts/qwc/templates/deployment.yaml
 apiVersion: apps/v1
@@ -760,7 +748,6 @@ spec:
               subPath: pg_service.conf
             - mountPath: /srv/qwc_service/config
               name: v-qwc-data
-              readOnly: true
               subPath: config
 
           ports:
@@ -843,7 +830,6 @@ spec:
               subPath: pg_service.conf
             - mountPath: /srv/qwc_service/config
               name: v-qwc-data
-              readOnly: true
               subPath: config
 
           ports:
@@ -858,10 +844,6 @@ spec:
             - key: pg_service_conf
               path: pg_service.conf
             secretName: pg-service-conf-secret
-        - name: v-qwc-data
-          persistentVolumeClaim:
-            claimName: pvc-qwc-data
-            readOnly: true
 ---
 # Source: qwc/charts/qwc/templates/deployment.yaml
 apiVersion: apps/v1
@@ -931,7 +913,6 @@ spec:
               subPath: pg_service.conf
             - mountPath: /srv/qwc_service/config
               name: v-qwc-data
-              readOnly: true
               subPath: config
             - mountPath: /srv/qwc_service/config-in
               name: v-qwc-data
@@ -1021,7 +1002,6 @@ spec:
               subPath: pg_service.conf
             - mountPath: /srv/qwc_service/config
               name: v-qwc-data
-              readOnly: true
               subPath: config
 
           ports:
@@ -1036,10 +1016,6 @@ spec:
             - key: pg_service_conf
               path: pg_service.conf
             secretName: pg-service-conf-secret
-        - name: v-qwc-data
-          persistentVolumeClaim:
-            claimName: pvc-qwc-data
-            readOnly: true
 ---
 # Source: qwc/charts/qwc/templates/deployment.yaml
 apiVersion: apps/v1
@@ -1101,7 +1077,6 @@ spec:
               subPath: pg_service.conf
             - mountPath: /srv/qwc_service/config
               name: v-qwc-data
-              readOnly: true
               subPath: config
 
           ports:
@@ -1116,10 +1091,6 @@ spec:
             - key: pg_service_conf
               path: pg_service.conf
             secretName: pg-service-conf-secret
-        - name: v-qwc-data
-          persistentVolumeClaim:
-            claimName: pvc-qwc-data
-            readOnly: true
 ---
 # Source: qwc/charts/qwc/templates/deployment.yaml
 apiVersion: apps/v1
@@ -1179,7 +1150,6 @@ spec:
               subPath: pg_service.conf
             - mountPath: /srv/qwc_service/config
               name: v-qwc-data
-              readOnly: true
               subPath: config
 
           ports:
@@ -1194,10 +1164,6 @@ spec:
             - key: pg_service_conf
               path: pg_service.conf
             secretName: pg-service-conf-secret
-        - name: v-qwc-data
-          persistentVolumeClaim:
-            claimName: pvc-qwc-data
-            readOnly: true
 ---
 # Source: qwc/charts/qwc/templates/deployment.yaml
 apiVersion: apps/v1
@@ -1259,7 +1225,6 @@ spec:
               subPath: pg_service.conf
             - mountPath: /srv/qwc_service/config
               name: v-qwc-data
-              readOnly: true
               subPath: config
 
           ports:
@@ -1274,10 +1239,6 @@ spec:
             - key: pg_service_conf
               path: pg_service.conf
             secretName: pg-service-conf-secret
-        - name: v-qwc-data
-          persistentVolumeClaim:
-            claimName: pvc-qwc-data
-            readOnly: true
 ---
 # Source: qwc/charts/qwc/templates/deployment.yaml
 apiVersion: apps/v1
@@ -1339,7 +1300,6 @@ spec:
               subPath: pg_service.conf
             - mountPath: /srv/qwc_service/config
               name: v-qwc-data
-              readOnly: true
               subPath: config
 
           ports:
@@ -1354,10 +1314,6 @@ spec:
             - key: pg_service_conf
               path: pg_service.conf
             secretName: pg-service-conf-secret
-        - name: v-qwc-data
-          persistentVolumeClaim:
-            claimName: pvc-qwc-data
-            readOnly: true
 ---
 # Source: qwc/charts/qwc/templates/deployment.yaml
 apiVersion: apps/v1
@@ -1417,7 +1373,6 @@ spec:
               subPath: pg_service.conf
             - mountPath: /srv/qwc_service/config
               name: v-qwc-data
-              readOnly: true
               subPath: config
 
           ports:
@@ -1432,10 +1387,6 @@ spec:
             - key: pg_service_conf
               path: pg_service.conf
             secretName: pg-service-conf-secret
-        - name: v-qwc-data
-          persistentVolumeClaim:
-            claimName: pvc-qwc-data
-            readOnly: true
 ---
 # Source: qwc/charts/qwc/templates/deployment.yaml
 apiVersion: apps/v1
@@ -1497,7 +1448,6 @@ spec:
               subPath: pg_service.conf
             - mountPath: /srv/qwc_service/config
               name: v-qwc-data
-              readOnly: true
               subPath: config
 
           ports:
@@ -1512,10 +1462,6 @@ spec:
             - key: pg_service_conf
               path: pg_service.conf
             secretName: pg-service-conf-secret
-        - name: v-qwc-data
-          persistentVolumeClaim:
-            claimName: pvc-qwc-data
-            readOnly: true
 ---
 # Source: qwc/charts/qwc/templates/deployment.yaml
 apiVersion: apps/v1
@@ -1577,7 +1523,6 @@ spec:
               subPath: pg_service.conf
             - mountPath: /srv/qwc_service/config
               name: v-qwc-data
-              readOnly: true
               subPath: config
 
           ports:
@@ -1592,10 +1537,6 @@ spec:
             - key: pg_service_conf
               path: pg_service.conf
             secretName: pg-service-conf-secret
-        - name: v-qwc-data
-          persistentVolumeClaim:
-            claimName: pvc-qwc-data
-            readOnly: true
 ---
 # Source: qwc/charts/qwc/templates/deployment.yaml
 apiVersion: apps/v1
@@ -1657,7 +1598,6 @@ spec:
               subPath: pg_service.conf
             - mountPath: /srv/qwc_service/config
               name: v-qwc-data
-              readOnly: true
               subPath: config
 
           ports:
@@ -1672,10 +1612,6 @@ spec:
             - key: pg_service_conf
               path: pg_service.conf
             secretName: pg-service-conf-secret
-        - name: v-qwc-data
-          persistentVolumeClaim:
-            claimName: pvc-qwc-data
-            readOnly: true
 ---
 # Source: qwc/charts/qwc/templates/deployment.yaml
 apiVersion: apps/v1
@@ -1739,7 +1675,6 @@ spec:
               subPath: pg_service.conf
             - mountPath: /srv/qwc_service/config
               name: v-qwc-data
-              readOnly: true
               subPath: config
             - mountPath: /var/solr
               name: v-qwc-data