Merge pull request #1 from discord-gophers/helm

support existing secrets

Author: svenwiltink

charts/noncer/Chart.yaml

@@ -15,7 +15,7 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 0.0.3
+version: 0.1.0
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to

charts/noncer/templates/deployment.yaml

@@ -37,15 +37,34 @@ spec:
           - -port
           - "{{ .Values.email.port }}"
           - -pass
-          - "{{ .Values.email.password }}"
+          - "$(PASSWORD)"
           - -period
           - "{{ .Values.bot.period }}"
           - -webhook
-          - "{{ .Values.bot.webhook }}"
+          - "$(WEBHOOK)"
           {{- range .Values.bot.allowList}}
           - -allowlist
           - "{{ . }}"
-          {{- end }}  
+          {{- end }}
+          env:
+          - name: PASSWORD
+            valueFrom:
+              secretKeyRef:
+              {{- if .Values.existingSecret }}
+                name: "{{ .Values.existingSecret }}"
+              {{- else }}
+                name: "{{ include "noncer.name" . }}"
+              {{- end }}
+                key: password
+          - name: WEBHOOK
+            valueFrom:
+              secretKeyRef:
+              {{- if .Values.existingSecret }}
+                name: "{{ .Values.existingSecret }}"
+              {{- else }}
+                name: "{{ include "noncer.name" . }}"
+              {{- end }}
+                key: webhook
           resources:
             {{- toYaml .Values.resources | nindent 12 }}
       {{- with .Values.nodeSelector }}

charts/noncer/templates/secret.yaml

@@ -0,0 +1,10 @@
+{{- if not .Values.existingSecret -}}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: "{{ include "noncer.name" . }}"
+type: Opaque
+data:
+  password: {{ .Values.email.password | required ".Values.email.password is required." | b64enc }}
+  webhook: {{ .Values.bot.webhook | required ".Values.bot.webhook is required" | b64enc }}
+{{- end -}}

charts/noncer/values.yaml

@@ -4,6 +4,10 @@ image:
   # Overrides the image tag whose default is the chart appVersion.
   tag: ""
 
+# The bot can be provided with an existing secret that contains both the password and the webhook.
+# Otherwise a secret will be created
+existingSecret: ""
+
 email:
   user: ""
   password: ""