draft2

helm/hsd-oauth-proxy/templates/NOTES.txt

@@ -1,11 +1,5 @@
 1. Get the application URL by running these commands:
-{{- if .Values.ingress.enabled }}
-{{- range $host := .Values.ingress.hosts }}
-  {{- range .paths }}
-  http{{ if $.Values.ingress.tls }}s{{ end }}://{{ $host.host }}{{ .path }}
-  {{- end }}
-{{- end }}
-{{- else if contains "NodePort" .Values.service.type }}
+{{- if contains "NodePort" .Values.service.type }}
   export NODE_PORT=$(kubectl get --namespace {{ .Release.Namespace }} -o jsonpath="{.spec.ports[0].nodePort}" services {{ include "hsd-oauth-proxy.fullname" . }})
   export NODE_IP=$(kubectl get nodes --namespace {{ .Release.Namespace }} -o jsonpath="{.items[0].status.addresses[0].address}")
   echo http://$NODE_IP:$NODE_PORT

helm/hsd-oauth-proxy/templates/deployment.yaml

@@ -34,15 +34,13 @@ spec:
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           envFrom:
             - configMapRef:
-                name: hsd-oauth-env-cm
-
+                name: hsd-oauth-proxy-env-cm
           env:
-          {{- range $k, $v := .Values.envSecrets }}
+          {{- range $k, $v := .Values.envVariables }}
             - name: {{ $k | quote }}
               value: {{ $v | quote }}
           {{- end }} 
-
-          {{- range $k, $v := .Values.OptionalEnvVariables }}
+          {{- range $k, $v := .Values.optionalEnvVariables }}
             - name: {{ $k | quote }}
               value: {{ $v | quote }}
           {{- end }}   

helm/hsd-oauth-proxy/templates/hsd-oauth-proxy-env-cm.yaml

@@ -5,7 +5,6 @@ metadata:
 data:
   OAUTH2_PROXY_AUTH_LOGGING: {{ .Values.envVariables.OAUTH2_PROXY_AUTH_LOGGING | quote }}
   OAUTH2_PROXY_AUTH_LOGGING_FORMAT: {{ .Values.envVariables.OAUTH2_PROXY_AUTH_LOGGING_FORMAT | quote }}
-  OAUTH2_PROXY_CLIENT_ID: {{ .Values.envVariables.OAUTH2_PROXY_CLIENT_ID | quote }}
   OAUTH2_PROXY_COOKIE_DOMAINS: {{ .Values.envVariables.OAUTH2_PROXY_COOKIE_DOMAINS | quote }}
   OAUTH2_PROXY_COOKIE_EXPIRE: {{ .Values.envVariables.OAUTH2_PROXY_COOKIE_EXPIRE | quote }}
   OAUTH2_PROXY_COOKIE_NAME: {{ .Values.envVariables.OAUTH2_PROXY_COOKIE_NAME | quote }}

helm/hsd-oauth-proxy/values.yaml

@@ -65,15 +65,26 @@ tolerations: []
 
 affinity: {}
 
-envSecrets:
-  #mandatory secrets
-  OAUTH2_PROXY_CLIENT_SECRET: ""
-  OAUTH2_PROXY_COOKIE_SECRET: ""
-  OAUTH2_PROXY_REDIS_CONNECTION_URL: ""
+envFromSecrets: 
+  OAUTH2_PROXY_CLIENT_ID:
+    secretKeyRef: 
+      name: oauthSecrets
+      key: clientId
+  OAUTH2_PROXY_CLIENT_SECRET:
+    secretKeyRef: 
+      name: oauthSecrets
+      key: clientSecret
+  OAUTH2_PROXY_COOKIE_SECRET:
+    secretKeyRef: 
+      name: oauthSecrets
+      key: cookieSecret
+  OAUTH2_PROXY_REDIS_CONNECTION_URL:
+    secretKeyRef: 
+      name: oauthSecrets
+      key: redisConnectionUrl
 
 envVariables:
   #mandatory input variables
-  OAUTH2_PROXY_CLIENT_ID: ""
   OAUTH2_PROXY_COOKIE_DOMAINS: ""
   OAUTH2_PROXY_COOKIE_NAME: ""
   OAUTH2_PROXY_LOGIN_URL: ""
@@ -98,4 +109,5 @@ envVariables:
   OAUTH2_PROXY_STANDARD_LOGGING: "true"
   OAUTH2_PROXY_STANDARD_LOGGING_FORMAT: "info|CustomLogEvent||OAuth2Proxy|[{{.Timestamp}}] [{{.File}}] {{.Message}}"
   
-OptionalEnvVariables: {}
+#Any additional OAuth2 specific enviroment variables can be passed here
+optionalEnvVariables: {}