From 083da6cb560b59f41aefb98d187a5f9cfd2db85f Mon Sep 17 00:00:00 2001 From: Matteo Gastaldello Date: Fri, 19 Dec 2025 15:56:51 +0100 Subject: [PATCH 1/7] fix: Add CHART_VERSION replacement and package step for pre-upgrade chart in release workflows --- .../release-pullrequest-AKS-installer-chart.yaml | 16 ++++++++++++++++ ...se-pullrequest-OpenShift-installer-chart.yaml | 16 ++++++++++++++++ ...pullrequest-kind-installer-chart-upgrade.yaml | 16 ++++++++++++++++ 3 files changed, 48 insertions(+) diff --git a/.github/workflows/release-pullrequest-AKS-installer-chart.yaml b/.github/workflows/release-pullrequest-AKS-installer-chart.yaml index 25eebab..9d10fca 100644 --- a/.github/workflows/release-pullrequest-AKS-installer-chart.yaml +++ b/.github/workflows/release-pullrequest-AKS-installer-chart.yaml @@ -84,6 +84,9 @@ jobs: - name: Replace APP_VERSION in ./${{ env.MODULE }}-chart/Chart.yaml run: sed -i 's/APP_VERSION/${{ env.APP_VERSION }}/g' ./${{ env.MODULE }}-chart/Chart.yaml + - name: Replace CHART_VERSION in ./${{ env.MODULE }}-pre-upgrade-chart/Chart.yaml + run: sed -i 's/CHART_VERSION/${{ env.CHART_VERSION }}/g' ./${{ env.MODULE }}-pre-upgrade-chart/Chart.yaml + - name: Set up Helm uses: azure/setup-helm@v4.1.0 @@ -204,6 +207,19 @@ jobs: run: | kubectl get crd \ --kubeconfig=managedcluster-$K8S_VERSION_NODOT-kubeconfig.yaml + + - name: Package local dependency + run: | + # 1. Create the charts/ directory inside your main chart + mkdir -p ./${{ env.MODULE }}-chart/charts + + # 2. Package the pre-upgrade chart from its local folder + # Assuming the folder is in the root of the workspace + # We place the resulting .tgz directly into the main chart's 'charts' folder + helm package ./${{ env.MODULE }}-pre-upgrade-chart --destination ./${{ env.MODULE }}-chart/charts/ + + # 3. List files to verify the .tgz is there (for debugging) + ls -R ./${{ env.MODULE }}-chart/charts/ - name: Install ${{ env.MODULE }} chart run: | diff --git a/.github/workflows/release-pullrequest-OpenShift-installer-chart.yaml b/.github/workflows/release-pullrequest-OpenShift-installer-chart.yaml index 445e6ff..c1b0cac 100644 --- a/.github/workflows/release-pullrequest-OpenShift-installer-chart.yaml +++ b/.github/workflows/release-pullrequest-OpenShift-installer-chart.yaml @@ -84,6 +84,9 @@ jobs: - name: Replace APP_VERSION in ./${{ env.MODULE }}-chart/Chart.yaml run: sed -i 's/APP_VERSION/${{ env.APP_VERSION }}/g' ./${{ env.MODULE }}-chart/Chart.yaml + - name: Replace CHART_VERSION in ./${{ env.MODULE }}-pre-upgrade-chart/Chart.yaml + run: sed -i 's/CHART_VERSION/${{ env.CHART_VERSION }}/g' ./${{ env.MODULE }}-pre-upgrade-chart/Chart.yaml + - name: Set up Helm uses: azure/setup-helm@v4.1.0 @@ -349,6 +352,19 @@ jobs: kubectl get crd \ --kubeconfig=openshiftcluster-$K8S_VERSION_NODOT-kubeconfig.yaml --insecure-skip-tls-verify=true + - name: Package local dependency + run: | + # 1. Create the charts/ directory inside your main chart + mkdir -p ./${{ env.MODULE }}-chart/charts + + # 2. Package the pre-upgrade chart from its local folder + # Assuming the folder is in the root of the workspace + # We place the resulting .tgz directly into the main chart's 'charts' folder + helm package ./${{ env.MODULE }}-pre-upgrade-chart --destination ./${{ env.MODULE }}-chart/charts/ + + # 3. List files to verify the .tgz is there (for debugging) + ls -R ./${{ env.MODULE }}-chart/charts/ + - name: Install ${{ env.MODULE }} chart run: | helm install ${{ env.MODULE }} ./${{ env.MODULE }}-chart \ diff --git a/.github/workflows/release-pullrequest-kind-installer-chart-upgrade.yaml b/.github/workflows/release-pullrequest-kind-installer-chart-upgrade.yaml index 07c233c..5d7c3de 100644 --- a/.github/workflows/release-pullrequest-kind-installer-chart-upgrade.yaml +++ b/.github/workflows/release-pullrequest-kind-installer-chart-upgrade.yaml @@ -84,6 +84,9 @@ jobs: - name: Replace APP_VERSION in ./${{ env.MODULE }}-chart/Chart.yaml run: sed -i 's/APP_VERSION/${{ env.APP_VERSION }}/g' ./${{ env.MODULE }}-chart/Chart.yaml + + - name: Replace CHART_VERSION in ./${{ env.MODULE }}-pre-upgrade-chart/Chart.yaml + run: sed -i 's/CHART_VERSION/${{ env.CHART_VERSION }}/g' ./${{ env.MODULE }}-pre-upgrade-chart/Chart.yaml - name: Set up Helm uses: azure/setup-helm@v4.1.0 @@ -103,6 +106,19 @@ jobs: helm repo update krateo helm install ${{ env.MODULE }}-crd krateo/${{ env.MODULE }}-crd --create-namespace -n krateo-system --wait --timeout=120s + - name: Package local dependency + run: | + # 1. Create the charts/ directory inside your main chart + mkdir -p ./${{ env.MODULE }}-chart/charts + + # 2. Package the pre-upgrade chart from its local folder + # Assuming the folder is in the root of the workspace + # We place the resulting .tgz directly into the main chart's 'charts' folder + helm package ./${{ env.MODULE }}-pre-upgrade-chart --destination ./${{ env.MODULE }}-chart/charts/ + + # 3. List files to verify the .tgz is there (for debugging) + ls -R ./${{ env.MODULE }}-chart/charts/ + - name: Install ${{ env.MODULE }} previous chart run: | helm install ${{ env.MODULE }} krateo/${{ env.MODULE }} --create-namespace -n krateo-system --wait From 52dcc389cf8965be639cdd58078e427e97ab14dd Mon Sep 17 00:00:00 2001 From: Matteo Gastaldello Date: Fri, 19 Dec 2025 16:28:40 +0100 Subject: [PATCH 2/7] fix: Update Kubernetes version in release workflow to 4.19.20 --- .../release-pullrequest-OpenShift-installer-chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-pullrequest-OpenShift-installer-chart.yaml b/.github/workflows/release-pullrequest-OpenShift-installer-chart.yaml index c1b0cac..6d5a83d 100644 --- a/.github/workflows/release-pullrequest-OpenShift-installer-chart.yaml +++ b/.github/workflows/release-pullrequest-OpenShift-installer-chart.yaml @@ -19,7 +19,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - k8s_version: [ "4.16.30" ] + k8s_version: [ "4.19.20" ] steps: - name: Authenticate with GitHub App From 0f10e066556462f3f2604ae76f717412802bb3a6 Mon Sep 17 00:00:00 2001 From: Matteo Gastaldello Date: Fri, 19 Dec 2025 16:42:56 +0100 Subject: [PATCH 3/7] fix: Add CHART_VERSION replacement step for pre-upgrade chart and package local dependency in release workflow --- .../release-tag-kind-installer-chart.yaml | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/.github/workflows/release-tag-kind-installer-chart.yaml b/.github/workflows/release-tag-kind-installer-chart.yaml index 3da3889..403291a 100644 --- a/.github/workflows/release-tag-kind-installer-chart.yaml +++ b/.github/workflows/release-tag-kind-installer-chart.yaml @@ -81,6 +81,9 @@ jobs: - name: Replace APP_VERSION in ./${{ env.MODULE }}-chart/Chart.yaml run: sed -i 's/APP_VERSION/${{ env.APP_VERSION }}/g' ./${{ env.MODULE }}-chart/Chart.yaml + - name: Replace CHART_VERSION in ./${{ env.MODULE }}-pre-upgrade-chart/Chart.yaml + run: sed -i 's/CHART_VERSION/${{ env.CHART_VERSION }}/g' ./${{ env.MODULE }}-pre-upgrade-chart/Chart.yaml + - name: Set up Helm uses: azure/setup-helm@v4.1.0 @@ -99,6 +102,19 @@ jobs: helm repo update krateo helm install ${{ env.MODULE }}-crd krateo/${{ env.MODULE }}-crd --create-namespace -n krateo-system --wait --timeout=120s + - name: Package local dependency + run: | + # 1. Create the charts/ directory inside your main chart + mkdir -p ./${{ env.MODULE }}-chart/charts + + # 2. Package the pre-upgrade chart from its local folder + # Assuming the folder is in the root of the workspace + # We place the resulting .tgz directly into the main chart's 'charts' folder + helm package ./${{ env.MODULE }}-pre-upgrade-chart --destination ./${{ env.MODULE }}-chart/charts/ + + # 3. List files to verify the .tgz is there (for debugging) + ls -R ./${{ env.MODULE }}-chart/charts/ + - name: Install ${{ env.MODULE }} chart run: | helm install ${{ env.MODULE }} ./${{ env.MODULE }}-chart --create-namespace -n krateo-system --wait From b6c2cfeb47cb075501973afcedee2220fc9ee19d Mon Sep 17 00:00:00 2001 From: Matteo Gastaldello Date: Mon, 22 Dec 2025 11:32:43 +0100 Subject: [PATCH 4/7] fix: Update VM size in AKS installer chart workflow --- .github/workflows/release-pullrequest-AKS-installer-chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-pullrequest-AKS-installer-chart.yaml b/.github/workflows/release-pullrequest-AKS-installer-chart.yaml index 9d10fca..5c1ac10 100644 --- a/.github/workflows/release-pullrequest-AKS-installer-chart.yaml +++ b/.github/workflows/release-pullrequest-AKS-installer-chart.yaml @@ -168,7 +168,7 @@ jobs: agentPoolProfiles: - name: systempool count: 2 - vmSize: Standard_DS2_v2 + vmSize: Standard_D4s_v3 mode: System operatorSpec: secrets: From 110b4182ddf99e4c58db97927c61db3a510ff7b5 Mon Sep 17 00:00:00 2001 From: Matteo Gastaldello Date: Mon, 22 Dec 2025 15:39:09 +0100 Subject: [PATCH 5/7] fix: Update local dependencies packaging step in release workflow --- ...se-pullrequest-kind-installer-chart-upgrade.yaml | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/.github/workflows/release-pullrequest-kind-installer-chart-upgrade.yaml b/.github/workflows/release-pullrequest-kind-installer-chart-upgrade.yaml index 5d7c3de..1c5d030 100644 --- a/.github/workflows/release-pullrequest-kind-installer-chart-upgrade.yaml +++ b/.github/workflows/release-pullrequest-kind-installer-chart-upgrade.yaml @@ -106,18 +106,9 @@ jobs: helm repo update krateo helm install ${{ env.MODULE }}-crd krateo/${{ env.MODULE }}-crd --create-namespace -n krateo-system --wait --timeout=120s - - name: Package local dependency + - name: Build local dependencies charts run: | - # 1. Create the charts/ directory inside your main chart - mkdir -p ./${{ env.MODULE }}-chart/charts - - # 2. Package the pre-upgrade chart from its local folder - # Assuming the folder is in the root of the workspace - # We place the resulting .tgz directly into the main chart's 'charts' folder - helm package ./${{ env.MODULE }}-pre-upgrade-chart --destination ./${{ env.MODULE }}-chart/charts/ - - # 3. List files to verify the .tgz is there (for debugging) - ls -R ./${{ env.MODULE }}-chart/charts/ + helm dependency build ./${{ env.MODULE }}-chart - name: Install ${{ env.MODULE }} previous chart run: | From 079571350897f5357e1f3466cb012b155a1a0831 Mon Sep 17 00:00:00 2001 From: Matteo Gastaldello Date: Mon, 22 Dec 2025 16:28:27 +0100 Subject: [PATCH 6/7] fix: Update dependency repository path for installer-pre-upgrade chart --- installer-chart/Chart.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/installer-chart/Chart.yaml b/installer-chart/Chart.yaml index d6eded8..5b4bd15 100644 --- a/installer-chart/Chart.yaml +++ b/installer-chart/Chart.yaml @@ -32,4 +32,4 @@ sources: dependencies: - name: installer-pre-upgrade version: CHART_VERSION - repository: "https://charts.krateo.io" \ No newline at end of file + repository: file://../installer-pre-upgrade-chart \ No newline at end of file From 36b328bde5c3c77ef18a513a43e4c30b14160a8f Mon Sep 17 00:00:00 2001 From: Matteo Gastaldello Date: Tue, 23 Dec 2025 09:31:12 +0100 Subject: [PATCH 7/7] fix: fix helm deps --- .../release-pullrequest-AKS-installer-chart.yaml | 13 ++----------- ...lease-pullrequest-OpenShift-installer-chart.yaml | 13 ++----------- .../release-pullrequest-kind-installer-chart.yaml | 13 ++----------- .../workflows/release-tag-kind-installer-chart.yaml | 13 ++----------- 4 files changed, 8 insertions(+), 44 deletions(-) diff --git a/.github/workflows/release-pullrequest-AKS-installer-chart.yaml b/.github/workflows/release-pullrequest-AKS-installer-chart.yaml index 5c1ac10..80fd65a 100644 --- a/.github/workflows/release-pullrequest-AKS-installer-chart.yaml +++ b/.github/workflows/release-pullrequest-AKS-installer-chart.yaml @@ -208,18 +208,9 @@ jobs: kubectl get crd \ --kubeconfig=managedcluster-$K8S_VERSION_NODOT-kubeconfig.yaml - - name: Package local dependency + - name: Build local dependencies charts run: | - # 1. Create the charts/ directory inside your main chart - mkdir -p ./${{ env.MODULE }}-chart/charts - - # 2. Package the pre-upgrade chart from its local folder - # Assuming the folder is in the root of the workspace - # We place the resulting .tgz directly into the main chart's 'charts' folder - helm package ./${{ env.MODULE }}-pre-upgrade-chart --destination ./${{ env.MODULE }}-chart/charts/ - - # 3. List files to verify the .tgz is there (for debugging) - ls -R ./${{ env.MODULE }}-chart/charts/ + helm dependency build ./${{ env.MODULE }}-chart - name: Install ${{ env.MODULE }} chart run: | diff --git a/.github/workflows/release-pullrequest-OpenShift-installer-chart.yaml b/.github/workflows/release-pullrequest-OpenShift-installer-chart.yaml index 6d5a83d..3233f68 100644 --- a/.github/workflows/release-pullrequest-OpenShift-installer-chart.yaml +++ b/.github/workflows/release-pullrequest-OpenShift-installer-chart.yaml @@ -352,18 +352,9 @@ jobs: kubectl get crd \ --kubeconfig=openshiftcluster-$K8S_VERSION_NODOT-kubeconfig.yaml --insecure-skip-tls-verify=true - - name: Package local dependency + - name: Build local dependencies charts run: | - # 1. Create the charts/ directory inside your main chart - mkdir -p ./${{ env.MODULE }}-chart/charts - - # 2. Package the pre-upgrade chart from its local folder - # Assuming the folder is in the root of the workspace - # We place the resulting .tgz directly into the main chart's 'charts' folder - helm package ./${{ env.MODULE }}-pre-upgrade-chart --destination ./${{ env.MODULE }}-chart/charts/ - - # 3. List files to verify the .tgz is there (for debugging) - ls -R ./${{ env.MODULE }}-chart/charts/ + helm dependency build ./${{ env.MODULE }}-chart - name: Install ${{ env.MODULE }} chart run: | diff --git a/.github/workflows/release-pullrequest-kind-installer-chart.yaml b/.github/workflows/release-pullrequest-kind-installer-chart.yaml index 4d492e0..810f68b 100644 --- a/.github/workflows/release-pullrequest-kind-installer-chart.yaml +++ b/.github/workflows/release-pullrequest-kind-installer-chart.yaml @@ -106,18 +106,9 @@ jobs: helm repo update krateo helm install ${{ env.MODULE }}-crd krateo/${{ env.MODULE }}-crd --create-namespace -n krateo-system --wait --timeout=120s - - name: Package local dependency + - name: Build local dependencies charts run: | - # 1. Create the charts/ directory inside your main chart - mkdir -p ./${{ env.MODULE }}-chart/charts - - # 2. Package the pre-upgrade chart from its local folder - # Assuming the folder is in the root of the workspace - # We place the resulting .tgz directly into the main chart's 'charts' folder - helm package ./${{ env.MODULE }}-pre-upgrade-chart --destination ./${{ env.MODULE }}-chart/charts/ - - # 3. List files to verify the .tgz is there (for debugging) - ls -R ./${{ env.MODULE }}-chart/charts/ + helm dependency build ./${{ env.MODULE }}-chart - name: Install ${{ env.MODULE }} chart run: | diff --git a/.github/workflows/release-tag-kind-installer-chart.yaml b/.github/workflows/release-tag-kind-installer-chart.yaml index 403291a..5b8ba00 100644 --- a/.github/workflows/release-tag-kind-installer-chart.yaml +++ b/.github/workflows/release-tag-kind-installer-chart.yaml @@ -102,18 +102,9 @@ jobs: helm repo update krateo helm install ${{ env.MODULE }}-crd krateo/${{ env.MODULE }}-crd --create-namespace -n krateo-system --wait --timeout=120s - - name: Package local dependency + - name: Build local dependencies charts run: | - # 1. Create the charts/ directory inside your main chart - mkdir -p ./${{ env.MODULE }}-chart/charts - - # 2. Package the pre-upgrade chart from its local folder - # Assuming the folder is in the root of the workspace - # We place the resulting .tgz directly into the main chart's 'charts' folder - helm package ./${{ env.MODULE }}-pre-upgrade-chart --destination ./${{ env.MODULE }}-chart/charts/ - - # 3. List files to verify the .tgz is there (for debugging) - ls -R ./${{ env.MODULE }}-chart/charts/ + helm dependency build ./${{ env.MODULE }}-chart - name: Install ${{ env.MODULE }} chart run: |