public_git/helmfile
1
0
Fork 0
mirror of https://github.com/helmfile/helmfile.git synced 2026-10-17 21:48:25 +02:00
Code Issues Projects Releases Wiki Activity

feat: add Helm 4 support while maintaining Helm 3 compatibility (#2262)

Browse Source 
This commit adds comprehensive support for Helm 4 while maintaining
full backward compatibility with Helm 3. The implementation includes:

- Updated helm version detection to support both Helm 3 and Helm 4
- Added HELMFILE_HELM4 environment variable to control Helm version
- Modified helm execution paths to handle version-specific binaries
- Updated helm plugin installation to support split architecture

- Helm 4: Uses split plugin architecture (3 separate .tgz files)
  - helm-secrets.tgz
  - helm-secrets-getter.tgz
  - helm-secrets-post-renderer.tgz
- Helm 3: Continues using single plugin installation
- Updated Dockerfiles, CI workflows, and core installation code

- Helm 4 requires post-renderers to be plugins, not executable scripts
- Created Helm plugin structure for integration tests
- Updated helmfile.yaml templates to dynamically select renderer type
- Added test plugins: add-cm, add-cm1, add-cm2

- Updated integration tests for Helm 3/4 compatibility
- Created Helm 4 variant expected output files
- Fixed test determinism issues (repo cleanup between iterations)
- Added version-specific output filtering for warnings/messages

- Updated workflows to test both Helm 3 and Helm 4
- Matrix testing across Helm versions
- Updated helm-diff to v3.14.0 for compatibility

- Updated README and docs with Helm 4 information
- Added migration guidance
- Updated version requirements

All changes are backward compatible - existing Helm 3 users will
see no behavior changes.



fix: update Helm 4 lint expected output to match filtered output

The grep filter removes the semver warning, so the expected output
should not include it. Updated lint-helm4 files to match the filtered
output (warning removed, no extra blank line).

Signed-off-by: Aditya Menon <amenon@canarytechnologies.com>
This commit is contained in:
Aditya Menon
2025-11-19 07:49:30 +08:00
committed by GitHub
parent ab5e9a1326
commit 4f275b3667
91 changed files with 4959 additions and 391 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.github/workflows/Makefile
+5 -5
View File
@@ -1,8 +1,8 @@
HELM_VERSION ?= v3.7.2
KUSTOMIZE_VERSION ?= v5.4.3
K8S_VERSION ?= v1.32.1
MINIKUBE_VERSION ?= v1.31.1
SOPS_VERSION ?= v3.9.3
HELM_VERSION ?= v4.0.0
KUSTOMIZE_VERSION ?= v5.8.0
K8S_VERSION ?= v1.34.0
MINIKUBE_VERSION ?= v1.37.0
SOPS_VERSION ?= v3.10.2
# ---
CHANGE_MINIKUBE_NONE_USER ?= true
.github/workflows/ci.yaml
+88 -37
View File
@@ -2,47 +2,81 @@ name: Go
on:
push:
branches: [ main ]
paths-ignore: [ '**.md', '**/docs/**' ]
branches: [main]
paths-ignore: ['**.md', '**/docs/**']
pull_request:
branches: [ main ]
paths-ignore: [ '**.md', '**/docs/**' ]
branches: [main]
paths-ignore: ['**.md', '**/docs/**']
jobs:
lint:
runs-on: ubuntu-latest
timeout-minutes: 10
timeout-minutes: 30
steps:
- uses: actions/checkout@v5
- name: Free Disk Space
uses: jlumbroso/free-disk-space@main
with:
tool-cache: true
android: true
dotnet: true
haskell: true
large-packages: true
docker-images: true
swap-storage: false
- uses: actions/setup-go@v6
with:
go-version-file: go.mod
cache: false
- name: check disk usage
run: df -h
- uses: golangci/golangci-lint-action@v9
with:
version: v2.1.6
version: v2.6.2
tests:
runs-on: ubuntu-latest
strategy:
matrix:
helm-version: [v3.18.6, v3.19.2, v4.0.0]
steps:
- uses: actions/checkout@v5
with:
fetch-depth: 0
- name: Free Disk Space
uses: jlumbroso/free-disk-space@main
with:
tool-cache: true
android: true
dotnet: true
haskell: true
large-packages: true
docker-images: true
swap-storage: false
- uses: actions/setup-go@v6
with:
go-version-file: go.mod
- name: check disk usage
run: df -h
- uses: azure/setup-helm@v4.3.0
with:
version: ${{ matrix.helm-version }}
- name: Build
run: make build build-test-tools
- name: Test
run: make check test
env:
HELMFILE_HELM4: ${{ startsWith(matrix.helm-version, 'v4') && '1' || '0' }}
- name: Archive built binaries
if: matrix.helm-version == 'v4.0.0'
run: tar -cvf built-binaries.tar helmfile diff-yamls dyff
- uses: actions/upload-artifact@v5
if: matrix.helm-version == 'v4.0.0'
with:
name: built-binaries-${{ github.run_id }}
path: built-binaries.tar
retention-days: 1
- name: Display built binaries
if: matrix.helm-version == 'v4.0.0'
run: ls -l helmfile diff-yamls dyff
integration_tests:
@@ -54,44 +88,61 @@ jobs:
# Helm maintains the latest minor version only and therefore each Helmfile version supports 2 Helm minor versions.
# That's why we cover only 2 Helm minor versions in this matrix.
# See https://github.com/helmfile/helmfile/pull/286#issuecomment-1250161182 for more context.
# We assume that the helm-secrets plugin is supposed to
# work with the two most recent helm minor versions.
# Once it turned out to be not practically true,
# we will mark this combination as failable,
# and instruct users to upgrade helm and helm-secrets at once.
- helm-version: v3.18.6
kustomize-version: v5.2.1
plugin-secrets-version: 4.6.5
plugin-diff-version: 3.11.0
extra-helmfile-flags: ''
- helm-version: v3.18.6
kustomize-version: v5.4.3
# We assume that the helm-secrets plugin is supposed to
# work with the two most recent helm minor versions.
# Once it turned out to be not practically true,
# we will mark this combination as failable,
# and instruct users to upgrade helm and helm-secrets at once.
plugin-secrets-version: 4.6.5
plugin-diff-version: 3.12.5
extra-helmfile-flags: ''
- helm-version: v3.19.0
kustomize-version: v5.2.1
plugin-secrets-version: 4.6.5
plugin-diff-version: 3.11.0
extra-helmfile-flags: ''
- helm-version: v3.19.0
kustomize-version: v5.4.3
plugin-secrets-version: 4.6.5
plugin-diff-version: 3.12.5
kustomize-version: v5.8.0
plugin-secrets-version: 4.7.0
plugin-diff-version: 3.14.0
extra-helmfile-flags: ''
# In case you need to test some optional helmfile features,
# enable it via extra-helmfile-flags below.
- helm-version: v3.19.0
kustomize-version: v5.4.3
plugin-secrets-version: 4.6.5
plugin-diff-version: 3.12.5
- helm-version: v3.18.6
kustomize-version: v5.8.0
plugin-secrets-version: 4.7.0
plugin-diff-version: 3.14.0
extra-helmfile-flags: '--enable-live-output'
- helm-version: v3.19.2
kustomize-version: v5.8.0
plugin-secrets-version: 4.7.0
plugin-diff-version: 3.14.0
extra-helmfile-flags: ''
- helm-version: v3.19.2
kustomize-version: v5.8.0
plugin-secrets-version: 4.7.0
plugin-diff-version: 3.14.0
extra-helmfile-flags: '--enable-live-output'
# Helmfile now supports both Helm 3.x and Helm 4.x
- helm-version: v4.0.0
kustomize-version: v5.8.0
plugin-secrets-version: 4.7.0
plugin-diff-version: 3.14.0
extra-helmfile-flags: ''
- helm-version: v4.0.0
kustomize-version: v5.8.0
plugin-secrets-version: 4.7.0
plugin-diff-version: 3.14.0
extra-helmfile-flags: '--enable-live-output'
steps:
- uses: actions/checkout@v5
- name: Free Disk Space
uses: jlumbroso/free-disk-space@main
with:
tool-cache: true
android: true
dotnet: true
haskell: true
large-packages: true
docker-images: true
swap-storage: false
- uses: actions/setup-go@v6
with:
go-version-file: go.mod
- name: check disk usage
run: df -h
- uses: actions/download-artifact@v6
with:
name: built-binaries-${{ github.run_id }}
@@ -110,13 +161,13 @@ jobs:
- name: Start minikube
uses: medyagh/setup-minikube@latest
with:
kubernetes-version: v1.33.1
kubernetes-version: v1.34.0
- name: Execute integration tests
run: make integration
env:
HELM_SECRETS_VERSION: ${{ matrix.plugin-secrets-version }}
HELM_DIFF_VERSION: ${{ matrix.plugin-diff-version }}
HELMFILE_HELM3: 1
HELMFILE_HELM4: ${{ startsWith(matrix.helm-version, 'v4') && '1' || '0' }}
TERM: xterm
EXTRA_HELMFILE_FLAGS: ${{ matrix.extra-helmfile-flags }}
.github/workflows/releaser.yaml
+4 -4
View File
@@ -25,9 +25,6 @@ jobs:
- uses: actions/checkout@v5
with:
fetch-depth: 0
- uses: actions/setup-go@v6
with:
go-version-file: go.mod
- name: check disk usage
run: df -h
- name: cleanup disk
@@ -38,7 +35,10 @@ jobs:
sudo rm -fr /usr/local/lib/android
sudo rm -fr /opt/hostedtoolcache/CodeQL
sudo docker image prune --all --force
sudo docker builder prune -a
sudo docker builder prune -a -f
- uses: actions/setup-go@v6
with:
go-version-file: go.mod
- name: check disk usage
run: df -h
- uses: goreleaser/goreleaser-action@v6