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

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 }}