Merge pull request #317 from catenax-ng/chore/move-edc-config-to-vault

Chore/move edc config to vault
eclipse-tractusx · May 17, 2023 · f49f628 · f49f628
2 parents 7afb58f + 31f5fc8
commit f49f628
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 21 deletions.
diff --git a/charts/connector/edc-provider/values-ess.yaml b/charts/connector/edc-provider/values-ess.yaml
@@ -49,14 +49,14 @@ irs-edc-provider:
                 alias: irs-int-daps-key
       api:
         auth:
-          key: "123456"
+          key: <path:traceability-irs/data/ess/controlplane#apiKey>
       controlplane:
         url: "https://irs-ess-provider-controlplane.int.demo.catena-x.net"
       dataplane:
         url: "https://irs-ess-provider-dataplane.int.demo.catena-x.net"
     configuration:
       properties: |-
-        edc.oauth.client.id=D9:3A:80:9E:9C:21:95:12:5C:C2:1D:D8:30:80:7A:B9:DD:5F:C9:09:keyid:D9:3A:80:9E:9C:21:95:12:5C:C2:1D:D8:30:80:7A:B9:DD:5F:C9:09
+        edc.oauth.client.id=<path:traceability-irs/data/int/controlplane#edc.oauth.client.id>
         edc.oauth.private.key.alias=irs-int-daps-key
         edc.oauth.provider.jwks.url=https://daps1.int.demo.catena-x.net/.well-known/jwks.json
         edc.oauth.certificate.alias=irs-int-daps-cert
@@ -74,7 +74,7 @@ irs-edc-provider:
     edc:
       api:
         auth:
-          key: "123456"
+          key: <path:traceability-irs/data/ess/controlplane#apiKey>
     ## Ingress declaration to expose the network service.
     ingresses:
       ## Public / Internet facing Ingress
@@ -106,7 +106,7 @@ irs-edc-provider:
 
     configuration:
       properties: |-
-        edc.oauth.client.id=D9:3A:80:9E:9C:21:95:12:5C:C2:1D:D8:30:80:7A:B9:DD:5F:C9:09:keyid:D9:3A:80:9E:9C:21:95:12:5C:C2:1D:D8:30:80:7A:B9:DD:5F:C9:09
+        edc.oauth.client.id=<path:traceability-irs/data/int/controlplane#edc.oauth.client.id>
         edc.oauth.private.key.alias=irs-int-daps-key
         edc.oauth.provider.audience=idsc:IDS_CONNECTORS_ALL
         edc.oauth.provider.jwks.url=https://daps1.int.demo.catena-x.net/.well-known/jwks.json

diff --git a/charts/irs-environments/dev/values.yaml b/charts/irs-environments/dev/values.yaml
@@ -125,7 +125,7 @@ irs-edc-consumer:
         url: "https://irs-consumer-dataplane.dev.demo.catena-x.net"
     configuration:
       properties: |-
-        edc.oauth.client.id=4D:BE:65:C0:E8:F7:CB:09:FD:43:67:16:EF:68:F1:62:D8:B2:08:90:keyid:4D:BE:65:C0:E8:F7:CB:09:FD:43:67:16:EF:68:F1:62:D8:B2:08:90
+        edc.oauth.client.id=<path:traceability-irs/data/dev/controlplane#edc.oauth.client.id>
         edc.oauth.private.key.alias=irs-dev-daps-cert-consumer-key
         edc.oauth.provider.jwks.url=https://daps-irs.dev.demo.catena-x.net/.well-known/jwks.json
         edc.oauth.certificate.alias=irs-dev-daps-cert-consumer
@@ -175,7 +175,7 @@ irs-edc-consumer:
 
     configuration:
       properties: |-
-        edc.oauth.client.id=4D:BE:65:C0:E8:F7:CB:09:FD:43:67:16:EF:68:F1:62:D8:B2:08:90:keyid:4D:BE:65:C0:E8:F7:CB:09:FD:43:67:16:EF:68:F1:62:D8:B2:08:90
+        edc.oauth.client.id=<path:traceability-irs/data/dev/controlplane#edc.oauth.client.id>
         edc.oauth.private.key.alias=irs-dev-daps-cert-consumer-key
         edc.oauth.provider.audience=idsc:IDS_CONNECTORS_ALL
         edc.oauth.provider.jwks.url=https://daps-irs.dev.demo.catena-x.net/.well-known/jwks.json

diff --git a/charts/irs-environments/ess/values.yaml b/charts/irs-environments/ess/values.yaml
@@ -41,7 +41,7 @@ irs-helm:
       endpoint:
         data: http://ess-irs-edc-controlplane:8181/api/v1/management
       apikey:
-        secret: "123456"
+        secret: <path:traceability-irs/data/ess/controlplane#apiKey>
 
   discovery:
     endpoint: "" # Currently unknown
@@ -122,14 +122,14 @@ irs-edc-consumer:
                 alias: irs-int-daps-key
       api:
         auth:
-          key: "123456"
+          key: <path:traceability-irs/data/ess/controlplane#apiKey>
       controlplane:
         url: "https://irs-ess-consumer-controlplane.int.demo.catena-x.net"
       dataplane:
         url: "https://irs-ess-consumer-dataplane.int.demo.catena-x.net"
     configuration:
       properties: |-
-        edc.oauth.client.id=D9:3A:80:9E:9C:21:95:12:5C:C2:1D:D8:30:80:7A:B9:DD:5F:C9:09:keyid:D9:3A:80:9E:9C:21:95:12:5C:C2:1D:D8:30:80:7A:B9:DD:5F:C9:09
+        edc.oauth.client.id=<path:traceability-irs/data/int/controlplane#edc.oauth.client.id>
         edc.oauth.private.key.alias=irs-int-daps-key
         edc.oauth.provider.jwks.url=https://daps1.int.demo.catena-x.net/.well-known/jwks.json
         edc.oauth.certificate.alias=irs-int-daps-cert
@@ -147,7 +147,7 @@ irs-edc-consumer:
     edc:
       api:
         auth:
-          key: "123456"
+          key: <path:traceability-irs/data/ess/controlplane#apiKey>
     ## Ingress declaration to expose the network service.
     ingresses:
       ## Public / Internet facing Ingress
@@ -179,7 +179,7 @@ irs-edc-consumer:
 
     configuration:
       properties: |-
-        edc.oauth.client.id=D9:3A:80:9E:9C:21:95:12:5C:C2:1D:D8:30:80:7A:B9:DD:5F:C9:09:keyid:D9:3A:80:9E:9C:21:95:12:5C:C2:1D:D8:30:80:7A:B9:DD:5F:C9:09
+        edc.oauth.client.id=<path:traceability-irs/data/int/controlplane#edc.oauth.client.id>
         edc.oauth.private.key.alias=irs-int-daps-key
         edc.oauth.provider.audience=idsc:IDS_CONNECTORS_ALL
         edc.oauth.provider.jwks.url=https://daps1.int.demo.catena-x.net/.well-known/jwks.json

diff --git a/charts/irs-environments/int/values.yaml b/charts/irs-environments/int/values.yaml
@@ -40,7 +40,7 @@ irs-helm:
       host:
     controlplane:
       apikey:
-        secret: "123456"
+        secret: <path:traceability-irs/data/int/controlplane#apiKey>
 
 
   #######################
@@ -119,14 +119,14 @@ irs-edc-consumer:
                 alias: irs-int-daps-key
       api:
         auth:
-          key: "123456"
+          key: <path:traceability-irs/data/int/controlplane#apiKey>
       controlplane:
         url: "https://irs-consumer-controlplane.int.demo.catena-x.net"
       dataplane:
         url: "https://irs-consumer-dataplane.int.demo.catena-x.net"
     configuration:
       properties: |-
-        edc.oauth.client.id=D9:3A:80:9E:9C:21:95:12:5C:C2:1D:D8:30:80:7A:B9:DD:5F:C9:09:keyid:D9:3A:80:9E:9C:21:95:12:5C:C2:1D:D8:30:80:7A:B9:DD:5F:C9:09
+        edc.oauth.client.id=<path:traceability-irs/data/int/controlplane#edc.oauth.client.id>
         edc.oauth.private.key.alias=irs-int-daps-key
         edc.oauth.provider.jwks.url=https://daps1.int.demo.catena-x.net/.well-known/jwks.json
         edc.oauth.certificate.alias=irs-int-daps-cert
@@ -144,7 +144,7 @@ irs-edc-consumer:
     edc:
       api:
         auth:
-          key: "123456"
+          key: <path:traceability-irs/data/int/controlplane#apiKey>
     ## Ingress declaration to expose the network service.
     ingresses:
       ## Public / Internet facing Ingress
@@ -176,7 +176,7 @@ irs-edc-consumer:
 
     configuration:
       properties: |-
-        edc.oauth.client.id=D9:3A:80:9E:9C:21:95:12:5C:C2:1D:D8:30:80:7A:B9:DD:5F:C9:09:keyid:D9:3A:80:9E:9C:21:95:12:5C:C2:1D:D8:30:80:7A:B9:DD:5F:C9:09
+        edc.oauth.client.id=<path:traceability-irs/data/int/controlplane#edc.oauth.client.id>
         edc.oauth.private.key.alias=irs-int-daps-key
         edc.oauth.provider.audience=idsc:IDS_CONNECTORS_ALL
         edc.oauth.provider.jwks.url=https://daps1.int.demo.catena-x.net/.well-known/jwks.json

diff --git a/charts/irs-environments/pen/values.yaml b/charts/irs-environments/pen/values.yaml
@@ -38,7 +38,7 @@ irs-helm:
   edc:
     controlplane:
       apikey:
-        secret: "123456"
+        secret: <path:traceability-irs/data/pen/controlplane#apiKey>
 
   #######################
   # Minio Configuration #
@@ -94,14 +94,14 @@ irs-edc-consumer:
                 alias: irs-int-daps-key
       api:
         auth:
-          key: "123456"
+          key: <path:traceability-irs/data/pen/controlplane#apiKey>
       controlplane:
         url: "https://irs-consumer-controlplane-pen.int.demo.catena-x.net"
       dataplane:
         url: "https://irs-consumer-dataplane-pen.int.demo.catena-x.net"
     configuration:
       properties: |-
-        edc.oauth.client.id=D9:3A:80:9E:9C:21:95:12:5C:C2:1D:D8:30:80:7A:B9:DD:5F:C9:09:keyid:D9:3A:80:9E:9C:21:95:12:5C:C2:1D:D8:30:80:7A:B9:DD:5F:C9:09
+        edc.oauth.client.id=<path:traceability-irs/data/int/controlplane#edc.oauth.client.id>
         edc.oauth.private.key.alias=irs-int-daps-key
         edc.oauth.provider.jwks.url=https://daps1.int.demo.catena-x.net/.well-known/jwks.json
         edc.oauth.certificate.alias=irs-int-daps-cert
@@ -119,7 +119,7 @@ irs-edc-consumer:
     edc:
       api:
         auth:
-          key: "123456"
+          key: <path:traceability-irs/data/pen/controlplane#apiKey>
     ## Ingress declaration to expose the network service.
     ingresses:
       ## Public / Internet facing Ingress
@@ -151,7 +151,7 @@ irs-edc-consumer:
 
     configuration:
       properties: |-
-        edc.oauth.client.id=D9:3A:80:9E:9C:21:95:12:5C:C2:1D:D8:30:80:7A:B9:DD:5F:C9:09:keyid:D9:3A:80:9E:9C:21:95:12:5C:C2:1D:D8:30:80:7A:B9:DD:5F:C9:09
+        edc.oauth.client.id=<path:traceability-irs/data/int/controlplane#edc.oauth.client.id>
         edc.oauth.private.key.alias=irs-int-daps-key
         edc.oauth.provider.audience=idsc:IDS_CONNECTORS_ALL
         edc.oauth.provider.jwks.url=https://daps1.int.demo.catena-x.net/.well-known/jwks.json