Merge branch 'master' into release-1.33

Author: gre9ory

hull-vidispine-addon/Chart.yaml

@@ -1,6 +1,6 @@
 # Basic chart description and version
 apiVersion: v1
-appVersion: 1.33.0
+appVersion: 1.33.1
 description: hull-vidispine-addon
 name: hull-vidispine-addon
-version: 1.33.0
+version: 1.33.1

hull-vidispine-addon/templates/_library.tpl

@@ -863,6 +863,24 @@ etcssl:
       key:  "CLIENT_{{ regexReplaceAll "-" ($component | upper) "_" }}_SECRET"
 {{ end }}
 {{ if (index $parent.Values.hull.config.specific.components $component).database }}
+'DBUSER':
+  valueFrom:
+    secretKeyRef:
+      name: auth
+      key: AUTH_BASIC_DATABASE_USERNAME
+      optional: true
+'DBPASSWORD':
+  valueFrom:
+    secretKeyRef:
+      name: auth
+      key: AUTH_BASIC_DATABASE_PASSWORD
+      optional: true
+'DBNAME':
+  valueFrom:
+    secretKeyRef:
+      name: auth
+      key: AUTH_BASIC_DATABASE_NAME
+      optional: true
 'DBUSERPOSTFIX':
   valueFrom:
     secretKeyRef: