Merge pull request #21 from GemeenteUtrecht/openzaak-chart-enhancements

Enhancements for Open-Zaak chart
open-zaak · Mar 2, 2022 · 5e0cbd6 · 5e0cbd6
2 parents 84bb54e + 3f9de00
commit 5e0cbd6
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 2 deletions.
diff --git a/charts/open-zaak/Chart.yaml b/charts/open-zaak/Chart.yaml
@@ -3,7 +3,7 @@ name: open-zaak
 description: Productiewaardige API's voor Zaakgericht Werken
 
 type: application
-version: 0.5.1
+version: 0.6.0
 appVersion: "1.5.0"
 
 dependencies:

diff --git a/charts/open-zaak/README.md b/charts/open-zaak/README.md
@@ -44,6 +44,7 @@ table below describes the supported versions
 | `image.repository` | The repository of the Docker image | `openzaak/open-zaak` |
 | `image.tag` | The tag of the Docker image | `""` uses `.Chart.AppVersion` by default |
 | `replicaCount` | The number of replicas | `1` |
+| `podLabels` | Additional labels to be set on the open-zaak pods | `{}` |
 | `ingress.enabled` | Expose the application through an ingress | `false` |
 | `ingress.annotations` | Additional annotations on the API ingress | `{}` |
 | `ingress.hosts` | Ingress hosts | `"{open-zaak.gemeente.nl}"` |
@@ -52,6 +53,7 @@ table below describes the supported versions
 | `persistence.storageClassName` | Storage class name for the PVC creation, must support RWX | `""` |
 | `persistence.size` | The size of the application media persistent volume | `"1Gi"` |
 | `persistence.existingClaim` | Use an existing claim for application media | `null` |
+| `existingSecret` | Refer to an existing secret to avoid managing secrets through Helm. See templates/secret.yaml for required contents of your existing secret | `null` |
 | `initContainers.volumePerms` | Run the file-permission fix init container (for upgrades from Open Zaak < 1.5) | `true` |
 | `settings.allowedHosts` | A comma-separated list of hosts allowed by the application | `"open-zaak.gemeente.nl"` |
 | `settings.useXForwardedHost` | Whether to rely on the `X-Forwarded-Host` header from ingress for host detection | `false` |
@@ -74,6 +76,7 @@ table below describes the supported versions
 | `settings.sentry.dsn` | The DSN for Sentry Logging | `""` |
 | `settings.isHttps` | Used to construct absolute URLs and controls a variety of security settings | `true` |
 | `settings.debug` | Only set this to True on a local development environment. Various other security settings are derived from this setting | `false` |
+| `nginx.podLabels` | Additional labels to be set on the nginx pods | `{}` |
 | `postgresql.persistence.enabled` | Enable PostgreSQL persistency | `false` |
 | `postgresql.persistence.size` | Configure PostgreSQL size | `"1Gi"` |
 | `postgresql.persistence.existingClaim` | Use an existing persistent volume claim | `null` |

diff --git a/charts/open-zaak/templates/deployment.yaml b/charts/open-zaak/templates/deployment.yaml
@@ -21,6 +21,9 @@ spec:
       {{- end }}
       labels:
     {{- include "open-zaak.selectorLabels" . | nindent 8 }}
+    {{- with .Values.podLabels }}
+        {{- toYaml . | nindent 8 }}
+    {{- end }}
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:
@@ -52,7 +55,7 @@ spec:
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           envFrom:
             - secretRef:
-                name: {{ include "open-zaak.fullname" . }}
+                name: {{ .Values.existingSecret | default (include "open-zaak.fullname" .) }}
             - configMapRef:
                 name: {{ include "open-zaak.fullname" . }}
           ports:
@@ -125,6 +128,9 @@ spec:
         {{- end }}
       labels:
         {{- include "open-zaak.nginxSelectorLabels" . | nindent 8 }}
+        {{- with .Values.nginx.podLabels }}
+            {{- toYaml . | nindent 8 }}
+        {{- end }}
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:

diff --git a/charts/open-zaak/templates/secret.yaml b/charts/open-zaak/templates/secret.yaml
@@ -1,3 +1,4 @@
+{{- if not .Values.existingSecret }}
 apiVersion: v1
 kind: Secret
 metadata:
@@ -14,3 +15,4 @@ data:
   {{- if .Values.settings.sentry.dsn }}
   SENTRY_DSN: {{ .Values.settings.sentry.dsn | toString | b64enc | quote }}
   {{- end }}
+{{- end }}
diff --git a/charts/open-zaak/values.yaml b/charts/open-zaak/values.yaml
@@ -23,6 +23,8 @@ serviceAccount:
 
 podAnnotations: {}
 
+podLabels: {}
+
 podSecurityContext:
   fsGroup: 1000
 
@@ -95,6 +97,8 @@ persistence:
   storageClassName: ''
   existingClaim: null
 
+existingSecret: null
+
 settings:
   allowedHosts: open-zaak.gemeente.nl
   useXForwardedHost: false
@@ -138,6 +142,7 @@ nginx:
     pullPolicy: IfNotPresent
     tag: stable
   replicaCount: 1
+  podLabels: {}
   securityContext:
     capabilities:
       drop: