Merge pull request #70 from catenax-ng/charts/upgrade_backend_vars_props

Add new values for Edc Generic Endpoint

charts/country-risk/Chart.yaml

@@ -20,8 +20,8 @@
 apiVersion: v2
 name: country-risk
 type: application
-version: 3.0.7
-appVersion: "1.2.1"
+version: 3.0.9
+appVersion: "1.3.0"
 description: A Helm chart for deploying the Country Risk service
 home: https://github.com/eclipse-tractusx/vas-country-risk-frontend
 sources:
@@ -38,6 +38,6 @@ dependencies:
   repository: https://helm.runix.net
   version: 1.x.x
 - name: country-risk-backend
-  version: 3.0.5
+  version: 3.0.6
 - name: country-risk-frontend
   version: 3.0.4

charts/country-risk/charts/country-risk-backend/Chart.yaml

@@ -36,13 +36,13 @@ type: application
 # This is the chart version. This version number should be incremented each time you make changes
 # to the chart and its templates, including the app version.
 # Versions are expected to follow Semantic Versioning (https://semver.org/)
-version: 3.0.5
+version: 3.0.6
 
 # This is the version number of the application being deployed. This version number should be
 # incremented each time you make changes to the application. Versions are not expected to
 # follow Semantic Versioning. They should reflect the version the application is using.
 # It is recommended to use it with quotes.
-appVersion: "1.2.3"
+appVersion: "1.3.0"
 
 dependencies:
   - name: postgresql

charts/country-risk/charts/country-risk-backend/templates/application-secret.yaml

@@ -28,5 +28,10 @@ type: Opaque
 stringData:
   keycloakClientSecret: {{ default (randAlphaNum 15) .Values.applicationSecret.clientSecret }}
   keycloakClientId:  {{ default (randAlphaNum 15) .Values.applicationSecret.clientId }}
+  gateKeycloakClientSecret: {{ default (randAlphaNum 15) .Values.applicationSecret.gateClientSecret }}
+  gateKeycloakClientId:  {{ default (randAlphaNum 15) .Values.applicationSecret.gateClientId }}
+  poolKeycloakClientSecret: {{ default (randAlphaNum 15) .Values.applicationSecret.poolClientSecret }}
+  poolKeycloakClientId:  {{ default (randAlphaNum 15) .Values.applicationSecret.poolClientId }}
+  edcApiKey:  {{ default (randAlphaNum 15) .Values.applicationSecret.edcApiKey }}
 
 {{ end }}

charts/country-risk/charts/country-risk-backend/templates/configmap.yaml

@@ -19,6 +19,8 @@
 ################################################################################
 
 {{ if .Values.configmap.create }}
+
+
 apiVersion: v1
 kind: ConfigMap
 metadata:

charts/country-risk/charts/country-risk-backend/templates/deployment.yaml

@@ -77,6 +77,31 @@ spec:
                 secretKeyRef:
                   name: {{ include "vas.applicationSecret.name" . }}
                   key: keycloakClientSecret
+            - name: VAS_GATECLIENT_CLIENTID
+              valueFrom:
+                secretKeyRef:
+                  name: {{ include "vas.applicationSecret.name" . }}
+                  key: gateKeycloakClientId
+            - name: VAS_GATECLIENT_CLIENTSECRET
+              valueFrom:
+                secretKeyRef:
+                  name: {{ include "vas.applicationSecret.name" . }}
+                  key: gateKeycloakClientSecret
+            - name: VAS_POOLCLIENT_CLIENTID
+              valueFrom:
+                secretKeyRef:
+                  name: {{ include "vas.applicationSecret.name" . }}
+                  key: poolKeycloakClientId
+            - name: VAS_POOLCLIENT_CLIENTSECRET
+              valueFrom:
+                secretKeyRef:
+                  name: {{ include "vas.applicationSecret.name" . }}
+                  key: poolKeycloakClientSecret
+            - name: APPLICATION_BPDM_APIKEY
+              valueFrom:
+                secretKeyRef:
+                  name: {{ include "vas.applicationSecret.name" . }}
+                  key: edcApiKey
           ports:
             - name: http
               containerPort: {{ .Values.service.port }}

charts/country-risk/charts/country-risk-backend/values.yaml

@@ -158,6 +158,16 @@ applicationSecret:
   clientSecret: "" #
   # -- String value that represents the client ID
   clientId: ""  #
+  # -- String value that represents the client secret gate app
+  gateClientSecret: "" #
+  # -- String value that represents the client ID gate app
+  gateClientId: ""  #
+  # -- String value that represents the client secret for pool app
+  poolClientSecret: "" #
+  # -- String value that represents the client ID for pool app
+  poolClientId: ""  #
+  # -- String value that represents the api key to Use Edc endpoints
+  edcApiKey: ""  #
 
 configmap:
   # Specifies whether a configmap should be created
@@ -168,10 +178,17 @@ configmap:
     # -- Security configurations for the application
     security_enabled: 'false'
     # -- Endpoints for BPDM output gate
-    application_partnersPoolUrl_bpdmAddressUrl: http://localhost:8080/api/catena/output/addresses/search?
-    application_partnersPoolUrl_bpdmSiteUrl: http://localhost:8080/api/catena/output/sites/search?
-    application_partnersPoolUrl_bpdmLegalUrl: http://localhost:8080/api/catena/output/legal-entities/search?
-    vas_auth_url: http://localhost:8081
+    application_bpdm_addressUrl: 'http://localhost:8080/api/catena/output/addresses/search?'
+    application_bpdm_siteUrl: 'http://localhost:8080/api/catena/output/sites/search?'
+    application_bpdm_legalUrl: 'http://localhost:8080/api/catena/output/legal-entities/search?'
+    application_bpdm_genericUrl: 'http://localhost:8080/api/catena/output/generic/search?'
+    application_bpdm_consumerManagementUrl: 'http://localhost:8080/consumerManagementUrl?'
+    application_bpdm_gateProviderProtocolUrl: 'http://localhost:8080/gateProviderProtocolUrl?'
+    application_bpdm_gateProviderId: 'BPNL0000000XXX'
+    application_bpdm_policyBpn: 'BPNL0000000XXX'
+    application_bpdm_apiKey: 'XXXXXXXXXX'
+    application_edc_enabled: 'false'
+    vas_auth_url: 'http://localhost:8081'
 
 elastic:
   # -- Should elastic be enabled or not

charts/country-risk/values.yaml

@@ -273,6 +273,16 @@ country-risk-backend:
     clientSecret: ""  #
     # -- String value that represents the client ID
     clientId: ""  #
+    # -- String value that represents the client secret gate app
+    gateClientSecret: ""  #
+    # -- String value that represents the client ID gate app
+    gateClientId: ""  #
+    # -- String value that represents the client secret for pool app
+    poolClientSecret: ""  #
+    # -- String value that represents the client ID for pool app
+    poolClientId: ""  #
+    # -- String value that represents the api key to Use Edc endpoints
+    edcApiKey: ""  #
 
   configmap:
     # Specifies whether a configmap should be created
@@ -283,10 +293,18 @@ country-risk-backend:
       # -- Security configurations for the application
       security_enabled: 'false'
       # -- Endpoints for BPDM output gate
-      application_partnersPoolUrl_bpdmAddressUrl: http://localhost:8080/api/catena/output/addresses/search?
-      application_partnersPoolUrl_bpdmSiteUrl: http://localhost:8080/api/catena/output/sites/search?
-      application_partnersPoolUrl_bpdmLegalUrl: http://localhost:8080/api/catena/output/legal-entities/search?
-      vas_auth_url: http://localhost:8081
+      application_bpdm_addressUrl: 'http://localhost:8080/api/catena/output/addresses/search?'
+      application_bpdm_siteUrl: 'http://localhost:8080/api/catena/output/sites/search?'
+      application_bpdm_legalUrl: 'http://localhost:8080/api/catena/output/legal-entities/search?'
+      application_bpdm_genericUrl: 'http://localhost:8080/api/catena/output/generic/search?'
+      application_bpdm_consumerManagementUrl: 'http://localhost:8080/consumerManagementUrl?'
+      application_bpdm_gateProviderProtocolUrl: 'http://localhost:8080/gateProviderProtocolUrl?'
+      application_bpdm_gateProviderId: 'BPNL0000000XXX'
+      application_bpdm_policyBpn: 'BPNL0000000XXX'
+      application_bpdm_apiKey: 'XXXXXXXXXX'
+      application_edc_enabled: 'false'
+      vas_auth_url: 'http://localhost:8081'
+
 
   elastic:
     # -- Should elastic be enabled or not