Feature/tri 682 update edc to version 0.1.1

.github/workflows/TEST-INT-Setup-Data.yml

@@ -19,8 +19,8 @@ on:
         description: 'URL for Submodel server 3'
         required: true
         type: string
-      internalProviderControlPlane:
-        description: 'Internal provider control plane URL of ids port'
+      publicProviderControlPlane:
+        description: 'Public provider control plane URL of ids'
         required: true
         type: string
       aasUrl:
@@ -50,23 +50,27 @@ jobs:
           cache: 'pip'
       - run: pip install -r testdata-transform/requirements.txt
 
-      - name: Setup Test Data on INT
+      - name: Delete existing and setup new test data on provider EDC and Registry
         env:
           TESTFILE_PATH: ${{ github.event.inputs.testfilePath }}
           SUBMODEL_URL_1: ${{ github.event.inputs.submodelUrl1 }}
           SUBMODEL_URL_2: ${{ github.event.inputs.submodelUrl2 }}
           SUBMODEL_URL_3: ${{ github.event.inputs.submodelUrl3 }}
-          INTERNAL_PROVIDER_CONTROL_PLANE: ${{ github.event.inputs.internalProviderControlPlane }}
+          INTERNAL_PROVIDER_CONTROL_PLANE: ${{ github.event.inputs.publicProviderControlPlane }}
           AAS_URL: ${{ github.event.inputs.aasUrl }}
           EDC_URL: ${{ github.event.inputs.edcUrl }}
           EDC_API_KEY: ${{ github.event.inputs.edcApiKey }}
         run: |
+          python testdata-transform/reset-env.py \
+          -a $AAS_URL \
+          -e $EDC_URL \
+          -k $EDC_API_KEY
           python testdata-transform/transform-and-upload.py \
           -f $TESTFILE_PATH \
           -s1 $SUBMODEL_URL_1 \
           -s2 $SUBMODEL_URL_2 \
           -s3 $SUBMODEL_URL_3 \
-          -i $INTERNAL_PROVIDER_CONTROL_PLANE \
+          -c $INTERNAL_PROVIDER_CONTROL_PLANE \
           -a $AAS_URL \
           -e $EDC_URL \
           -k $EDC_API_KEY

charts/irs/Chart.yaml

@@ -1,6 +1,6 @@
 apiVersion: v2
 name: irs
-description: A Helm chart for Kubernetes for Catena-X
+description: IRS Helm chart for Kubernetes for Catena-X
 
 
 # Application charts are a collection of templates that can be packaged into versioned archives
@@ -14,13 +14,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: 1.0.0
+version: 1.1.0
 
 # 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: "0.2.0"
+appVersion: "1.1.0"
 
 dependencies:
   - name: common

charts/irs/charts/aaswrapper/Chart.yaml

@@ -15,10 +15,10 @@ 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: 1.0.0
+version: 1.0.1
 
 # 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: "0.0.3"
+appVersion: "0.0.6"

charts/irs/charts/aaswrapper/values.yaml

@@ -4,13 +4,10 @@
 
 replicaCount: 1
 
-namespace: product-traceability-irs
-
 image:
   repository: ghcr.io/catenax-ng/catenax-at-home/consumer-api-wrapper
   pullPolicy: Always
   # Overrides the image tag whose default is the chart appVersion.
-  tag: "0.0.5"
 
 imagePullSecrets: []
 

charts/irs/charts/edc-controlplane/Chart.yaml

@@ -4,6 +4,6 @@ name: edc-controlplane
 description: EDC Control-Plane
 home: https://github.com/catenax-ng/product-edc/deployment/helm/edc-controlplane
 type: application
-appVersion: "0.1.0"
-version: 0.1.0
+appVersion: "0.1.1"
+version: 0.1.1
 maintainers: []

charts/irs/charts/edc-controlplane/values-dev-consumer.yaml

@@ -45,6 +45,7 @@ configuration:
     edc.ids.id=urn:connector:edc-consumer-controlplane
     edc.ids.catalog.id=urn:catalog:default
     edc.ids.endpoint=https://irs-consumer-controlplane.dev.demo.catena-x.net/api/v1/ids
+    edc.ids.endpoint.audience=https://irs-consumer-controlplane.dev.demo.catena-x.net/api/v1/ids/data
 
     edc.receiver.http.endpoint=http://aaswrapper:9192/callback/endpoint-data-reference
 

charts/irs/charts/edc-controlplane/values-dev-provider.yaml

@@ -48,6 +48,7 @@ configuration:
     edc.ids.id=urn:connector:edc-provider-controlplane
     edc.ids.catalog.id=urn:catalog:default
     edc.ids.endpoint=https://irs-provider-controlplane.dev.demo.catena-x.net/api/v1/ids
+    edc.ids.endpoint.audience=https://irs-provider-controlplane.dev.demo.catena-x.net/api/v1/ids/data
 
     edc.receiver.http.endpoint=http://irs-provider-controlplane:8080/api/service/pull
 

charts/irs/charts/edc-controlplane/values-int.yaml

@@ -9,7 +9,7 @@ nameOverride: "edc-consumer-controlplane"
 fullnameOverride: "edc-consumer-controlplane"
 
 image:
-  tag: "0.1.0"
+  tag: "0.1.1"
 
 ## Ingress declaration to expose the network service.
 ingresses:
@@ -47,6 +47,7 @@ configuration:
     edc.ids.id=urn:connector:edc-consumer-controlplane
     edc.ids.catalog.id=urn:catalog:default
     edc.ids.endpoint=https://irs-consumer-controlplane.int.demo.catena-x.net/api/v1/ids
+    edc.ids.endpoint.audience=https://irs-consumer-controlplane.int.demo.catena-x.net/api/v1/ids/data
 
     edc.receiver.http.endpoint=http://aaswrapper:9192/callback/endpoint-data-reference
 

charts/irs/charts/edc-controlplane/values-pen.yaml

@@ -9,7 +9,7 @@ nameOverride: "edc-consumer-controlplane-pen"
 fullnameOverride: "edc-consumer-controlplane-pen"
 
 image:
-  tag: "0.1.0"
+  tag: "0.1.1"
 
 ## Ingress declaration to expose the network service.
 ingresses:
@@ -47,6 +47,7 @@ configuration:
     edc.ids.id=urn:connector:edc-consumer-controlplane-pen
     edc.ids.catalog.id=urn:catalog:default
     edc.ids.endpoint=https://irs-consumer-controlplane-pen.int.demo.catena-x.net/api/v1/ids
+    edc.ids.endpoint.audience=https://irs-consumer-controlplane-pen.int.demo.catena-x.net/api/v1/ids/data
 
     edc.receiver.http.endpoint=http://aaswrapper-pen:9192/callback/endpoint-data-reference
 

charts/irs/charts/edc-controlplane/values-spike-consumer.yaml

@@ -45,6 +45,7 @@ configuration:
     edc.ids.id=urn:connector:edc-consumer-controlplane-spike
     edc.ids.catalog.id=urn:catalog:default
     edc.ids.endpoint=https://irs-consumer-controlplane-spike.dev.demo.catena-x.net/api/v1/ids
+    edc.ids.endpoint.audience=https://irs-consumer-controlplane-spike.dev.demo.catena-x.net/api/v1/ids/data
 
     edc.receiver.http.endpoint=http://aaswrapper-spike:9192/callback/endpoint-data-reference
 

charts/irs/charts/edc-controlplane/values-spike-provider.yaml

@@ -48,6 +48,7 @@ configuration:
     edc.ids.id=urn:connector:edc-provider-controlplane-spike
     edc.ids.catalog.id=urn:catalog:default
     edc.ids.endpoint=https://irs-provider-controlplane-spike.dev.demo.catena-x.net/api/v1/ids
+    edc.ids.endpoint.audience=https://irs-provider-controlplane-spike.dev.demo.catena-x.net/api/v1/ids/data
 
     edc.receiver.http.endpoint=http://irs-provider-controlplane-spike:8080/api/service/pull
 

charts/irs/charts/edc-controlplane/values.yaml

@@ -7,8 +7,6 @@
 # Note: If horizontal pod autoscaling is enabled this setting has no effect
 replicaCount: 1
 
-namespace: product-traceability-irs
-
 image:
   # -- Which derivate of the edc control-plane to use.
   # One of: [ghcr.io/catenax-ng/product-edc/edc-controlplane-postgresql-hashicorp-vault, ghcr.io/catenax-ng/product-edc/edc-controlplane-postgresql, ghcr.io/catenax-ng/product-edc/edc-controlplane-memory]

charts/irs/charts/edc-dataplane/Chart.yaml

@@ -5,6 +5,6 @@ description: >-
   EDC Data-Plane - The Eclipse DataSpaceConnector data layer with responsibility of transferring and receiving data streams
 home: https://github.com/catenax-ng/product-edc/deployment/helm/edc-dataplane
 type: application
-appVersion: "0.1.0"
-version: 0.1.0
+appVersion: "0.1.1"
+version: 0.1.1
 maintainers: []

charts/irs/charts/edc-dataplane/values-int.yaml

@@ -4,7 +4,7 @@
 # Declare variables to be passed into your templates.
 
 image:
-  tag: "0.1.0"
+  tag: "0.1.1"
 
 # -- Overrides the charts name
 nameOverride: "edc-consumer-dataplane"

charts/irs/charts/edc-dataplane/values-pen.yaml

@@ -4,7 +4,7 @@
 # Declare variables to be passed into your templates.
 
 image:
-  tag: "0.1.0"
+  tag: "0.1.1"
 
 # -- Overrides the charts name
 nameOverride: "edc-consumer-dataplane-pen"

charts/irs/charts/edc-dataplane/values.yaml

@@ -7,8 +7,6 @@
 # Note: If horizontal pod autoscaling is enabled this setting has no effect
 replicaCount: 1
 
-namespace: product-traceability-irs
-
 image:
   # -- Which derivate of the edc data-plane to use.
   # One of: [ghcr.io/catenax-ng/product-edc/edc-dataplane-hashicorp-vault, ghcr.io/catenax-ng/product-edc/edc-dataplane-azure-vault]

charts/irs/charts/grafana/Chart.yaml

@@ -15,7 +15,7 @@ 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: 0.1.0
+version: 1.0.0
 
 # 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

charts/irs/charts/grafana/templates/configmap-dashboards-providers.yaml

@@ -1,4 +1,4 @@
----
+{{- if .Values.global.enableGrafana -}}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -11,3 +11,4 @@ data:
   dashboardproviders.yaml: |-
     {{- toYaml . | nindent 4 }}
   {{- end }}
+  {{- end }}

charts/irs/charts/grafana/templates/configmap-dashboards.yaml

@@ -1,3 +1,4 @@
+{{- if .Values.global.enableGrafana -}}
 {{- if .Values.dashboards }}
 {{ $files := .Files }}
 apiVersion: v1
@@ -12,4 +13,5 @@ data:
   {{ $k }}-dashboard.json: |
 {{ ($files.Get $v) | indent 4 }}
   {{- end }}
+{{- end }}
 {{- end }}

charts/irs/charts/grafana/templates/configmap.yaml

@@ -1,4 +1,4 @@
----
+{{- if .Values.global.enableGrafana -}}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -11,3 +11,4 @@ data:
   datasources.yaml: |-
     {{- toYaml . | nindent 4 }}
   {{- end }}
+  {{- end }}

charts/irs/charts/grafana/templates/deployment.yaml

@@ -1,3 +1,4 @@
+{{- if .Values.global.enableGrafana -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -119,4 +120,5 @@ spec:
       {{- with .Values.tolerations }}
       tolerations:
         {{- toYaml . | nindent 8 }}
-      {{- end }}
+      {{- end }}
+{{- end }}

charts/irs/charts/grafana/templates/hpa.yaml

@@ -1,3 +1,4 @@
+{{- if .Values.global.enableGrafana -}}
 {{- if .Values.autoscaling.enabled }}
 apiVersion: autoscaling/v2beta1
 kind: HorizontalPodAutoscaler
@@ -27,3 +28,4 @@ spec:
         targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
     {{- end }}
 {{- end }}
+  {{- end }}

charts/irs/charts/grafana/templates/ingress.yaml

@@ -1,3 +1,4 @@
+{{- if .Values.global.enableGrafana -}}
 {{- if .Values.ingress.enabled -}}
   {{- $fullName := include "grafana.fullname" . -}}
   {{- $svcPort := .Values.service.port -}}
@@ -59,4 +60,5 @@ spec:
               {{- end }}
           {{- end }}
     {{- end }}
-  {{- end }}
+  {{- end }}
+{{- end }}

charts/irs/charts/grafana/templates/secrets.yaml

@@ -1,3 +1,4 @@
+{{- if .Values.global.enableGrafana -}}
 {{- if not .Values.existingSecret }}
 apiVersion: v1
 kind: Secret
@@ -13,3 +14,4 @@ data:
   oauthClientId: {{ .Values.oauthClientId | b64enc | quote }}
   oauthClientSecret: {{ .Values.oauthClientSecret | b64enc | quote }}
 {{- end }}
+{{- end }}

charts/irs/charts/grafana/templates/service.yaml

@@ -1,3 +1,4 @@
+{{- if .Values.global.enableGrafana -}}
 apiVersion: v1
 kind: Service
 metadata:
@@ -14,3 +15,4 @@ spec:
       name: http
   selector:
     {{- include "grafana.selectorLabels" . | nindent 4 }}
+{{- end }}

charts/irs/charts/grafana/templates/serviceaccount.yaml

@@ -1,3 +1,4 @@
+{{- if .Values.global.enableGrafana -}}
 {{- if .Values.serviceAccount.create -}}
 apiVersion: v1
 kind: ServiceAccount
@@ -11,3 +12,4 @@ metadata:
     {{- toYaml . | nindent 4 }}
   {{- end }}
 {{- end }}
+{{- end }}

charts/irs/charts/grafana/values.yaml

@@ -4,8 +4,6 @@
 
 replicaCount: 1
 
-namespace: product-traceability-irs
-
 image:
   repository: grafana/grafana
   pullPolicy: IfNotPresent

charts/irs/charts/prometheus/Chart.yaml

@@ -15,7 +15,7 @@ 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: 1.0.0
+version: 1.1.0
 
 # 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

charts/irs/charts/prometheus/templates/configmap.yaml

@@ -1,4 +1,4 @@
----
+{{- if .Values.global.enablePrometheus -}}
 apiVersion: v1
 kind: ConfigMap
 metadata:
@@ -11,3 +11,4 @@ data:
   prometheus.yml: |-
     {{- toYaml . | nindent 4 }}
   {{- end }}
+{{- end }}

charts/irs/charts/prometheus/templates/deployment.yaml

@@ -1,3 +1,4 @@
+{{- if .Values.global.enablePrometheus -}}
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -79,3 +80,4 @@ spec:
       tolerations:
         {{- toYaml . | nindent 8 }}
       {{- end }}
+{{- end }}

charts/irs/charts/prometheus/templates/hpa.yaml

@@ -1,3 +1,4 @@
+{{- if .Values.global.enablePrometheus -}}
 {{- if .Values.autoscaling.enabled }}
 apiVersion: autoscaling/v2beta1
 kind: HorizontalPodAutoscaler
@@ -27,3 +28,4 @@ spec:
         targetAverageUtilization: {{ .Values.autoscaling.targetMemoryUtilizationPercentage }}
     {{- end }}
 {{- end }}
+{{- end }}

charts/irs/charts/prometheus/templates/ingress.yaml

@@ -1,3 +1,4 @@
+{{- if .Values.global.enablePrometheus -}}
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "prometheus.fullname" . -}}
 {{- $svcPort := .Values.service.port -}}
@@ -60,3 +61,4 @@ spec:
           {{- end }}
     {{- end }}
 {{- end }}
+{{- end }}