[sophora-ugc]: support optional secrets (#158)

* [sophora-ugc]: support optional secrets

* [sophora-ugc]: remove default keys + changelog

* [sophora-ugc]: changelog

Author: tom-schoener

charts/sophora-ugc/CHANGELOG.md

@@ -1,5 +1,8 @@
 # Changelog
 
+## 2.0.7
+- All deployment secrets are optional now. You can use `env` in your `values.yaml` instead, or leave it empty.
+
 ## 2.0.6
 - Add support for service accounts
 

charts/sophora-ugc/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: 2.0.6
+version: 2.0.7
 
 # 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/sophora-ugc/templates/deployment.yaml

@@ -39,36 +39,53 @@ spec:
           env:
             - name: JAVA_TOOL_OPTIONS
               value: {{ .Values.javaOptions }}
+            {{- if .Values.authentication.secret.server.usernameKey }}
             - name: SOPHORA-SERVER_USERNAME
               valueFrom:
                 secretKeyRef:
                   key: {{ .Values.authentication.secret.server.usernameKey }}
                   name: {{ .Values.authentication.secret.server.name }}
+                  optional: true
+            {{- end }}
+            {{- if .Values.authentication.secret.server.passwordKey }}
             - name: SOPHORA-SERVER_PASSWORD
               valueFrom:
                 secretKeyRef:
                   key: {{ .Values.authentication.secret.server.passwordKey }}
                   name: {{ .Values.authentication.secret.server.name }}
+                  optional: true
+            {{- end }}
+            {{- if .Values.authentication.secret.database.usernameKey }}
             - name: DATABASE_USER
               valueFrom:
                 secretKeyRef:
                   key: {{ .Values.authentication.secret.database.usernameKey }}
                   name: {{ .Values.authentication.secret.database.name }}
+                  optional: true
+            {{- end }}
+            {{- if .Values.authentication.secret.database.passwordKey }}
             - name: DATABASE_PASSWORD
               valueFrom:
                 secretKeyRef:
                   key: {{ .Values.authentication.secret.database.passwordKey }}
                   name: {{ .Values.authentication.secret.database.name }}
+                  optional: true
+            {{- end }}
+            {{- if .Values.authentication.secret.s3bucket.accessKeyKey }}
             - name: SUBMISSIONS_S3_ACCESSKEYID
               valueFrom:
                 secretKeyRef:
                   key: {{ .Values.authentication.secret.s3bucket.accessKeyKey }}
                   name: {{ .Values.authentication.secret.s3bucket.name }}
+                  optional: true
+            {{- end }}
+            {{- if .Values.authentication.secret.s3bucket.secretIdKey }}
             - name: SUBMISSIONS_S3_SECRETACCESSKEY
               valueFrom:
                 secretKeyRef:
                   key: {{ .Values.authentication.secret.s3bucket.secretIdKey }}
                   name: {{ .Values.authentication.secret.s3bucket.name }}
+            {{- end }}
             {{ if .Values.env -}}
             {{- toYaml .Values.env | nindent 12 }}
             {{- end }}

charts/sophora-ugc/values.yaml

@@ -29,12 +29,12 @@ authentication:
   secret:
     server:
       name: secret-name
-      usernameKey: username
-      passwordKey: password
+      usernameKey:
+      passwordKey:
     database:
       name: secret-name
-      usernameKey: database-user
-      passwordKey: database-password
+      usernameKey:
+      passwordKey:
     binarystore:
       name: secret-name
       accessKeyKey: binarystore-access-key