[Helm] Use hash trick to restart on config/creds changes

meln5674 · Oct 7, 2022 · f87dc94 · f87dc94
1 parent 8361005
commit f87dc94
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 6 deletions.
diff --git a/deploy/helm/nexus-oidc-proxy/templates/configmap.yaml b/deploy/helm/nexus-oidc-proxy/templates/configmap.yaml
@@ -1,11 +1,15 @@
+{{- define "nexus-oidc-proxy.configMapContents" -}}
+data:
+  '{{ .Values.config.existingConfigMap.key }}': |-
+    {{- .Values.config.yaml | toYaml | nindent 4 }}
+{{- end -}}
+
 {{- if not .Values.config.existingConfigMap.name }}
 apiVersion: v1
 kind: ConfigMap
 metadata:
   name: {{ include "nexus-oidc-proxy.configMapName" . }}
   labels:
     {{ include "nexus-oidc-proxy.labels" . | nindent 4 }}
-data:
-  '{{ .Values.config.existingConfigMap.key }}': |-
-    {{- .Values.config.yaml | toYaml | nindent 4 }}
+{{ include "nexus-oidc-proxy.configMapContents" . }}
 {{- end }}
diff --git a/deploy/helm/nexus-oidc-proxy/templates/deployment.yaml b/deploy/helm/nexus-oidc-proxy/templates/deployment.yaml
@@ -19,6 +19,12 @@ spec:
       {{- end }}
       labels:
         {{- include "nexus-oidc-proxy.selectorLabels" . | nindent 8 }}
+        {{- if not .Values.credentials.existingSecret.name }}
+        nexus-oidc-proxy/secret-hash: {{ include "nexus-oidc-proxy.secretContents" . | adler32sum }}
+        {{- end }}
+        {{- if not .Values.config.existingConfigMap.name }}
+        nexus-oidc-proxy/configmap-hash: {{ include "nexus-oidc-proxy.configMapContents" . | adler32sum }}
+        {{- end }}
     spec:
       {{- with .Values.imagePullSecrets }}
       imagePullSecrets:

diff --git a/deploy/helm/nexus-oidc-proxy/templates/secret.yaml b/deploy/helm/nexus-oidc-proxy/templates/secret.yaml
@@ -1,11 +1,15 @@
+{{- define "nexus-oidc-proxy.secretContents" -}}
+stringData:
+  '{{ .Values.credentials.existingSecret.usernameKey }}': '{{ .Values.credentials.username }}'
+  '{{ .Values.credentials.existingSecret.passwordKey }}': '{{ .Values.credentials.password }}'
+{{- end -}}
+
 {{- if not .Values.credentials.existingSecret.name }}
 apiVersion: v1
 kind: Secret
 metadata:
   name: {{ include "nexus-oidc-proxy.secretName" . }}
   labels:
     {{ include "nexus-oidc-proxy.labels" . | nindent 4 }}
-stringData:
-  '{{ .Values.credentials.existingSecret.usernameKey }}': '{{ .Values.credentials.username }}'
-  '{{ .Values.credentials.existingSecret.passwordKey }}': '{{ .Values.credentials.password }}'
+{{ include "nexus-oidc-proxy.secretContents" . }}
 {{- end }}