From 22d6b56ac120bcfa08ac2b32947f3ed6fde22008 Mon Sep 17 00:00:00 2001 From: "aravind.est" Date: Tue, 18 Nov 2025 17:38:07 +0000 Subject: [PATCH] Use helm v3 for the build/merge jobs helm cm-push support for helm v4 is not available yet. Github workflows updated to use the helm version 3.19.2 Warning added in setup helm script to show that helm v4 may get some issues with cm-push Issue-ID: NONRTRIC-1097 Change-Id: I399653f336089c46ac545fa6fd4a3a1c95900457 Signed-off-by: aravind.est --- .github/workflows/gerrit-merge-itdep.yaml | 5 +++-- .github/workflows/gerrit-verify-itdep.yaml | 5 +++-- smo-install/scripts/layer-0/0-setup-helm3.sh | 10 +++++++++- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.github/workflows/gerrit-merge-itdep.yaml b/.github/workflows/gerrit-merge-itdep.yaml index 76289f0b..782afe1b 100644 --- a/.github/workflows/gerrit-merge-itdep.yaml +++ b/.github/workflows/gerrit-merge-itdep.yaml @@ -58,6 +58,7 @@ env: CHART_ARTIFACT_NAME: 'helm-charts' CHARTMUSEUM_STORAGE_DIR: './chartmuseum-storage' CHARTS_BUILD_DIR: './chartmuseum-storage' + HELM_VERSION: 'v3.19.2' # Inherited from jenkins verify job RIC_DEP_CI_DOCKER_FILE: 'ci/Dockerfile' @@ -113,8 +114,8 @@ jobs: # yamllint disable-line rule:line-length uses: azure/setup-helm@1a275c3b69536ee54be43f2070a358922e12c8d4 # v4.3.1 # Not explicitly used while testing updated Helm - # with: - # version: ${{ env.HELM_VERSION }} + with: + version: ${{ env.HELM_VERSION }} - name: 'Set up Docker Buildx' # yamllint disable-line rule:line-length diff --git a/.github/workflows/gerrit-verify-itdep.yaml b/.github/workflows/gerrit-verify-itdep.yaml index 6716c03e..cb2a6bad 100644 --- a/.github/workflows/gerrit-verify-itdep.yaml +++ b/.github/workflows/gerrit-verify-itdep.yaml @@ -66,6 +66,7 @@ env: CHART_ARTIFACT_NAME: 'helm-charts' CHARTMUSEUM_STORAGE_DIR: './chartmuseum-storage' CHARTS_BUILD_DIR: './chartmuseum-storage' + HELM_VERSION: 'v3.19.2' # Inherited from jenkins verify job RIC_DEP_CI_DOCKER_FILE: 'ci/Dockerfile' @@ -125,8 +126,8 @@ jobs: # yamllint disable-line rule:line-length uses: azure/setup-helm@1a275c3b69536ee54be43f2070a358922e12c8d4 # v4.3.1 # Not explicitly used while testing updated Helm - # with: - # version: ${{ env.HELM_VERSION }} + with: + version: ${{ env.HELM_VERSION }} - name: 'Set up Docker Buildx' # yamllint disable-line rule:line-length diff --git a/smo-install/scripts/layer-0/0-setup-helm3.sh b/smo-install/scripts/layer-0/0-setup-helm3.sh index 8d967cc5..5932be90 100755 --- a/smo-install/scripts/layer-0/0-setup-helm3.sh +++ b/smo-install/scripts/layer-0/0-setup-helm3.sh @@ -29,7 +29,15 @@ SCRIPT_PATH=$(dirname "$SCRIPT") # Check whether helm is installed and if not install it if command -v helm > /dev/null 2>&1; then - echo "Helm is already installed. Skipping installation." + HELM_VERSION=$(helm version --template='{{.Version}}') + if [[ $HELM_VERSION == v4* ]]; then + echo -e "\033[43;31mWARNING: Helm v4 detected ($HELM_VERSION) \033[0m" + echo -e "\033[43;31mWARNING: Helm v4 is not fully supported yet as there could be some issues with helm cm-push plugin. \033[0m" + echo -e "\033[43;31mWARNING: It is better to stick with Helm v3 for now. \033[0m" + echo -e "\033[43;31mWARNING: Consider downgrading to Helm v3 if you encounter issues. \033[0m" + else + echo "Helm is already installed. Skipping installation." + fi else echo "Helm is not installed. Installing helm ..." cd /tmp -- 2.16.6