Add helm-v4 support

This commit adds support for Helm v4 while maintaining backward
compatibility with Helm v3. Helm v2 support has been dropped.

Key changes:
- Added dual Helm v3/v4 API support using wrapper pattern
- Runtime version detection by reading plugin manifest format
- Separate plugin manifests for Helm v3 and v4
- Install hook automatically copies correct manifest
- Updated acceptance tests to test both Helm 3 and 4
- Bumped dependencies to latest versions (Go 1.25, Helm v3.19.4, Helm v4.0.4)
- Added arm64/aarch64 architecture support
- Updated GoReleaser configuration (fixed deprecation warning)
- Removed all Helm v2 code and references

Author: avoidik

.github/workflows/build-pr.yml

@@ -14,7 +14,7 @@ jobs:
       - name: setup go environment
         uses: actions/setup-go@v2
         with:
-          go-version: '1.21'
+          go-version: '1.25'
       - name: run unit tests
         run: sudo pip install virtualenv && make test
       - name: build binary

.github/workflows/build.yml

@@ -13,7 +13,7 @@ jobs:
       - name: setup go environment
         uses: actions/setup-go@v2
         with:
-          go-version: '1.21'
+          go-version: '1.25'
       - name: run unit tests
         run: sudo pip install virtualenv && make test
       - name: build binary

.github/workflows/release.yml

@@ -18,12 +18,12 @@ jobs:
         name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: "1.21"
+          go-version: "1.25"
       -
         name: Run GoReleaser
-        uses: goreleaser/goreleaser-action@v2
+        uses: goreleaser/goreleaser-action@v6
         with:
           version: latest
-          args: release --rm-dist
+          args: release --clean
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitignore

@@ -3,8 +3,8 @@
 **/*.tgz.prov
 .chartmuseum.log
 .cover/
-.helm2/
 .helm3/
+.helm-version
 .idea/
 .robot/
 .venv/

.goreleaser.yml

@@ -1,11 +1,15 @@
+version: 2
+
 env:
   - GO111MODULE=on
+
 before:
   hooks:
     - go mod download
+
 builds:
   - main: ./cmd/helm-cm-push
-    binary: ./bin/helm-cm-push
+    binary: bin/helm-cm-push
     env:
       - CGO_ENABLED=0
     goos:
@@ -14,15 +18,21 @@ builds:
       - windows
     goarch:
       - amd64
-      - arm
       - arm64
-    goarm:
-      - "6"
-      - "7"
+    goamd64:
+      - v1
+    goarm64:
+      - v8.0
+    # Exclude windows arm builds (marked as broken by GoReleaser)
+    ignore:
+      - goos: windows
+        goarch: arm
 
 archives:
-  - id: tarball
-    format: tar.gz
+  - id: default
+    name_template: "{{ .ProjectName }}_{{ .Version }}_{{ .Os }}_{{ .Arch }}"
     files:
       - LICENSE
       - plugin.yaml
+      - testdata/plugin-helm3.yaml
+      - testdata/plugin-helm4.yaml

Makefile

@@ -4,38 +4,68 @@ HAS_PIP := $(shell command -v pip3;)
 HAS_VENV := $(shell command -v virtualenv;)
 
 .PHONY: build
-build: build_linux build_mac build_windows
+build: build_linux build_linux_arm64 build_mac build_mac_arm64 build_windows build_windows_arm64
 
 build_windows: export GOARCH=amd64
 build_windows: export GO111MODULE=on
 build_windows:
 	@GOOS=windows go build -v --ldflags="-w -X main.Version=$(VERSION) -X main.Revision=$(REVISION)" \
 		-o bin/windows/amd64/helm-cm-push cmd/helm-cm-push/main.go  # windows
 
+build_windows_arm64: export GOARCH=arm64
+build_windows_arm64: export GO111MODULE=on
+build_windows_arm64:
+	@GOOS=windows go build -v --ldflags="-w -X main.Version=$(VERSION) -X main.Revision=$(REVISION)" \
+		-o bin/windows/arm64/helm-cm-push cmd/helm-cm-push/main.go  # windows arm64
+
 link_windows:
 	@cp bin/windows/amd64/helm-cm-push ./bin/helm-cm-push
 
+link_windows_arm64:
+	@cp bin/windows/arm64/helm-cm-push ./bin/helm-cm-push
+
 build_linux: export GOARCH=amd64
 build_linux: export CGO_ENABLED=0
 build_linux: export GO111MODULE=on
 build_linux:
 	@GOOS=linux go build -v --ldflags="-w -X main.Version=$(VERSION) -X main.Revision=$(REVISION)" \
 		-o bin/linux/amd64/helm-cm-push cmd/helm-cm-push/main.go  # linux
 
+build_linux_arm64: export GOARCH=arm64
+build_linux_arm64: export CGO_ENABLED=0
+build_linux_arm64: export GO111MODULE=on
+build_linux_arm64:
+	@GOOS=linux go build -v --ldflags="-w -X main.Version=$(VERSION) -X main.Revision=$(REVISION)" \
+		-o bin/linux/arm64/helm-cm-push cmd/helm-cm-push/main.go  # linux arm64
+
 link_linux:
 	@cp bin/linux/amd64/helm-cm-push ./bin/helm-cm-push
 
+link_linux_arm64:
+	@cp bin/linux/arm64/helm-cm-push ./bin/helm-cm-push
+
 build_mac: export GOARCH=amd64
 build_mac: export CGO_ENABLED=0
 build_mac: export GO111MODULE=on
 build_mac:
 	@GOOS=darwin go build -v --ldflags="-w -X main.Version=$(VERSION) -X main.Revision=$(REVISION)" \
-		-o bin/darwin/amd64/helm-cm-push cmd/helm-cm-push/main.go # mac osx
+		-o bin/darwin/amd64/helm-cm-push cmd/helm-cm-push/main.go # mac osx intel
 	@cp bin/darwin/amd64/helm-cm-push ./bin/helm-cm-push # For use w make install
 
+build_mac_arm64: export GOARCH=arm64
+build_mac_arm64: export CGO_ENABLED=0
+build_mac_arm64: export GO111MODULE=on
+build_mac_arm64:
+	@GOOS=darwin go build -v --ldflags="-w -X main.Version=$(VERSION) -X main.Revision=$(REVISION)" \
+		-o bin/darwin/arm64/helm-cm-push cmd/helm-cm-push/main.go # mac osx apple silicon
+	@cp bin/darwin/arm64/helm-cm-push ./bin/helm-cm-push # For use w make install
+
 link_mac:
 	@cp bin/darwin/amd64/helm-cm-push ./bin/helm-cm-push
 
+link_mac_arm64:
+	@cp bin/darwin/arm64/helm-cm-push ./bin/helm-cm-push
+
 .PHONY: clean
 clean:
 	@git status --ignored --short | grep '^!! ' | sed 's/!! //' | xargs rm -rf

README.md

@@ -10,8 +10,8 @@ Based on the version in `plugin.yaml`, release binary will be downloaded from Gi
 
 ```
 $ helm plugin install https://github.com/chartmuseum/helm-push
-Downloading and installing helm-push v0.10.1 ...
-https://github.com/chartmuseum/helm-push/releases/download/v0.10.1/helm-push_0.10.1_darwin_amd64.tar.gz
+Downloading and installing helm-push v0.11.0 ...
+https://github.com/chartmuseum/helm-push/releases/download/v0.11.0/helm-push_0.11.0_darwin_amd64.tar.gz
 Installed plugin: cm-push
 ```
 
@@ -101,9 +101,9 @@ In ChartMuseum server (>0.7.1) this will automatically be added to index.yaml if
 
 ## Authentication
 ### Basic Auth
-If you have added your repo with the `--username`/`--password` flags (Helm 2.9+), or have added your repo with the basic auth username/password in the URL (e.g. `https://myuser:mypass@my.chart.repo.com`), no further setup is required.
+If you have added your repo with the `--username`/`--password` flags, or have added your repo with the basic auth username/password in the URL (e.g. `https://myuser:mypass@my.chart.repo.com`), no further setup is required.
 
-The plugin will use the auth info located in `~/.helm/repository/repositories.yaml` (for Helm 2) or `~/.config/helm/repositories.yaml` (for Helm 3) in order to authenticate.
+The plugin will use the auth info located in `~/.config/helm/repositories.yaml` in order to authenticate.
 
 If you are running ChartMuseum with `AUTH_ANONYMOUS_GET=true`, and have added your repo without authentication, the plugin recognizes the following environment variables for basic auth on push operations:
 ```

acceptance_tests/01-helm.robot

@@ -6,12 +6,12 @@ Suite Setup       Suite Setup
 Suite Teardown    Suite Teardown
 
 *** Test Cases ***
-Plugin installs on Helm 2
-    Test plugin installation   2
-
 Plugin installs on Helm 3
     Test plugin installation   3
 
+Plugin installs on Helm 4
+    Test plugin installation   4
+
 *** Keywords ***
 Test plugin installation
     [Arguments]    ${version}
@@ -45,11 +45,11 @@ helm-push is not listed as a Helm plugin after removal
 Suite Setup
     set helm version    3
     remove helm plugin
-    set helm version    2
+    set helm version    4
     remove helm plugin
 
 Suite Teardown
     set helm version    3
     remove helm plugin
-    set helm version    2
+    set helm version    4
     remove helm plugin

acceptance_tests/02-chartmuseum.robot

@@ -8,27 +8,19 @@ Suite Setup       Suite Setup
 Suite Teardown    Suite Teardown
 
 *** Test Cases ***
-Plugin works with ChartMuseum on Helm 2
-    Test ChartMuseum integration   2
-
 Plugin works with ChartMuseum on Helm 3
     Test ChartMuseum integration   3
 
+Plugin works with ChartMuseum on Helm 4
+    Test ChartMuseum integration   4
+
 *** Keywords ***
 Test ChartMuseum integration
     [Arguments]    ${version}
     set helm version    ${version}
     install helm plugin
     helm major version detected by plugin is  ${version}
 
-    use test chart built by same helm version
-    clear chartmuseum storage
-    Chart directory can be pushed to ChartMuseum
-    Chart directory can be pushed to ChartMuseum with custom version
-    Chart package can be pushed to ChartMuseum
-    Chart package can be pushed to ChartMuseum with custom version
-
-    use test chart built by opposite helm version
     clear chartmuseum storage
     Chart directory can be pushed to ChartMuseum
     Chart directory can be pushed to ChartMuseum with custom version
@@ -114,20 +106,20 @@ Chart package can be pushed to ChartMuseum with custom version
 Suite Setup
     set helm version    3
     remove helm plugin
-    set helm version    2
+    set helm version    4
     remove helm plugin
     remove chartmuseum logs
     start chartmuseum
     Sleep  2
-    set helm version    2
-    add chart repo
     set helm version    3
     add chart repo
+    set helm version    4
+    add chart repo
 
 Suite Teardown
     set helm version    3
     remove helm plugin
-    set helm version    2
+    set helm version    4
     remove helm plugin
     remove chart repo
     stop chartmuseum

acceptance_tests/lib/ChartMuseum.py

@@ -30,10 +30,10 @@ def package_exists_in_chartmuseum_storage(self, find=''):
         self.run_command('find %s -maxdepth 1 -name "*%s.tgz" | grep tgz' % (common.STORAGE_DIR, find))
 
     def package_contains_expected_files(self):
-        # Check for requirements.yaml in Helm 2 (a Helm 2-specific file)
+        # Check for requirements.yaml (legacy dependency format)
         checkRequirementsYamlCmd = '(cd %s && mkdir -p tmp && tar -xf *.tgz --directory tmp && find tmp -name requirements.yaml | grep requirements.yaml)' % common.STORAGE_DIR
 
-        # Check for values.schema.json in Helm 3 (a Helm 3-specific file)
+        # Check for values.schema.json (Helm 3+ specific file)
         checkValuesSchemaJsonCmd = '(cd %s && mkdir -p tmp && tar -xf *.tgz --directory tmp && find tmp -name values.schema.json | grep values.schema.json)' % common.STORAGE_DIR
 
         if common.USE_OPPOSITE_VERSION: