Fix secrets usage and files cleanup

OIT-SET · Apr 24, 2024 · 615fae3 · 615fae3
1 parent a6ccb40
commit 615fae3
Show file tree

Hide file tree

Showing 14 changed files with 106 additions and 144 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,2 +1,3 @@
 /.idea/
 /.cr-release-packages/
+temp
diff --git a/1.0.0/index.yaml b/1.0.0/index.yaml
diff --git a/1.0.1/index.yaml b/1.0.1/index.yaml
diff --git a/1.0.2/index.yaml b/1.0.2/index.yaml
diff --git a/charts/maildev/Chart.yaml b/charts/maildev/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: maildev
 description: MailDev is a simple way to test your emails during development with an easy to use web interface.
 type: application
-version: 1.0.5
+version: 1.1.0
 appVersion: "2.1.0"
 home: https://github.com/alluen/maildev-helm
 maintainers:

diff --git a/charts/maildev/templates/_helpers.tpl b/charts/maildev/templates/_helpers.tpl
@@ -83,6 +83,17 @@ Get the name of the secret containing the web user password
   {{- end -}}
 {{- end -}}
 
+{{/*
+Get the name of the secret containing the oauth2_proxy config & credentials
+*/}}
+{{- define "maildev.oauth2_proxy.secretName" -}}
+  {{- if .Values.maildev.config.oauth2_proxy.existingSecret -}}
+    {{- printf "%s" .Values.maildev.config.oauth2_proxy.existingSecret -}}
+  {{- else -}}
+      {{- printf "%s" (include "maildev.fullname" .) -}}-oauth2-proxy
+  {{- end -}}
+{{- end -}}
+
 {{/*
 Get the name of the secret containing the password for the incoming SMTP traffic
 */}}

diff --git a/charts/maildev/templates/deployment.yaml b/charts/maildev/templates/deployment.yaml
@@ -61,8 +61,8 @@ spec:
             - "--verbose"
             {{- end }}
           env:
-            {{- if .Values.maildev.config.https.enabled }}
             # HTTPS Settings
+            {{- if .Values.maildev.config.https.enabled }}
             {{- if .Values.maildev.config.https.cert }}
             - name: MAILDEV_HTTPS_CERT
               value: {{ .Values.maildev.config.https.cert | quote }}
@@ -82,9 +82,11 @@ spec:
             - name: MAILDEV_HIDE_EXTENSIONS
               value: {{ .Values.maildev.config.smtp.hideExtensions | quote }}
             {{- end }}
+            {{- if .Values.maildev.config.smtp.incoming.authRequired }}
             {{- if .Values.maildev.config.smtp.incoming.username }}
             - name: MAILDEV_INCOMING_USER
               value: {{ .Values.maildev.config.smtp.incoming.username | quote }}
+            {{- end }}
             - name: MAILDEV_INCOMING_PASS
               valueFrom:
                 secretKeyRef:
@@ -99,23 +101,23 @@ spec:
             - name: MAILDEV_OUTGOING_PORT
               value: {{ .Values.maildev.config.smtp.outgoing.port | quote }}
             {{- end }}
-            {{- if .Values.maildev.config.smtp.outgoing.host }}
+            {{- if .Values.maildev.config.smtp.outgoing.authRequired }}
+            {{- if .Values.maildev.config.smtp.outgoing.username }}
+            - name: MAILDEV_OUTGOING_USER
+              value: {{ .Values.maildev.config.smtp.outgoing.username | quote }}
+            {{- end }}
             - name: MAILDEV_OUTGOING_PASS
               valueFrom:
                 secretKeyRef:
                   name: {{ include "maildev.smtp.outgoing.secretName" . }}
                   key: smtp-outgoing-password
             {{- end }}
-            {{- if .Values.maildev.config.smtp.outgoing.username }}
-            - name: MAILDEV_OUTGOING_USER
-              value: {{ .Values.maildev.config.smtp.outgoing.username | quote }}
-            {{- end }}
-            # Web Settingss
+            # Web Settings
+            {{- if .Values.maildev.config.web.authRequired }}
             {{- if .Values.maildev.config.web.username }}
             - name: MAILDEV_WEB_USER
               value: {{ .Values.maildev.config.web.username | quote }}
             {{- end }}
-            {{- if or .Values.maildev.config.web.password .Values.maildev.config.web.existingSecret }}
             - name: MAILDEV_WEB_PASS
               valueFrom:
                 secretKeyRef:
@@ -125,7 +127,7 @@ spec:
             - name: MAILDEV_WEB_PORT
               value: {{ .Values.services.web.port | quote }}
             {{- if .Values.extraEnv }}
-            ## Additional Setings
+            ## Additional Settings
             {{- range .Values.extraEnv }}
             {{- if and (.name) (.value) }}
             - name: {{ .name | quote }}
@@ -188,17 +190,17 @@ spec:
             - name: OAUTH2_PROXY_CLIENT_SECRET
               valueFrom:
                 secretKeyRef:
-                  name: maildev-app-resource
+                  name: {{ include "maildev.oauth2_proxy.secretName" . }}
                   key: oauth2_proxy_client_secret
             - name: OAUTH2_PROXY_CLIENT_ID
               valueFrom:
                 secretKeyRef:
-                  name: maildev-app-resource
+                  name: {{ include "maildev.oauth2_proxy.secretName" . }}
                   key: oauth2_proxy_client_id
             - name: OAUTH2_PROXY_COOKIE_SECRET
               valueFrom:
                 secretKeyRef:
-                  name: maildev-app-resource
+                  name: {{ include "maildev.oauth2_proxy.secretName" . }}
                   key: oauth2_proxy_cookie_secret
             - name: OAUTH2_PROXY_EMAIL_DOMAINS
               value: ohio.edu
@@ -207,15 +209,10 @@ spec:
             - name: OAUTH2_PROXY_OIDC_ISSUER_URL
               valueFrom:
                 secretKeyRef:
-                  name: oauth2-proxy-oidc-issuer-url
+                  name: {{ include "maildev.oauth2_proxy.secretName" . }}
                   key: oauth2_proxy_oidc_issuer_url
             - name: OAUTH2_PROXY_SESSION_COOKIE_MINIMAL
               value: "true"
-          volumeMounts:
-            - mountPath: /var/run/secrets/maildev-app-resource
-              name: secrets-maildev-app-resource
-              readOnly: true
-
           resources:
             requests:
               cpu: 5m
@@ -245,11 +242,6 @@ spec:
             timeoutSeconds: 2
         {{- end }}      
       volumes:
-        {{- if .Values.maildev.config.oauth2_proxy.enabled }}
-        - name: secrets-maildev-app-resource
-          secret: 
-            secretName: maildev-app-resource
-        {{- end }}    
         - name: data
           {{- if .Values.maildev.persistence.enabled }}
           persistentVolumeClaim:

diff --git a/charts/maildev/templates/oauth2_proxy/secret.yaml b/charts/maildev/templates/oauth2_proxy/secret.yaml
@@ -0,0 +1,13 @@
+{{- if .Values.maildev.config.oauth2_proxy.enabled }}
+{{- if (not .Values.maildev.config.oauth2_proxy.existingSecret) }}
+apiVersion: v1
+kind: Secret
+metadata:
+  name: {{ include "maildev.oauth2_proxy.secretName" . }}
+data:
+  oauth2_proxy_client_id: {{ .Values.maildev.config.oauth2_proxy.clientId | b64enc }}
+  oauth2_proxy_client_secret: {{ .Values.maildev.config.oauth2_proxy.clientSecret | b64enc }}
+  oauth2_proxy_cookie_secret: {{ .Values.maildev.config.oauth2_proxy.cookieSecret | b64enc }}
+  oauth2_proxy_oidc_issuer_url: {{ .Values.maildev.config.oauth2_proxy.oidcIssuerURL | b64enc }}
+{{- end }}
+{{- end }}
diff --git a/charts/maildev/templates/smtp/incoming-secret.yaml b/charts/maildev/templates/smtp/incoming-secret.yaml
@@ -1,8 +1,10 @@
-{{- if (not .Values.maildev.config.smtp.incoming.existingSecret) -}}
+{{- if .Values.maildev.config.smtp.incoming.authRequired }}
+{{- if (not .Values.maildev.config.smtp.incoming.existingSecret) }}
 apiVersion: v1
 kind: Secret
 metadata:
   name: {{ include "maildev.smtp.incoming.secretName" . }}
 data:
   smtp-incoming-password: {{ .Values.maildev.config.smtp.incoming.password | b64enc }}
 {{- end }}
+{{- end }}
diff --git a/charts/maildev/templates/smtp/outgoing-secret.yaml b/charts/maildev/templates/smtp/outgoing-secret.yaml
@@ -1,8 +1,10 @@
-{{- if (not .Values.maildev.config.smtp.outgoing.existingSecret) -}}
+{{- if .Values.maildev.config.smtp.outgoing.authRequired }}
+{{- if (not .Values.maildev.config.smtp.outgoing.existingSecret) }}
 apiVersion: v1
 kind: Secret
 metadata:
   name: {{ include "maildev.smtp.outgoing.secretName" . }}
 data:
   smtp-outgoing-password: {{ .Values.maildev.config.smtp.outgoing.password | b64enc }}
 {{- end }}
+{{- end }}
diff --git a/charts/maildev/templates/smtp/service.yaml b/charts/maildev/templates/smtp/service.yaml
@@ -11,8 +11,10 @@ spec:
       targetPort: smtp
       protocol: TCP
       name: smtp
-      {{ if and (eq .Values.services.smtp.type "NodePort")  .Values.services.smtp.nodePort }}
-      nodePort:  {{ .Values.services.smtp.nodePort }}
-      {{ end }}
+      {{- if (eq .Values.services.smtp.type "NodePort") }}
+      {{- if .Values.services.smtp.nodePort }}
+      nodePort: {{ .Values.services.smtp.nodePort }}
+      {{- end }}
+      {{- end }}
   selector:
     {{- include "maildev.selectorLabels" . | nindent 4 }}
diff --git a/charts/maildev/templates/web/secret.yaml b/charts/maildev/templates/web/secret.yaml
@@ -1,8 +1,10 @@
-{{- if (not .Values.maildev.config.web.existingSecret) -}}
+{{- if .Values.maildev.config.web.authRequired }}
+{{- if (not .Values.maildev.config.web.existingSecret) }}
 apiVersion: v1
 kind: Secret
 metadata:
   name: {{ include "maildev.web.secretName" . }}
 data:
   web-password: {{ .Values.maildev.config.web.password | b64enc }}
 {{- end }}
+{{- end }}
diff --git a/charts/maildev/values.schema.json b/charts/maildev/values.schema.json
@@ -139,6 +139,9 @@
                                 "incoming": {
                                     "type": "object",
                                     "properties": {
+                                        "authRequired": {
+                                            "type": "boolean"
+                                        },
                                         "existingSecret": {
                                             "type": "string"
                                         },
@@ -173,6 +176,9 @@
                                         "host": {
                                             "type": "string"
                                         },
+                                        "authRequired": {
+                                            "type": "boolean"
+                                        },
                                         "password": {
                                             "type": "string"
                                         },
@@ -195,6 +201,9 @@
                                 "disabled": {
                                     "type": "boolean"
                                 },
+                                "authRequired": {
+                                    "type": "boolean"
+                                },
                                 "existingSecret": {
                                     "type": "string"
                                 },
@@ -205,6 +214,29 @@
                                     "type": "string"
                                 }
                             }
+                        },
+                        "oauth2_proxy": {
+                            "type": "object",
+                            "properties": {
+                                "clientId": {
+                                    "type": "string"
+                                },
+                                "clientSecret": {
+                                    "type": "string"
+                                },
+                                "cookieSecret": {
+                                    "type": "string"
+                                },
+                                "enabled": {
+                                    "type": "boolean"
+                                },
+                                "existingSecret": {
+                                    "type": "string"
+                                },
+                                "oidcIssuerURL": {
+                                    "type": "string"
+                                }
+                            }
                         }
                     }
                 },