Merge pull request #118 from eclipse-tractusx/merge/upgrade/24.05

build: merge upgrade to R24.05
eclipse-tractusx · Aug 14, 2024 · 73d77e5 · 73d77e5
2 parents d3bdd0b + c99deed
commit 73d77e5
Show file tree

Hide file tree

Showing 45 changed files with 5,086 additions and 12,683 deletions.
diff --git a/.github/workflows/chart-release.yaml b/.github/workflows/chart-release.yaml
@@ -49,6 +49,25 @@ jobs:
         with:
           token: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Install Helm
+        uses: azure/setup-helm@fe7b79cd5ee1e45176fcad797de68ecaf3ca4814 # v4
+        with:
+          token: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Update helm dependencies for tx-data-provider
+        run: |
+          cd charts/tx-data-provider
+          helm repo add tractusx-dev https://eclipse-tractusx.github.io/charts/dev
+          helm repo add hashicorp https://helm.releases.hashicorp.com
+          helm dependency update
+
+      - name: Update helm dependencies for umbrella
+        run: |
+          cd charts/umbrella
+          helm repo add tractusx-dev https://eclipse-tractusx.github.io/charts/dev
+          helm repo add pgadmin4 https://helm.runix.net
+          helm dependency update
+
       - name: Run chart-releaser
         uses: helm/[email protected]
         env:

diff --git a/.github/workflows/helm-checks.yaml b/.github/workflows/helm-checks.yaml
@@ -71,10 +71,19 @@ jobs:
     - name: Set up chart-testing
       uses: helm/[email protected]
 
+    - name: Set target branch
+      id: set-target-branch
+      run: |
+        if [ -n "${{ github.event.pull_request.base.ref }}" ]; then
+          echo "target-branch=${{ github.event.pull_request.base.ref }}" >> "$GITHUB_OUTPUT"
+        else
+          echo "target-branch=${{ github.event.repository.default_branch }}" >> "$GITHUB_OUTPUT"
+        fi
+
     - name: Run chart-testing (list-changed)
       id: list-changed
       run: |
-        changed=$(ct list-changed --target-branch ${{ github.event.repository.default_branch }})
+        changed=$(ct list-changed --target-branch ${{ steps.set-target-branch.outputs.target-branch }})
         if [[ -n "$changed" ]]; then
           echo "changed=true" >> $GITHUB_OUTPUT
         fi
@@ -127,6 +136,13 @@ jobs:
         push: true
         tags: kind-registry:5000/init-container:testing
 
+    - name: Build iatp mock
+      uses: docker/build-push-action@4a13e500e55cf31b7a5d59a38ab2040ab0f42f56 # v5.1.0
+      with:
+        context: ./iatp-mock/
+        push: true
+        tags: kind-registry:5000/iatp-mock:testing
+
     - name: Set up Helm
       uses: azure/setup-helm@b7246b12e77f7134dc2d460a3d5bad15bbe29390 # v4.1.0
       with:
@@ -137,31 +153,49 @@ jobs:
         python-version: '3.10'
         check-latest: true
 
+    - name: Set target branch
+      id: set-target-branch
+      run: |
+        if [ -n "${{ github.event.pull_request.base.ref }}" ]; then
+          echo "target-branch=${{ github.event.pull_request.base.ref }}" >> "$GITHUB_OUTPUT"
+        else
+          echo "target-branch=${{ github.event.repository.default_branch }}" >> "$GITHUB_OUTPUT"
+        fi
+
     - name: Set up chart-testing
       uses: helm/[email protected]
 
     - name: Lint chart
-      run: ct lint --validate-maintainers=false --target-branch ${{ github.event.repository.default_branch }}
+      run: ct lint --validate-maintainers=false --target-branch ${{ steps.set-target-branch.outputs.target-branch }}
 
     - name: Download chart dependencies (recursive)
       shell: bash
       run: hack/helm-dependencies.bash
 
     - name: Install chart and run tests (simple-data-backend)
-      run: ct install --charts charts/simple-data-backend --target-branch ${{ github.event.repository.default_branch }} --helm-extra-set-args "--set image.repository=kind-registry:5000/simple-data-backend --set image.tag=testing"
+      run: ct install --charts charts/simple-data-backend --target-branch ${{ steps.set-target-branch.outputs.target-branch }} --helm-extra-set-args "--set image.repository=kind-registry:5000/simple-data-backend --set image.tag=testing"
 
     - name: Install chart and run tests (tx-data-provider)
-      run: ct install --charts charts/tx-data-provider --target-branch ${{ github.event.repository.default_branch }}
+      run: ct install --charts charts/tx-data-provider --target-branch ${{ steps.set-target-branch.outputs.target-branch }}
+
+    - name: Install chart for data exchange (umbrella)
+      run: |
+        helm dep up charts/tx-data-provider
+        helm dep up charts/umbrella
+        helm install umbrella charts/umbrella --namespace data-exchange --create-namespace --debug --timeout 10m \
+        -f charts/values-test-data-exchange.yaml -f charts/values-test-iam-init-container.yaml \
+        --set iatpmock.image.repository=kind-registry:5000/iatp-mock --set iatpmock.image.tag=testing
+        helm uninstall umbrella --namespace data-exchange
 
-    - name: Install chart for shared services (umbrella)
+    - name: Install chart for shared services one (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 install umbrella charts/umbrella -f charts/values-test-shared-services-1.yaml -f charts/values-test-iam-init-container.yaml --namespace shared-services --create-namespace --debug --timeout 10m --set iatpmock.image.repository=kind-registry:5000/iatp-mock --set iatpmock.image.tag=testing
         helm uninstall umbrella --namespace shared-services
 
-    - name: Install chart for data exchange (umbrella)
+    - name: Install chart for shared services two (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
+        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
@@ -23,12 +23,12 @@ name: tx-data-provider
 description: A Helm chart for Kubernetes
 
 type: application
-version: 0.0.5
+version: 0.1.0
 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
@@ -37,7 +37,7 @@ dependencies:
     condition: simple-data-backend.enabled
   - name: tractusx-connector
     repository: https://eclipse-tractusx.github.io/charts/dev
-    version: 0.5.3
+    version: 0.7.1
     condition: tractusx-connector.enabled
   - name: vault
     version: 0.20.0