From 66ee4cec6f465a9213c8d587bb408013e1b4683a Mon Sep 17 00:00:00 2001 From: Daan Asscheman Date: Tue, 2 Jul 2024 15:33:22 +0200 Subject: [PATCH] Added oidc config. --- openshift/config/06_sample-app-cm.yaml | 4 +++- openshift/config/07_sample-app.yaml | 22 +++++++++++++++++++++- openshift/config/10_sample-front.yaml | 2 +- 3 files changed, 25 insertions(+), 3 deletions(-) diff --git a/openshift/config/06_sample-app-cm.yaml b/openshift/config/06_sample-app-cm.yaml index 7356fb7..0c6b9e5 100644 --- a/openshift/config/06_sample-app-cm.yaml +++ b/openshift/config/06_sample-app-cm.yaml @@ -7,4 +7,6 @@ data: database-type: mysql database-host: mariadb-sample database-port-number: '3306' - database-name: sample-database \ No newline at end of file + database-name: sample-database + oidc-provider-url: https://login.acc.uu.nl/nidp/oauth/nam + oidc-slo-link: https://login.acc.uu.nl/nidp/app/logout \ No newline at end of file diff --git a/openshift/config/07_sample-app.yaml b/openshift/config/07_sample-app.yaml index 4437c8c..316aa0a 100644 --- a/openshift/config/07_sample-app.yaml +++ b/openshift/config/07_sample-app.yaml @@ -17,7 +17,7 @@ spec: spec: containers: - name: sample-app - image: ghcr.io/utrechtuniversity/fsw-openshift:pr6 + image: ghcr.io/utrechtuniversity/fsw-openshift:develop ports: - containerPort: 9000 env: @@ -41,11 +41,31 @@ spec: configMapKeyRef: name: sample-config key: database-name + - name: OIDC_PROVIDER_URL + valueFrom: + configMapKeyRef: + name: sample-config + key: oidc-provider-url + - name: OIDC_SLO_LINK + valueFrom: + configMapKeyRef: + name: sample-config + key: oidc-slo-link - name: LARAVEL_DATABASE_USER valueFrom: configMapKeyRef: name: mariadb-config key: mariadb-user + - name: OIDC_CLIENT_ID + valueFrom: + secretKeyRef: + name: sample-app-secret + key: oidc-client-id + - name: OIDC_CLIENT_SECRET + valueFrom: + secretKeyRef: + name: sample-app-secret + key: oidc-client-secret - name: LARAVEL_DATABASE_PASSWORD valueFrom: secretKeyRef: diff --git a/openshift/config/10_sample-front.yaml b/openshift/config/10_sample-front.yaml index ea84337..1608e29 100644 --- a/openshift/config/10_sample-front.yaml +++ b/openshift/config/10_sample-front.yaml @@ -17,7 +17,7 @@ spec: spec: containers: - name: sample-front - image: ghcr.io/utrechtuniversity/fsw-openshift-frontend:pr-6 + image: ghcr.io/utrechtuniversity/fsw-openshift-frontend:develop ports: - containerPort: 7050 env: