Merge pull request #555 from catenax-ng/feature/TRI-1640-enable-IRS-f…

…or-STABLE

feature/TRI-1640-enable-IRS-for-STABLE

charts/irs-helm/CHANGELOG.md

@@ -5,6 +5,8 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
+### Changed
+- Added toString template for `edc.controlplane.apikey.secret`
 
 ## [6.7.0] - 2023-09-28
 ### Changed

charts/irs-helm/templates/secrets.yaml

@@ -39,7 +39,7 @@ data:
   keycloakClientSecret: {{ .Values.keycloak.oauth2.clientSecret | default "keycloakClientSecret" | b64enc | quote }}
   portalClientId: {{ .Values.portal.oauth2.clientId | default "portalClientId" | b64enc | quote }}
   portalClientSecret: {{ .Values.portal.oauth2.clientSecret | default "portalClientSecret" | b64enc | quote }}
-  edcApiSecret: {{ .Values.edc.controlplane.apikey.secret | default "" | b64enc | quote }}
+  edcApiSecret: {{ .Values.edc.controlplane.apikey.secret | toString | default "" | b64enc | quote }}
   {{- if .Values.grafana.enabled }}
   grafanaUser: {{ .Values.grafana.user | default "grafana" | b64enc | quote }}
   grafanaPassword: {{ .Values.grafana.password | default "grafana" | b64enc | quote }}

docs/src/docs/administration/configuration.adoc

@@ -24,6 +24,31 @@ include::../../../../charts/irs-helm/values.yaml[lines=104..287]
 ==== <irs-url>
 The hostname where the IRS will be made available.
 
+=== <ingress>
+To expose the IRS service, you need to add an ingress for the default port 8080.
+You can do this by adding this to ingress:
+
+[source,yaml]
+----
+ingress:
+  enabled: true
+  className: "nginx"
+  annotations:
+    nginx.ingress.kubernetes.io/ssl-passthrough: "false"
+    nginx.ingress.kubernetes.io/backend-protocol: "HTTP"
+    nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
+  hosts:
+    - host: "public.irs.hostname"
+      paths:
+        - path: /
+          pathType: Prefix
+          port: 8080
+  tls:
+    - hosts:
+      - "public.irs.hostname"
+      secretName: tls-secret
+----
+
 ==== <digital-twin-registry-url>
 The URL of the Digital Twin Registry. The IRS uses this service to fetch AAS shells.
 
@@ -62,6 +87,34 @@ If you want to use local schema files, you need to provide them directly in the
 The *key* of each entry is the `Base64` encoded URN of the model. The *value* is the `Base64` encoded content of the schema file itself. The entries will then be mounted into the IRS container and used on demand. For reference, see the example comment in the default `values.yaml`.
 
 
+== Use existing EDC consumer
+If you want to use an existing EDC as consumer, you need to add the management endpoint URL of this edc to `edc.controlplane.endpoint.data`.
+You also have to add an ingress for the IRS EDC EDR Token callback endpoint (default port: 8181):
+
+[source,yaml]
+----
+ingress:
+  enabled: true
+  className: "nginx"
+  annotations:
+    nginx.ingress.kubernetes.io/ssl-passthrough: "false"
+    nginx.ingress.kubernetes.io/backend-protocol: "HTTP"
+    nginx.ingress.kubernetes.io/force-ssl-redirect: "true"
+  hosts:
+    - host: "public.irs.hostname"
+      paths:
+        - path: /
+          pathType: Prefix
+          port: 8080
+        - path: /internal
+          port: 8181
+          pathType: Prefix
+  tls:
+    - hosts:
+      - "public.irs.hostname"
+      secretName: tls-secret
+----
+
 == EDC consumer configuration
 If you want to provide your own EDC consumer, add the EDC Helm Chart as dependency to your Chart.yaml. The helm chart and documentation can be found here: https://github.com/eclipse-tractusx/tractusx-edc/tree/main/charts/tractusx-connector[tractusx-connector]