From c2cf9cb989765bcac3eb9ee2c05f75009cde2f99 Mon Sep 17 00:00:00 2001
From: yxxhero <aiopsclub@163.com>
Date: Tue, 21 Oct 2025 09:14:59 +0800
Subject: [PATCH] fix more issue

Signed-off-by: yxxhero <aiopsclub@163.com>
---
 .github/workflows/ci.yaml |  3 ---
 test/integration/run.sh   | 13 ++++++++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
index 4b0c8753..4b7fbc4e 100644
--- a/.github/workflows/ci.yaml
+++ b/.github/workflows/ci.yaml
@@ -86,13 +86,11 @@ jobs:
             plugin-secrets-version: 4.6.5
             plugin-diff-version: 3.12.5
             extra-helmfile-flags: '--enable-live-output'
-          # Test with Helm v4 beta (allowed to fail as it's in beta)
           - helm-version: v4.0.0-beta.1
             kustomize-version: v5.4.3
             plugin-secrets-version: 4.6.5
             plugin-diff-version: 3.12.5
             extra-helmfile-flags: ''
-            experimental: true
     steps:
       - uses: actions/checkout@v5
       - uses: actions/setup-go@v6
@@ -120,7 +118,6 @@ jobs:
           kubernetes-version: v1.33.1 
       - name: Execute integration tests
         run: make integration
-        continue-on-error: ${{ matrix.experimental == true }}
         env:
           HELM_SECRETS_VERSION: ${{ matrix.plugin-secrets-version }}
           HELM_DIFF_VERSION: ${{ matrix.plugin-diff-version }}
diff --git a/test/integration/run.sh b/test/integration/run.sh
index d0abedfb..41548fc6 100755
--- a/test/integration/run.sh
+++ b/test/integration/run.sh
@@ -30,6 +30,7 @@ export HELM_CONFIG_HOME="${helm_dir}/config"
 HELM_DIFF_VERSION="${HELM_DIFF_VERSION:-3.12.5}"
 HELM_GIT_VERSION="${HELM_GIT_VERSION:-1.3.0}"
 HELM_SECRETS_VERSION="${HELM_SECRETS_VERSION:-3.15.0}"
+HELM_CURRENT_VERSION="$(${helm} version --short | grep -o 'v[0-9.]\+')"
 export GNUPGHOME="${PWD}/${dir}/.gnupg"
 export SOPS_PGP_FP="B2D6D7BBEC03B2E66571C8C00AD18E16CFDEF700"
 
@@ -70,9 +71,15 @@ function cleanup() {
 set -e
 trap cleanup EXIT
 info "Using namespace: ${test_ns}"
-info "Using Helm version:" $(${helm} version --short | grep -o 'v[0-9.]\+')
-${helm} plugin ls | grep "^diff" || ${helm} plugin install https://github.com/databus23/helm-diff --version v${HELM_DIFF_VERSION}
-${helm} plugin ls | grep "^helm-git" || ${helm} plugin install https://github.com/aslafy-z/helm-git --version v${HELM_GIT_VERSION}
+info "Using Helm version:" ${HELM_CURRENT_VERSION}
+
+# if helm version is bigger or equal than v4.0.0, we need to set HELM_PLUGIN_INSTALL_EXTRA_ARGS to --verify=false
+if [[ "${HELM_CURRENT_VERSION}" == v4* ]]; then
+    HELM_PLUGIN_INSTALL_EXTRA_ARGS="--verify=false"
+fi
+
+${helm} plugin ls | grep "^diff" || ${helm} plugin install https://github.com/databus23/helm-diff --version v${HELM_DIFF_VERSION} ${HELM_PLUGIN_INSTALL_EXTRA_ARGS}
+${helm} plugin ls | grep "^helm-git" || ${helm} plugin install https://github.com/aslafy-z/helm-git --version v${HELM_GIT_VERSION} ${HELM_PLUGIN_INSTALL_EXTRA_ARGS}
 info "Using Kustomize version: $(kustomize version --short | grep -o 'v[0-9.]\+')"
 ${kubectl} get namespace ${test_ns} &> /dev/null && warn "Namespace ${test_ns} exists, from a previous test run?"
 ${kubectl} create namespace ${test_ns} || fail "Could not create namespace ${test_ns}"