From 0bebb5fb4efbc3ffe69a9c88fc7f39e2e9d25a03 Mon Sep 17 00:00:00 2001 From: Dhirender Singh Date: Tue, 9 Jul 2024 10:01:47 +0200 Subject: [PATCH 1/4] fix(cronjob expiry): added the missing environment value for portal --- .../templates/cronjob-expiry-app.yaml | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/charts/ssi-credential-issuer/templates/cronjob-expiry-app.yaml b/charts/ssi-credential-issuer/templates/cronjob-expiry-app.yaml index ceef60a9..a393da3c 100644 --- a/charts/ssi-credential-issuer/templates/cronjob-expiry-app.yaml +++ b/charts/ssi-credential-issuer/templates/cronjob-expiry-app.yaml @@ -72,6 +72,25 @@ spec: value: "{{ .Values.credentialExpiry.expiry.inactiveVcsToDeleteInWeeks }}" - name: "PROCESSES__IDENTITYID" value: "{{ .Values.credentialExpiry.processIdentity.identityId }}" + - name: "PORTAL__CLIENTID" + value: "{{ .Values.issuer.portal.clientId }}" + - name: "PORTAL__CLIENTSECRET" + valueFrom: + secretKeyRef: + name: "{{ template "issuer.secretName" . }}" + key: "portal-client-secret" + - name: "PORTAL__GRANTTYPE" + value: "{{ .Values.processesworker.portal.grantType }}" + - name: "PORTAL__TOKENADDRESS" + value: "{{ .Values.centralidp.address }}{{ .Values.centralidp.tokenPath }}" + - name: "PORTAL__BASEADDRESS" + value: "{{ .Values.portalBackendAddress }}" + - name: "PORTAL__PASSWORD" + value: "empty" + - name: "PORTAL__SCOPE" + value: "{{ .Values.processesworker.portal.scope }}" + - name: "PORTAL__USERNAME" + value: "empty" ports: - name: http containerPort: {{ .Values.portContainer }} From fc304784989703b075171effe409e16a6696370e Mon Sep 17 00:00:00 2001 From: Dhirender Singh Date: Tue, 9 Jul 2024 10:05:37 +0200 Subject: [PATCH 2/4] fixed the formatting --- charts/ssi-credential-issuer/templates/cronjob-expiry-app.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/ssi-credential-issuer/templates/cronjob-expiry-app.yaml b/charts/ssi-credential-issuer/templates/cronjob-expiry-app.yaml index a393da3c..8161bfef 100644 --- a/charts/ssi-credential-issuer/templates/cronjob-expiry-app.yaml +++ b/charts/ssi-credential-issuer/templates/cronjob-expiry-app.yaml @@ -72,7 +72,7 @@ spec: value: "{{ .Values.credentialExpiry.expiry.inactiveVcsToDeleteInWeeks }}" - name: "PROCESSES__IDENTITYID" value: "{{ .Values.credentialExpiry.processIdentity.identityId }}" - - name: "PORTAL__CLIENTID" + - name: "PORTAL__CLIENTID" value: "{{ .Values.issuer.portal.clientId }}" - name: "PORTAL__CLIENTSECRET" valueFrom: From 476ce3f24f8bd1a92d292baba1d7c399ac0c00d1 Mon Sep 17 00:00:00 2001 From: Dhirender Singh Date: Tue, 9 Jul 2024 10:19:44 +0200 Subject: [PATCH 3/4] fixed the path --- charts/ssi-credential-issuer/templates/cronjob-expiry-app.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/charts/ssi-credential-issuer/templates/cronjob-expiry-app.yaml b/charts/ssi-credential-issuer/templates/cronjob-expiry-app.yaml index 8161bfef..7da55e47 100644 --- a/charts/ssi-credential-issuer/templates/cronjob-expiry-app.yaml +++ b/charts/ssi-credential-issuer/templates/cronjob-expiry-app.yaml @@ -73,7 +73,7 @@ spec: - name: "PROCESSES__IDENTITYID" value: "{{ .Values.credentialExpiry.processIdentity.identityId }}" - name: "PORTAL__CLIENTID" - value: "{{ .Values.issuer.portal.clientId }}" + value: "{{ .Values.service.portal.clientId }}" - name: "PORTAL__CLIENTSECRET" valueFrom: secretKeyRef: From cfcb34aa1a79c2c8a2c4f28ce2a7e43739d09add Mon Sep 17 00:00:00 2001 From: Dhirender Singh Date: Tue, 16 Jul 2024 15:22:25 +0200 Subject: [PATCH 4/4] updated the appsettings --- .../SsiCredentialIssuer.Expiry.App/appsettings.json | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/src/credentials/SsiCredentialIssuer.Expiry.App/appsettings.json b/src/credentials/SsiCredentialIssuer.Expiry.App/appsettings.json index f699a71d..66aacf33 100644 --- a/src/credentials/SsiCredentialIssuer.Expiry.App/appsettings.json +++ b/src/credentials/SsiCredentialIssuer.Expiry.App/appsettings.json @@ -29,5 +29,15 @@ }, "ProcessIdentity": { "ProcessUserId": "" + }, + "Portal": { + "Username": "", + "Password": "", + "ClientId": "", + "GrantType": "", + "ClientSecret": "", + "Scope": "", + "TokenAddress": "", + "BaseAddress": "" } }