From 47f4321bb34cfd595ee5a4604259eaf4224c775d Mon Sep 17 00:00:00 2001
From: "Dr. Christoph \"Schorsch\" Jung" <c-jung@t-systems.com>
Date: Tue, 22 Aug 2023 13:49:59 +0200
Subject: [PATCH] https://jira.catena-x.net/browse/KA-328 switch chart to local
 kind registry, using the correct ct command line

---
 .github/workflows/helm-chart-lint.yml   | 8 ++++----
 charts/config/chart-testing-config.yaml | 2 +-
 charts/provisioning-agent/values.yaml   | 2 +-
 charts/remoting-agent/values.yaml       | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/helm-chart-lint.yml b/.github/workflows/helm-chart-lint.yml
index 41174df6..995353e5 100644
--- a/.github/workflows/helm-chart-lint.yml
+++ b/.github/workflows/helm-chart-lint.yml
@@ -99,7 +99,7 @@ jobs:
       # install the chart to the kind cluster and run helm test
       # define charts to test with the --charts parameter
       - name: Run chart-testing (install)
-        run: ct install --charts charts/conforming-agent,charts/provisioning-agent,charts/remoting-agent --config charts/config/chart-testing-config.yaml
+        run: ct install --charts charts/conforming-agent,charts/provisioning-agent,charts/remoting-agent --config charts/config/chart-testing-config.yaml --helm-extra-set-args="--set=image.registry=kind-registry:5000/"
         if: github.event_name != 'pull_request' || env.CHART_CHANGED == 'true'
 
       # Upgrade the released chart version with the locally available chart
@@ -107,7 +107,7 @@ jobs:
       - name: Run helm upgrade on conforming agent
         run: |
           helm repo add tractusx-dev https://eclipse-tractusx.github.io/charts/dev
-          helm install conforming tractusx-dev/conforming-agent --version ${{ github.event.inputs.upgrade_from || 'x.x.x' }}
+          helm install conforming tractusx-dev/conforming-agent --version ${{ github.event.inputs.upgrade_from }} --set=image.registry=kind-registry:5000/
           helm dependency update charts/conforming-agent
           helm upgrade conforming charts/conforming-agent
         if: (github.event_name != 'pull_request' || env.CHART_CHANGED == 'true') && github.event.inputs.upgrade_from != 'x.x.x'
@@ -117,7 +117,7 @@ jobs:
       - name: Run helm upgrade on provisioning agent 
         run: |
           helm repo add tractusx-dev https://eclipse-tractusx.github.io/charts/dev
-          helm install provisioning tractusx-dev/provisioning-agent --version ${{ github.event.inputs.upgrade_from || 'x.x.x' }}
+          helm install provisioning tractusx-dev/provisioning-agent --version ${{ github.event.inputs.upgrade_from }} --set=image.registry=kind-registry:5000/
           helm dependency update charts/provisioning-agent
           helm upgrade provisioning charts/provisioning-agent
         if: (github.event_name != 'pull_request' || env.CHART_CHANGED == 'true') && github.event.inputs.upgrade_from != 'x.x.x'
@@ -127,7 +127,7 @@ jobs:
       - name: Run helm upgrade on remoting agent
         run: |
           helm repo add tractusx-dev https://eclipse-tractusx.github.io/charts/dev
-          helm install remoting tractusx-dev/provisioning-agent --version ${{ github.event.inputs.upgrade_from || 'x.x.x' }}
+          helm install remoting tractusx-dev/provisioning-agent --version ${{ github.event.inputs.upgrade_from }} --set=image.registry=kind-registry:5000/
           helm dependency update charts/remoting-agent
           helm upgrade remoting charts/remoting-agent
         if: (github.event_name != 'pull_request' || env.CHART_CHANGED == 'true') && github.event.inputs.upgrade_from != 'x.x.x'
diff --git a/charts/config/chart-testing-config.yaml b/charts/config/chart-testing-config.yaml
index ef2ec34d..0bef5732 100644
--- a/charts/config/chart-testing-config.yaml
+++ b/charts/config/chart-testing-config.yaml
@@ -19,4 +19,4 @@
 # Config for testing charts
 validate-maintainers: false
 chart-repos:
-helm-extra-set-args: "--set=registry=kind-registry:5000/"
\ No newline at end of file
+helm-extra-set-args: "--set=image.registry=kind-registry:5000/"
diff --git a/charts/provisioning-agent/values.yaml b/charts/provisioning-agent/values.yaml
index 10eb2cf9..35aac4cf 100644
--- a/charts/provisioning-agent/values.yaml
+++ b/charts/provisioning-agent/values.yaml
@@ -25,7 +25,7 @@
 replicaCount: 1
 
 image:
-  # -- target regirtry
+  # -- target registry
   registry: docker.io/
   # -- Which derivate of agent to use
   repository: tractusx/provisioning-agent
diff --git a/charts/remoting-agent/values.yaml b/charts/remoting-agent/values.yaml
index e9624ae5..8626bc8e 100644
--- a/charts/remoting-agent/values.yaml
+++ b/charts/remoting-agent/values.yaml
@@ -25,7 +25,7 @@
 replicaCount: 1
 
 image:
-  # -- target regirtry
+  # -- target registry
   registry: docker.io/
   # -- Which derivate of agent to use
   repository: tractusx/remoting-agent