update also cron runner and consumer

ConductionNL · Apr 23, 2024 · fe98d2d · fe98d2d
1 parent 29c8e34
commit fe98d2d
Show file tree

Hide file tree

Showing 4 changed files with 92 additions and 58 deletions.
diff --git a/api/helm/commonground-gateway-1.5.6.tgz b/api/helm/commonground-gateway-1.5.6.tgz
diff --git a/api/helm/commonground-gateway/templates/consumer.yaml b/api/helm/commonground-gateway/templates/consumer.yaml
@@ -53,6 +53,13 @@ spec:
         - name: vendor
           persistentVolumeClaim:
               claimName: {{ include "commonground-gateway.fullname" . }}-vendor
+        {{-  if .Values.security.postgresCert }}
+        -   name: postgres-certificate
+            projected:
+                sources:
+                    -   secret:
+                            name: {{ include "commonground-gateway.fullname" . }}-postgresCert
+          {{- end }}
       initContainers:
           - name: {{ include "commonground-gateway.fullname" . }}-init
             securityContext:
@@ -86,7 +93,13 @@ spec:
             - mountPath: /var/run/idp
               name: idp-certificate
               readOnly: true
-            {{- end }}            
+            {{- end }}
+            {{- if .Values.security.postgresCert }}
+            - mountPath: /srv/api/var/certs/postgres.crt
+              subPath: certificate.crt
+              name: postgres-certificate
+              readOnly: true
+            {{- end }}     
             - mountPath: /srv/api/vendor
               subPath: vendor
               name: vendor
@@ -161,6 +174,8 @@ spec:
                 secretKeyRef:
                   key: database-url
                   name: {{ include "commonground-gateway.fullname" . }}
+            - name: DATABASE_ROOT_CERT
+              value: /srv/api/var/certs/postgres.crt
             - name: CACHE_URL
               valueFrom:
                   secretKeyRef:
@@ -247,6 +262,8 @@ spec:
                 configMapKeyRef:
                   key: redis-port
                   name: {{ include "commonground-gateway.fullname" . }}
+            - name: REDIS_PROTOCOL
+              value: {{ .Values.security.redisProtocol }}
             {{- end }}
             - name: SAML_ENABLED
               valueFrom:

diff --git a/api/helm/commonground-gateway/templates/cron-runner.yaml b/api/helm/commonground-gateway/templates/cron-runner.yaml
@@ -60,7 +60,14 @@ spec:
                   - name: vendor
                     persistentVolumeClaim:
                         claimName: {{ include "commonground-gateway.fullname" . }}-vendor
-
+
+                {{-  if .Values.security.postgresCert }}
+                  -   name: postgres-certificate
+                      projected:
+                          sources:
+                              -   secret:
+                                      name: {{ include "commonground-gateway.fullname" . }}-postgresCert
+                  {{- end }}
               initContainers:
                   - name: {{ include "commonground-gateway.fullname" . }}-init
                     securityContext:
@@ -120,6 +127,12 @@ spec:
                           subPath: bundles.php
                           name: vendor
                           readOnly: false
+                        {{- if .Values.security.postgresCert }}
+                        - mountPath: /srv/api/var/certs/postgres.crt
+                          subPath: certificate.crt
+                          name: postgres-certificate
+                          readOnly: true
+                        {{- end }}
                     args:
                         - bin/console
                         - cronjob:command
@@ -169,6 +182,8 @@ spec:
                               secretKeyRef:
                                   key: database-url
                                   name: {{ include "commonground-gateway.fullname" . }}
+                        - name: DATABASE_ROOT_CERT
+                          value: /srv/api/var/certs/postgres.crt
                         - name: CACHE_URL
                           valueFrom:
                               secretKeyRef:
@@ -257,6 +272,8 @@ spec:
                               configMapKeyRef:
                                   key: redis-port
                                   name: {{ include "commonground-gateway.fullname" . }}
+                        - name: REDIS_PROTOCOL
+                          value: {{ .Values.security.redisProtocol }}
                         {{- end }}
                         - name: SAML_ENABLED
                           valueFrom: