diff --git a/.github/workflows/helm-checks.yaml b/.github/workflows/helm-checks.yaml index f57a8efb..09955dac 100644 --- a/.github/workflows/helm-checks.yaml +++ b/.github/workflows/helm-checks.yaml @@ -171,20 +171,20 @@ jobs: - name: Install chart and run tests (tx-data-provider) run: ct install --charts charts/tx-data-provider --target-branch ${{ steps.set-target-branch.outputs.target-branch }} - - name: Install chart for shared services (umbrella) - run: | - helm install umbrella charts/umbrella -f charts/values-test-shared-services.yaml -f charts/values-test-iam-init-container.yaml --namespace shared-services --create-namespace --debug --timeout 10m --set semantic-hub.graphdb.image=kind-registry:5000/jena-fuseki-docker:4.7.0 - helm uninstall umbrella --namespace shared-services - - name: Install chart for data exchange (umbrella) run: | helm install umbrella charts/umbrella -f charts/values-test-data-exchange.yaml -f charts/values-test-iam-init-container.yaml --namespace data-exchange --create-namespace --debug --timeout 10m helm uninstall umbrella --namespace data-exchange - - name: Install chart for bpdm (umbrella) + - name: Install chart for shared services one (umbrella) run: | - helm install umbrella charts/umbrella -f charts/values-test-bpdm.yaml --namespace bpdm --create-namespace --debug --timeout 10m - helm uninstall umbrella --namespace bpdm + helm install umbrella charts/umbrella -f charts/values-test-shared-service-1.yaml -f charts/values-test-iam-init-container.yaml --namespace shared-services --create-namespace --debug --timeout 10m + helm uninstall umbrella --namespace shared-services + + - name: Install chart for shared services two (umbrella) + run: | + helm install umbrella charts/umbrella -f charts/values-test-shared-services-2.yaml -f charts/values-test-iam-init-container.yaml --namespace shared-services --create-namespace --debug --timeout 10m --set semantic-hub.graphdb.image=kind-registry:5000/jena-fuseki-docker:4.7.0 + helm uninstall umbrella --namespace shared-services ## Skip upgrade for now until a working chart is released #- name: Run helm upgrade diff --git a/charts/tx-data-provider/Chart.yaml b/charts/tx-data-provider/Chart.yaml index d481f2a5..e1be005a 100644 --- a/charts/tx-data-provider/Chart.yaml +++ b/charts/tx-data-provider/Chart.yaml @@ -23,12 +23,12 @@ name: tx-data-provider description: A Helm chart for Kubernetes type: application -version: 0.0.5 +version: 0.0.6 appVersion: 0.0.1 dependencies: - name: digital-twin-registry - version: 0.4.5 + version: 0.4.11 repository: https://eclipse-tractusx.github.io/charts/dev condition: digital-twin-registry.enabled - name: simple-data-backend diff --git a/charts/tx-data-provider/templates/_helpers.tpl b/charts/tx-data-provider/templates/_helpers.tpl index 8684b540..913269d2 100644 --- a/charts/tx-data-provider/templates/_helpers.tpl +++ b/charts/tx-data-provider/templates/_helpers.tpl @@ -73,7 +73,7 @@ Registry URL helpers {{- if .Values.registryUrl }} {{- tpl .Values.registryUrl . }} {{ else }} - {{- printf "%s%s%s" (include "registry.host" .) (include "registry.path" .) "/api/v3.0" }} + {{- printf "%s%s%s" (include "registry.host" .) (include "registry.path" .) "/api/v3" }} {{- end }} {{- end }} diff --git a/charts/umbrella/Chart.yaml b/charts/umbrella/Chart.yaml index 18a1d152..4a0ba18c 100644 --- a/charts/umbrella/Chart.yaml +++ b/charts/umbrella/Chart.yaml @@ -80,19 +80,19 @@ dependencies: # TX Data Consumer 1 - name: tx-data-provider alias: dataconsumerOne - version: 0.0.5 - repository: https://eclipse-tractusx.github.io/charts/dev + version: 0.0.6 + repository: file://../tx-data-provider condition: dataconsumerOne.enabled # TX Data Providers - name: tx-data-provider - version: 0.0.5 - repository: https://eclipse-tractusx.github.io/charts/dev + version: 0.0.6 + repository: file://../tx-data-provider condition: tx-data-provider.enabled # TX Data Consumer 2 - name: tx-data-provider alias: dataconsumerTwo - version: 0.0.5 - repository: https://eclipse-tractusx.github.io/charts/dev + version: 0.0.6 + repository: file://../tx-data-provider condition: dataconsumerTwo.enabled # pgadmin4 as helper tool for easy database access - condition: pgadmin4.enabled diff --git a/charts/umbrella/values.yaml b/charts/umbrella/values.yaml index d503ca64..3f54fc6c 100644 --- a/charts/umbrella/values.yaml +++ b/charts/umbrella/values.yaml @@ -992,7 +992,7 @@ tx-data-provider: enabled: false seedTestdata: true backendUrl: http://{{ .Release.Name }}-dataprovider-submodelserver:8080 - registryUrl: http://{{ .Release.Name }}-dataprovider-dtr:8080/api/v3.0 + registryUrl: http://{{ .Release.Name }}-dataprovider-dtr:8080/api/v3 controlplanePublicUrl: http://{{ .Release.Name }}-dataprovider-edc-controlplane:8084 controlplaneManagementUrl: http://{{ .Release.Name }}-dataprovider-edc-controlplane:8081 dataplaneUrl: http://{{ .Release.Name }}-dataprovider-edc-dataplane:8081 diff --git a/charts/values-test-shared-services.yaml b/charts/values-test-shared-services-1.yaml similarity index 84% rename from charts/values-test-shared-services.yaml rename to charts/values-test-shared-services-1.yaml index f1abb933..ac60bfdb 100644 --- a/charts/values-test-shared-services.yaml +++ b/charts/values-test-shared-services-1.yaml @@ -26,26 +26,11 @@ centralidp: sharedidp: enabled: true -bpndiscovery: - enabled: true - -discoveryfinder: - enabled: true - selfdescription: enabled: true -semantic-hub: - enabled: true - managed-identity-wallet: enabled: true bpdm: - enabled: true - -dataconsumer: - enabled: false - -tx-data-provider: - enabled: false + enabled: true \ No newline at end of file diff --git a/charts/values-test-bpdm.yaml b/charts/values-test-shared-services-2.yaml similarity index 62% rename from charts/values-test-bpdm.yaml rename to charts/values-test-shared-services-2.yaml index 0a34e552..ae10616f 100644 --- a/charts/values-test-bpdm.yaml +++ b/charts/values-test-shared-services-2.yaml @@ -1,4 +1,4 @@ -# ############################################################################# +############################################################### # Copyright (c) 2024 Contributors to the Eclipse Foundation # # See the NOTICE file(s) distributed with this work for additional @@ -15,38 +15,13 @@ # under the License. # # SPDX-License-Identifier: Apache-2.0 -# ############################################################################# ---- - -portal: - enabled: false - -centralidp: - enabled: true - -sharedidp: - enabled: false +############################################################### bpndiscovery: - enabled: false + enabled: true discoveryfinder: - enabled: false - -selfdescription: - enabled: false - -managed-identity-wallet: - enabled: false - -dataconsumer: - enabled: false - -tx-data-provider: - enabled: false - -pgadmin4: - enabled: false + enabled: true -bpdm: - enabled: true \ No newline at end of file +semantic-hub: + enabled: true