Merge branch '29-add-environment-variable-values-for-hydra' into 'main'

Resolve "Add environment variable values for Hydra"

Closes #29

See merge request stackspin/dashboard!19

deployment/helmchart/Chart.lock

@@ -1,6 +1,6 @@
 dependencies:
 - name: common
   repository: https://charts.bitnami.com/bitnami
-  version: 1.10.0
+  version: 1.10.4
-digest: sha256:d6f283322d34efda54721ddd67aec935f1bea501c7b45dfbe89814aed21ae5dc
+digest: sha256:e177cdcd71e67a1e64e95260c4b780374e1d66e85be405d5dc58459654e49ffa
-generated: "2021-09-30T16:27:06.738339948+02:00"
+generated: "2022-01-21T11:11:54.359313957+01:00"

deployment/helmchart/Chart.yaml

@@ -1,7 +1,7 @@
 annotations:
   category: Dashboard
 apiVersion: v2
-appVersion: 0.1.1
+appVersion: 0.1.3
 dependencies:
   - name: common
     repository: https://charts.bitnami.com/bitnami
@@ -22,4 +22,4 @@ name: stackspin-dashboard
 sources:
   - https://open.greenhost.net/stackspin/dashboard/
   - https://open.greenhost.net/stackspin/dashboard-backend/
-version: 0.1.2
+version: 0.1.3

deployment/helmchart/templates/configmaps.yaml

@@ -13,9 +13,10 @@ data:
   SECRET_KEY: {{ .Values.backend.secretKey }}
   FLASK_APP: app.py
   FLASK_ENV: {{ .Values.backend.flaskEnv }}
-  # Probably needed in the future:
+  HYDRA_CLIENT_ID: {{ .Values.backend.oidc.clientId }}
-  # DASHBOARD_BACKEND_USERNAME: {{ .Values.backend.username | quote }}
+  HYDRA_AUTHORIZATION_BASE_URL: {{ .Values.backend.oidc.authorizationBaseUrl }}
-  # DASHBOARD_BACKEND_EMAIL: {{ .Values.backend.email | quote }}
+  TOKEN_URL: {{ .Values.backend.oidc.tokenUrl }}
+
   # {{- if .Values.backend.smtp.enabled }}
   # DASHBOARD_BACKEND_SMTP_HOST: {{ .Values.backend.smtp.host | quote }}
   # DASHBOARD_BACKEND_SMTP_PORT: {{ .Values.backend.smtp.port | quote }}

deployment/helmchart/templates/deployment.yaml

@@ -132,14 +132,19 @@ spec:
                 secretKeyRef:
                   name: {{ include "backend.secretName" . }}
                   key: backend-password
+            - name: HYDRA_CLIENT_SECRET
+              valueFrom:
+                secretKeyRef:
+                  name: {{ include "backend.secretName" . }}
+                  key: oidc-client-secret
+            - name: KRATOS_URL
+              value: {{ .Values.backend.kratosUrl }}
             {{- if (include "backend.smtp.password.enabled" .) }}
             - name: DASHBOARD_SMTP_PASSWORD
               valueFrom:
                 secretKeyRef:
                   name: {{ include "backend.smtp.secretName" . }}
                   key: smtp-password
-            - name: KRATOS_URL
-              value: {{ .Values.backend.kratosUrl }}
             {{- end }}
             {{- if .Values.backend.extraEnvVars }}
             {{- include "common.tplvalues.render" (dict "value" .Values.backend.extraEnvVars "context" $) | nindent 12 }}

deployment/helmchart/templates/secrets-admin-panel.yaml

@@ -20,4 +20,7 @@ data:
   {{- if and (.Values.backend.smtp.password) (.Values.backend.smtp.enabled) (not .Values.backend.smtp.existingSecret) }}
   smtp-password: {{ .Values.backend.smtp.password | b64enc | quote }}
   {{- end }}
+  {{- if .Values.backend.oidc.clientSecret }}
+  oidc-client-secret: {{ .Values.backend.oidc.clientSecret | b64enc | quote }}
+  {{- end }}
 {{- end }}

deployment/helmchart/values.yaml

@@ -59,7 +59,7 @@ dashboard:
   image:
     registry: open.greenhost.net:4567
     repository: stackspin/dashboard/dashboard
-    tag: 0-1-2
+    tag: 0-1-3
     ## Specify a imagePullPolicy
     ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
     ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -232,7 +232,7 @@ backend:
   image:
     registry: open.greenhost.net:4567
     repository: stackspin/dashboard-backend/dashboard-backend
-    tag: 0-1-2
+    tag: 0-1-3
     ## Specify a imagePullPolicy
     ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent'
     ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images
@@ -249,6 +249,11 @@ backend:
 
   # URL to the Ory Kratos API
   kratosUrl: http://127.0.0.1:8000
+  oidc:
+    clientId: dashboard
+    clientSecret: ReplaceWithSecret
+    authorizationBaseUrl: https://sso.stackspin.example.org/oauth2/auth
+    tokenUrl: https://sso.stackspin.example.org/oauth2/token
 
   ## Kubernetes service configuration. For minikube, set this to NodePort, elsewhere use LoadBalancer or ClusterIP
   ##