public_git
/
helmfile
mirror of https://github.com/helmfile/helmfile.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix more issue 

Signed-off-by: yxxhero <aiopsclub@163.com>
This commit is contained in:
yxxhero 2025-10-21 09:14:59 +08:00
parent 83ad412b32
commit c2cf9cb989
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.github/workflows/ci.yaml vendored
View File

@ -86,13 +86,11 @@ jobs:
plugin-secrets-version: 4.6.5 plugin-secrets-version: 4.6.5
plugin-diff-version: 3.12.5 plugin-diff-version: 3.12.5
extra-helmfile-flags: '--enable-live-output' 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 - helm-version: v4.0.0-beta.1
kustomize-version: v5.4.3 kustomize-version: v5.4.3
plugin-secrets-version: 4.6.5 plugin-secrets-version: 4.6.5
plugin-diff-version: 3.12.5 plugin-diff-version: 3.12.5
extra-helmfile-flags: '' extra-helmfile-flags: ''
experimental: true
steps: steps:
- uses: actions/checkout@v5 - uses: actions/checkout@v5
- uses: actions/setup-go@v6 - uses: actions/setup-go@v6
@ -120,7 +118,6 @@ jobs:
kubernetes-version: v1.33.1 kubernetes-version: v1.33.1
- name: Execute integration tests - name: Execute integration tests
run: make integration run: make integration
continue-on-error: ${{ matrix.experimental == true }}
env: env:
HELM_SECRETS_VERSION: ${{ matrix.plugin-secrets-version }} HELM_SECRETS_VERSION: ${{ matrix.plugin-secrets-version }}
HELM_DIFF_VERSION: ${{ matrix.plugin-diff-version }} HELM_DIFF_VERSION: ${{ matrix.plugin-diff-version }}

13
test/integration/run.sh
View File

@ -30,6 +30,7 @@ export HELM_CONFIG_HOME="${helm_dir}/config"
HELM_DIFF_VERSION="${HELM_DIFF_VERSION:-3.12.5}" HELM_DIFF_VERSION="${HELM_DIFF_VERSION:-3.12.5}"
HELM_GIT_VERSION="${HELM_GIT_VERSION:-1.3.0}" HELM_GIT_VERSION="${HELM_GIT_VERSION:-1.3.0}"
HELM_SECRETS_VERSION="${HELM_SECRETS_VERSION:-3.15.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 GNUPGHOME="${PWD}/${dir}/.gnupg"
export SOPS_PGP_FP="B2D6D7BBEC03B2E66571C8C00AD18E16CFDEF700" export SOPS_PGP_FP="B2D6D7BBEC03B2E66571C8C00AD18E16CFDEF700"
@ -70,9 +71,15 @@ function cleanup() {
set -e set -e
trap cleanup EXIT trap cleanup EXIT
info "Using namespace: ${test_ns}" info "Using namespace: ${test_ns}"
info "Using Helm version:" $(${helm} version --short | grep -o 'v[0-9.]\+') info "Using Helm version:" ${HELM_CURRENT_VERSION}
${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} # 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.]\+')" 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} 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}" ${kubectl} create namespace ${test_ns} || fail "Could not create namespace ${test_ns}"