Fix secret

helmchart/single-sign-on/templates/deployment-userfrontend.yaml

@@ -38,13 +38,13 @@ spec:
             - name: OAUTH_CLIENT_ID
               valueFrom:
                 secretKeyRef:
-                  name: userpanel-oauth2-client
-                  key: client_id
+                  name: oauth2-clients
+                  key: {{ .Values.userpanel.applicationName }}_client_id
             - name: OAUTH_CLIENT_SECRET
               valueFrom:
                 secretKeyRef:
-                  name: userpanel-oauth2-client
-                  key: client_secret
+                  name: oauth2-clients
+                  key: {{ .Values.userpanel.applicationName }}_client_secret
           ports:
             - name: userpanel
               containerPort: 3000

helmchart/single-sign-on/templates/job-create-oauth2-client-userpanel.yaml

@@ -27,12 +27,12 @@ spec:
           valueFrom:
             secretKeyRef:
               name: oauth2-clients
-              key: {{ .clientName }}.client_id
+              key: {{ .clientName }}_client_id
         - name: CLIENT_SECRET
           valueFrom:
             secretKeyRef:
               name: oauth2-clients
-              key: {{ .clientName }}.client_secret
+              key: {{ .clientName }}_client_secret
         - name: CLIENT_NAME
           value: {{ .clientName | quote }}
         - name: REDIRECT_URI

helmchart/single-sign-on/templates/secret-oauth2-client-userpanel.yaml

@@ -5,7 +5,6 @@ metadata:
 type: Opaque
 data:
   {{- range .Values.oAuthClients }}
-  {{ .clientName }}:
-    client_id: {{ .clientName | b64enc }}
-    client_secret: {{ .clientSecret |  b64enc }}
+  {{ .clientName }}_client_id: {{ .clientName | b64enc }}
+  {{ .clientName }}_client_secret: {{ .clientSecret |  b64enc }}
   {{- end }}

helmchart/single-sign-on/values.yaml

@@ -16,6 +16,10 @@ loginProviderImage:
 singleSignOnHost: &SSO_HOST sso.oas.example.net
 
 userpanel:
+  # userpanel.applicationName is the name of the application. This is a duplicate of 
+  # userbackend.applications[0].name but helm < 3.0 doesn't supprt direct references to
+  # list items in template files so we need to keep it for now
+  applicationName: &USER_PANEL user-panel
   image:
     # userpanel.image.tag and userpanel.image.pullPolicy should be the same as
     # userbackend.image.tag and userpanel.image.pullPolicy as the images are released
@@ -34,7 +38,7 @@ userbackend:
   # after the installation of the user backend.
   username: "admin"
   applications:
-    - name: &user-panel user-panel
+    - name: *USER_PANEL
       desctiption: Administration interface to manage user accounts
   # username.password is the password of the admin user
   password: "YouReallyNeedToChangeThis"
@@ -107,7 +111,7 @@ hydra:
 oAuthClients:
   # oauthClients[].clientName is the name of the oauth client that needs to be the same as
   # the application name in userbackend.applications[].name
-- clientName: *user-panel
+- clientName: *USER_PANEL
   # oauthClients[].clientSecret is the secret the client uses to authenticate
 - clientSecret: "YouReallyNeedToChangeThis"
   # oAuthClients[].redirectUri is the url the user will be redirected to by hydra when the