From d7c7ae938637dd85e093832b2e26d4a84dcd030a Mon Sep 17 00:00:00 2001
From: Jaro Hartmann <jaro.hartmann@doubleslash.de>
Date: Mon, 4 Mar 2024 10:42:59 +0100
Subject: [PATCH] chore(charts): update IRS to 4.7.0

---
 charts/irs-environments/dev/Chart.yaml  |  2 +-
 charts/irs-environments/ess/Chart.yaml  |  2 +-
 charts/irs-environments/int/Chart.yaml  |  2 +-
 charts/irs-environments/pen/Chart.yaml  |  2 +-
 charts/irs-environments/pen/values.yaml | 34 ++++++++++++++-----------
 5 files changed, 23 insertions(+), 19 deletions(-)

diff --git a/charts/irs-environments/dev/Chart.yaml b/charts/irs-environments/dev/Chart.yaml
index 09ae28edbb..5b8a2113c8 100644
--- a/charts/irs-environments/dev/Chart.yaml
+++ b/charts/irs-environments/dev/Chart.yaml
@@ -19,7 +19,7 @@ version: 1.0.6
 dependencies:
   - name: irs-helm
     repository: https://eclipse-tractusx.github.io/item-relationship-service
-    version: 6.14.0
+    version: 6.16.0
   - name: tractusx-connector
     repository: https://eclipse-tractusx.github.io/tractusx-edc
     version: 0.5.3
diff --git a/charts/irs-environments/ess/Chart.yaml b/charts/irs-environments/ess/Chart.yaml
index 3b2db1dee9..0ee56cecef 100644
--- a/charts/irs-environments/ess/Chart.yaml
+++ b/charts/irs-environments/ess/Chart.yaml
@@ -19,7 +19,7 @@ version: 1.0.0
 dependencies:
   - name: irs-helm
     repository: https://eclipse-tractusx.github.io/item-relationship-service
-    version: 6.14.0
+    version: 6.16.0
   - name: tractusx-connector
     repository: https://eclipse-tractusx.github.io/tractusx-edc
     version: 0.5.3
diff --git a/charts/irs-environments/int/Chart.yaml b/charts/irs-environments/int/Chart.yaml
index 84de26bf02..d4962f1291 100644
--- a/charts/irs-environments/int/Chart.yaml
+++ b/charts/irs-environments/int/Chart.yaml
@@ -19,7 +19,7 @@ version: 1.0.4
 dependencies:
   - name: irs-helm
     repository: https://eclipse-tractusx.github.io/item-relationship-service
-    version: 6.14.0
+    version: 6.16.0
   - name: tractusx-connector
     repository: https://eclipse-tractusx.github.io/tractusx-edc
     version: 0.5.3
diff --git a/charts/irs-environments/pen/Chart.yaml b/charts/irs-environments/pen/Chart.yaml
index e93ca9bb78..89de53d398 100644
--- a/charts/irs-environments/pen/Chart.yaml
+++ b/charts/irs-environments/pen/Chart.yaml
@@ -19,7 +19,7 @@ version: 1.0.3
 dependencies:
   - name: irs-helm
     repository: https://eclipse-tractusx.github.io/item-relationship-service
-    version: 6.13.0
+    version: 6.16.0
   - name: tractusx-connector
     repository: https://eclipse-tractusx.github.io/tractusx-edc
     version: 0.5.3
diff --git a/charts/irs-environments/pen/values.yaml b/charts/irs-environments/pen/values.yaml
index 4e8703b950..85fbd48369 100644
--- a/charts/irs-environments/pen/values.yaml
+++ b/charts/irs-environments/pen/values.yaml
@@ -24,6 +24,7 @@ irs-helm:
         secretName: tls-secret
   digitalTwinRegistry:
     url: https://semantics-pen.dev.demo.catena-x.net/registry
+  discovery:
     discoveryFinderUrl: https://semantics-pen.dev.demo.catena-x.net/discoveryfinder/api/administration/connectors/discovery/search
   semanticshub:
     url: https://semantics-pen.dev.demo.catena-x.net/hub/api/v1/models
@@ -33,11 +34,23 @@ irs-helm:
   minioUser: <path:traceability-irs/data/int/minio#minioUser>
   minioPassword: <path:traceability-irs/data/int/minio#minioPassword>
   oauth2:
-    clientId: <path:traceability-irs/data/pen/oauth2#clientId>
-    clientSecret: <path:traceability-irs/data/pen/oauth2#clientSecret>
     clientTokenUri: <path:traceability-irs/data/pen/oauth2#tokenUri>
+    semantics:
+      clientId: <path:traceability-irs/data/pen/oauth2#clientId>
+      clientSecret: <path:traceability-irs/data/pen/oauth2#clientSecret>
+    discovery:
+      clientId: <path:traceability-irs/data/pen/oauth2#clientId>
+      clientSecret: <path:traceability-irs/data/pen/oauth2#clientSecret>
+    bpdm:
+      clientId: <path:traceability-irs/data/pen/oauth2#clientId>
+      clientSecret: <path:traceability-irs/data/pen/oauth2#clientSecret>
   edc:
+    submodel:
+      request:
+        ttl: PT2M
     controlplane:
+      request:
+        ttl: PT2M
       apikey:
         secret: <path:traceability-irs/data/pen/controlplane#apiKey>
 
@@ -66,16 +79,16 @@ tractusx-connector:
     daps: false
     vault: false
   participant:
-    id: BPNL00000001CRHK
+    id: <path:traceability-irs/data/int/controlplane#participantId>
 
   controlplane:
     # SSI configuration
     ssi:
       miw:
-        url: <path:traceability-irs/data/dev/controlplane#ssi.miw.url>
-        authorityId: <path:traceability-irs/data/dev/controlplane#ssi.miw.authorityId>
+        url: <path:traceability-irs/data/int/controlplane#ssi.miw.url>
+        authorityId: <path:traceability-irs/data/int/controlplane#ssi.miw.authorityId>
       oauth:
-        tokenurl: <path:traceability-irs/data/dev/controlplane#ssi.oauth.tokenurl>
+        tokenurl: <path:traceability-irs/data/int/controlplane#ssi.oauth.tokenurl>
         client:
           id: <path:traceability-irs/data/pen/controlplane#ssi.oauth.client.id>
           secretAlias: miw-pen-keycloak-secret
@@ -103,11 +116,6 @@ tractusx-connector:
       protocol:
         port: 8084
         path: /api/v1/dsp
-      # -- observability api with unsecured access, must not be internet facing
-      observability:
-        port: 8085
-        path: /observability  # -- observability api, provides /health /readiness and /liveness endpoints
-        insecure: true  # -- allow or disallow insecure access, i.e. access without authentication
 
     internationalDataSpaces:
       id: TXDC
@@ -144,10 +152,6 @@ tractusx-connector:
       public:
         port: 8081
         path: /api/public
-      observability:
-        port: 8085
-        path: /observability
-        insecure: true
 
     resources:
       limits: