[ugc-proxy] Add support for basic auth API credentials via secrets (#305)

* [ugc-proxy] Add support for basic auth API credentials via secrets

* Apply suggestion from @kunstkomputer

Co-authored-by: Jonas Pruditsch <6641029+kunstkomputer@users.noreply.github.com>

* Apply suggestion from @DanielRaapDev

Co-authored-by: Daniel Raap <raap@subshell.com>

---------

Co-authored-by: Jonas Pruditsch <6641029+kunstkomputer@users.noreply.github.com>
Co-authored-by: Daniel Raap <raap@subshell.com>

Author: 3 people

charts/sophora-ugc-proxy/Chart.yaml

@@ -4,11 +4,11 @@ description: A Helm chart for Kubernetes to install Sophora UGC Proxy connected
 
 type: application
 
-version: 1.5.3
+version: 1.6.0
 annotations:
   artifacthub.io/changes: |
-    - kind: fixed
-      description: "Fixed linter errors"
+    - kind: added
+      description: "Add support for supplying API basic-auth credentials from a Kubernetes Secret"
 
 # 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-proxy/templates/deployment.yaml

@@ -57,6 +57,24 @@ spec:
                   optional: false
 
             {{- end }}
+            {{- with .Values.authentication.apiBasicAuth }}
+              {{- if .enabled }}
+                {{- if .usernameKey }}
+            - name: AUTH_USERNAME
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .secretName }}
+                  key: {{ .usernameKey }}
+               {{- end }}
+               {{- if .passwordKey }}
+            - name: AUTH_PASSWORD
+              valueFrom:
+                secretKeyRef:
+                  name: {{ .secretName }}
+                  key: {{ .passwordKey }}
+               {{- end }}
+              {{- end }}
+            {{- end }}
             {{ if .Values.env -}}
             {{- toYaml .Values.env | nindent 12 }}
             {{- end }}

charts/sophora-ugc-proxy/values.yaml

@@ -23,6 +23,15 @@ authentication:
   #      accessKeyKey: access-key
   #      secretIdKey: secret-id
   s3buckets: {}
+  # authentication.apiBasicAuth.enabled enable basic auth for UGC Proxy API
+  # authentication.apiBasicAuth.secretName name of the secret containing the credentials
+  # authentication.apiBasicAuth.usernameKey key of the username in the secret. Will be available as environment variable '$AUTH_USERNAME'.
+  # authentication.apiBasicAuth.passwordKey key of the password in the secret. Will be available as environment variable '$AUTH_PASSWORD'.
+  apiBasicAuth:
+    enabled: false
+    secretName: ""
+    usernameKey: ""
+    passwordKey: ""
 
 image:
     repository: container.subshell.com/sophora/ugc-proxy