chore: add base address to portal config

eclipse-tractusx · Apr 22, 2024 · c2c1667 · c2c1667
1 parent 051b01b
commit c2c1667
Show file tree

Hide file tree

Showing 8 changed files with 52 additions and 0 deletions.
diff --git a/charts/ssi-credential-issuer/templates/cronjob-issuer-processes.yaml b/charts/ssi-credential-issuer/templates/cronjob-issuer-processes.yaml
@@ -66,6 +66,8 @@ spec:
             - name: "CONNECTIONSTRINGS__ISSUERDB"
               value: "Server={{ .Values.externalDatabase.host }};Database={{ .Values.externalDatabase.database }};Port={{ .Values.externalDatabase.port }};User Id={{ .Values.externalDatabase.username }};Password=$(ISSUER_PASSWORD);Ssl Mode={{ .Values.dbConnection.sslMode }};"
             {{- end }}
+            - name: "PORTAL__CLIENTID"
+              value: "{{ .Values.issuer.portal.clientId }}"
             - name: "PORTAL__CLIENTSECRET"
               valueFrom:
                 secretKeyRef:
@@ -75,12 +77,33 @@ spec:
               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"
+            - name: "CALLBACK__CLIENTID"
+              value: "{{ .Values.issuer.portal.clientId }}"
+            - name: "CALLBACK__CLIENTSECRET"
+              valueFrom:
+                secretKeyRef:
+                  name: "{{ template "issuer.secretName" . }}"
+                  key: "portal-client-secret"
+            - name: "CALLBACK__GRANTTYPE"
+              value: "{{ .Values.processesworker.portal.grantType }}"
+            - name: "CALLBACK__TOKENADDRESS"
+              value: "{{ .Values.centralidp.address }}{{ .Values.centralidp.tokenPath }}"
+            - name: "CALLBACK__BASEADDRESS"
+              value: "{{ .Values.portalBackendAddress }}"
+            - name: "CALLBACK__PASSWORD"
+              value: "empty"
+            - name: "CALLBACK__SCOPE"
+              value: "{{ .Values.processesworker.portal.scope }}"
+            - name: "CALLBACK__USERNAME"
+              value: "empty"
             - name: "WALLET__BASEADDRESS"
               value: "{{ .Values.walletAddress }}"
             - name: "WALLET__CLIENTID"

diff --git a/charts/ssi-credential-issuer/templates/deployment-issuer-service.yaml b/charts/ssi-credential-issuer/templates/deployment-issuer-service.yaml
@@ -93,6 +93,8 @@ spec:
           value: "{{ .Values.issuer.logging.businessLogic }}"
         - name: "SWAGGERENABLED"
           value: "{{ .Values.issuer.swaggerEnabled }}"
+        - name: "PORTAL__CLIENTID"
+          value: "{{ .Values.issuer.portal.clientId }}"
         - name: "PORTAL__CLIENTSECRET"
           valueFrom:
             secretKeyRef:
@@ -102,6 +104,8 @@ spec:
           value: "{{ .Values.issuer.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"

diff --git a/charts/ssi-credential-issuer/values.yaml b/charts/ssi-credential-issuer/values.yaml
@@ -17,6 +17,11 @@
 # SPDX-License-Identifier: Apache-2.0
 ###############################################################
 
+# -- Provide portal-backend base address.
+portalBackendAddress: "https://portal-backend.example.org"
+walletAddress: "https://wallet.example.org"
+walletTokenAddress: "https://wallet.example.org/oauth/token"
+
 issuer:
   image:
     name: "docker.io/tractusx/ssi-credential-issuer-service"

diff --git a/consortia/environments/values-beta.yaml b/consortia/environments/values-beta.yaml
@@ -17,6 +17,10 @@
 # SPDX-License-Identifier: Apache-2.0
 ###############################################################
 
+portalBackendAddress: "https://portal-backend.beta.demo.catena-x.net"
+walletAddress: "https://dis-integration-service-prod.eu10.dim.cloud.sap"
+walletTokenAddress: "https://bpnl00000003crhk-catena-x.authentication.eu10.hana.ondemand.com/oauth/token"
+
 ingress:
   enabled: true
   className: "nginx"

diff --git a/consortia/environments/values-dev.yaml b/consortia/environments/values-dev.yaml
@@ -17,6 +17,10 @@
 # SPDX-License-Identifier: Apache-2.0
 ###############################################################
 
+portalBackendAddress: "https://portal-backend.dev.demo.catena-x.net"
+walletAddress: "https://dis-integration-service-prod.eu10.dim.cloud.sap"
+walletTokenAddress: "https://bpnl00000003crhk-catena-x.authentication.eu10.hana.ondemand.com/oauth/token"
+
 ingress:
   enabled: true
   className: "nginx"

diff --git a/consortia/environments/values-int.yaml b/consortia/environments/values-int.yaml
@@ -17,6 +17,10 @@
 # SPDX-License-Identifier: Apache-2.0
 ###############################################################
 
+portalBackendAddress: "https://portal-backend.int.demo.catena-x.net"
+walletAddress: "https://dis-integration-service-prod.eu10.dim.cloud.sap"
+walletTokenAddress: "https://bpnl00000003crhk-catena-x.authentication.eu10.hana.ondemand.com/oauth/token"
+
 ingress:
   enabled: true
   className: "nginx"

diff --git a/consortia/environments/values-pen.yaml b/consortia/environments/values-pen.yaml
@@ -17,6 +17,10 @@
 # SPDX-License-Identifier: Apache-2.0
 ###############################################################
 
+portalBackendAddress: "https://portal-backend-pen.dev.demo.catena-x.net"
+walletAddress: "https://dis-integration-service-prod.eu10.dim.cloud.sap"
+walletTokenAddress: "https://bpnl00000003crhk-catena-x.authentication.eu10.hana.ondemand.com/oauth/token"
+
 ingress:
   enabled: true
   className: "nginx"

diff --git a/consortia/environments/values-rc.yaml b/consortia/environments/values-rc.yaml
@@ -17,6 +17,10 @@
 # SPDX-License-Identifier: Apache-2.0
 ###############################################################
 
+portalBackendAddress: "https://portal-backend-rc.dev.demo.catena-x.net"
+walletAddress: "https://dis-integration-service-prod.eu10.dim.cloud.sap"
+walletTokenAddress: "https://bpnl00000003crhk-catena-x.authentication.eu10.hana.ondemand.com/oauth/token"
+
 ingress:
   enabled: true
   className: "nginx"