Added additional OAuth variable + refactored so that OAuth variables are now in template function

templates/_oauth.tpl

@@ -0,0 +1,33 @@
+{{- define "oauth.envVars" -}}
+# OAuth Implementation Stuff
+- name: BASE_APP_URL
+  valueFrom:
+    configMapKeyRef:
+      name: {{ .Release.Name }}-oauth-credentials
+      key: base-app-url
+- name: APP_ABBRV
+  valueFrom:
+    configMapKeyRef:
+      name: {{ .Release.Name }}-oauth-credentials
+      key: app-abbreviation
+- name: APP_NAME
+  valueFrom:
+    configMapKeyRef:
+      name: {{ .Release.Name }}-oauth-credentials
+      key: app-name
+- name: SERVICE_NAME
+  valueFrom:
+    configMapKeyRef:
+      name: {{ .Release.Name }}-oauth-credentials
+      key: service-name
+- name: DEV_PORT
+  valueFrom:
+    configMapKeyRef:
+      name: {{ .Release.Name }}-oauth-credentials
+      key: dev-port
+- name: APP_REG_CONTACT_EMAIL
+  valueFrom:
+    configMapKeyRef:
+      name: {{ .Release.Name }}-oauth-credentials
+      key: app-reg-contact-email
+{{- end -}}

templates/deployment.yaml

@@ -31,32 +31,9 @@ spec:
           value: "9010"
         - name: ACCOUNTS_SUBDOMAIN_PREFIX
           value: "account"
-        # OAuth Implementation Stuff
-        - name: BASE_APP_URL
-          valueFrom:
-            configMapKeyRef:
-              name: {{ .Release.Name }}-oauth-credentials
-              key: base-app-url
-        - name: APP_ABBRV
-          valueFrom:
-            configMapKeyRef:
-              name: {{ .Release.Name }}-oauth-credentials
-              key: app-abbreviation
-        - name: APP_NAME
-          valueFrom:
-            configMapKeyRef:
-              name: {{ .Release.Name }}-oauth-credentials
-              key: app-name
-        - name: SERVICE_NAME
-          valueFrom:
-            configMapKeyRef:
-              name: {{ .Release.Name }}-oauth-credentials
-              key: service-name
-        - name: DEV_PORT
-          valueFrom:
-            configMapKeyRef:
-              name: {{ .Release.Name }}-oauth-credentials
-              key: dev-port
+        {{- /* This injects the YAML defined in the `_oauth.tpl` file */ -}}
+        {{- include "oauth.envVars" . | nindent 8 }}
+        {{- /* This injects the YAML defined from the `db_deploy`, `cache_deploy` and `nosql_deploy` subcharts */ -}}
         {{- include "db.envVars" . | nindent 8 }}
         {{- include "cache.envVars" . | nindent 8 }}
         {{- include "nosql.envVars" . | nindent 8 }}

templates/oauth-credentials-config-map.yaml

@@ -10,3 +10,4 @@ data:
   app-name: {{ .Values.oauth.appName }}
   service-name: {{ .Values.oauth.serviceName }}
   dev-port: {{ .Values.oauth.devPort | quote }}
+  app-reg-contact-email: {{ .Values.oauth.appRegContactEmail | quote }}

values.yaml

@@ -61,6 +61,7 @@ oauth:
   appName: "<App Name>"
   serviceName: "<Service Name>"
   devPort: "<Dev Port>"
+  appRegContactEmail: "<App Registration Contact Email>"
 
 # Configuration for the relational database
 # See the [Database Deployment Helm Chart](https://git.bridgemanaccessible.ca/Bridgeman-Accessible/db-deploy-helm) for more information