feat: remove Helm 2 support and upgrade to Helm 3.19.0

Changes:
- Remove Helm 2 binary installation and initialization from Dockerfile
- Upgrade Helm 3 from v3.13.3 to v3.19.0
- Upgrade Alpine base image from 3.22.0 to 3.22.2
- Create symlink from 'helm' to 'helm3' for backward compatibility
- Update helm-release-plugin to latest version (438a761)
- Remove all Helm 2 compatibility code from index.js:
  - Simplify deleteCmd() to only support Helm 3 syntax
  - Remove conditional checks for helm === 'helm3'
  - Always set Helm 3 environment variables (XDG_*)
- Modernize Kubernetes API usage:
  - Update Ingress from deprecated extensions/v1beta1 to networking.k8s.io/v1
  - Add pathType: Prefix and update backend format for Ingress resources
- Update test suite for Helm 3:
  - Remove Helm 2 version test from CI workflow
  - Update helm template command to use Helm 3 syntax (positional args)
  - Regenerate test expectations with Helm 3 output format
- Update documentation:
  - Remove Helm 2 version references
  - Update helm parameter description to reflect Helm 3-only support
  - Update TTL parameter docs (remove 'only works with helm3' note)
  - Update version to v3.19.0
- Bump Docker image tag from v3 to v4 in production workflow

Author: genisd

.github/workflows/publish-docker-prod.yml

@@ -30,10 +30,10 @@ jobs:
       - name: Build
         run: |-
           docker build \
-            --tag "europe-docker.pkg.dev/unicorn-985/public-images/helm-action:${{ github.sha }}" --tag "europe-docker.pkg.dev/unicorn-985/public-images/helm-action:v3" .
+            --tag "europe-docker.pkg.dev/unicorn-985/public-images/helm-action:${{ github.sha }}" --tag "europe-docker.pkg.dev/unicorn-985/public-images/helm-action:v4" .
 
       # Push the Docker image to Google Container Registry
       - name: Publish
         run: |-
           docker push "europe-docker.pkg.dev/unicorn-985/public-images/helm-action:${{ github.sha }}"
-          docker push "europe-docker.pkg.dev/unicorn-985/public-images/helm-action:v3"
+          docker push "europe-docker.pkg.dev/unicorn-985/public-images/helm-action:v4"

.github/workflows/test.yml

@@ -19,7 +19,4 @@ jobs:
       run: 'docker run --rm -i -v $PWD:/workspace --workdir=/workspace --entrypoint=/workspace/tests/charts/test.sh helm'
 
     - name: 'Test helm version'
-      run: 'docker run --rm -i --entrypoint=helm helm version -c'
-
-    - name: 'Test helm3 version'
-      run: 'docker run --rm -i --entrypoint=helm3 helm version'
+      run: 'docker run --rm -i --entrypoint=helm helm version'

Dockerfile

@@ -1,30 +1,22 @@
-FROM alpine:3.22.0
+FROM alpine:3.22.2
 
 ENV BASE_URL="https://get.helm.sh"
 
-ENV HELM_2_FILE="helm-v2.15.2-linux-amd64.tar.gz"
-ENV HELM_3_FILE="helm-v3.13.3-linux-amd64.tar.gz"
+ENV HELM_3_FILE="helm-v3.19.0-linux-amd64.tar.gz"
 
-# coreutils is needed helm3 ttl plugin
-# git is needed to install a helm3 plugin
+# coreutils is needed for helm ttl plugin
+# git is needed to install helm plugins
 # python3 needed by gcloud
 RUN apk add --no-cache ca-certificates \
     --repository http://dl-3.alpinelinux.org/alpine/edge/community/ \
     jq curl bash nodejs python3 git coreutils && \
-    # Install helm version 2:
-    curl -L ${BASE_URL}/${HELM_2_FILE} |tar xvz && \
+    # Install Helm 3
+    curl -L ${BASE_URL}/${HELM_3_FILE} |tar xvz && \
     mv linux-amd64/helm /usr/bin/helm && \
     chmod +x /usr/bin/helm && \
     rm -rf linux-amd64 && \
-    # Install helm version 3:
-    curl -L ${BASE_URL}/${HELM_3_FILE} |tar xvz && \
-    mv linux-amd64/helm /usr/bin/helm3 && \
-    chmod +x /usr/bin/helm3 && \
-    rm -rf linux-amd64 && \
-    # Init version 2 helm:
-    helm init --client-only --stable-repo-url https://charts.helm.sh/stable && \
-    # Install helm3 ttl plugin for temporary pr deploys \
-    helm3 plugin install https://github.com/gynzy/helm-release-plugin --version 06e297a76878eec0a54c45e1877dc981b665b621
+    # Install helm ttl plugin for temporary pr deploys
+    helm plugin install https://github.com/gynzy/helm-release-plugin --version 438a761e7ec825ead9d181e81ade9a2650b7d5c4
 
 # Install google gcloud sdk
 RUN curl -sSL https://dl.google.com/dl/cloudsdk/channels/rapid/install_google_cloud_sdk.bash | PREFIX=/opt/ bash && \
@@ -35,8 +27,8 @@ RUN curl -sSL https://dl.google.com/dl/cloudsdk/channels/rapid/install_google_cl
     ln -s /opt/google-cloud-sdk/bin/gcloud /usr/lib/google-cloud-sdk/bin/gcloud && \
     ln -s /opt/google-cloud-sdk/bin/kubectl /usr/lib/google-cloud-sdk/bin/kubectl
 
-ENV PYTHONPATH "/usr/lib/python3.8/site-packages/"
-ENV PATH $PATH:/opt/google-cloud-sdk/bin
+ENV PYTHONPATH="/usr/lib/python3.8/site-packages/"
+ENV PATH=$PATH:/opt/google-cloud-sdk/bin
 
 COPY . /usr/src/
 ENTRYPOINT ["node", "/usr/src/index.js"]

README.md

@@ -1,8 +1,6 @@
 # Gynzy `additions
 Fork from https://github.com/deliverybot/helm
 
-Uses "our" helm version of helm 2.15.2
-
 Releasing: The `v1` tag gets updated on **master merge**!
 
 
@@ -46,21 +44,20 @@ payload if the action was triggered by a deployment.
   JSON encoded array or a string.
 - `secrets`: Secret variables to include in value file interpolation. Expects a
   JSON encoded map.
-- `helm`: Helm binary to execute, one of: [`helm`, `helm3`].
+- `helm`: Helm binary to execute (defaults to `helm`, which uses Helm 3).
 - `version`: Version of the app, usually commit sha works here.
 - `timeout`: specify a timeout for helm deployment
 - `repository`: specify the URL for a helm repo to come from
 - `atomic`: If true, upgrade process rolls back changes made in case of failed upgrade. Defaults to true.
-- `ttl`: Optional ttl which can be set until the deployment will be deleted. For example `7 days`. Only works with helm3 and `release` *must* contain the string `-pr-`
+- `ttl`: Optional ttl which can be set until the deployment will be deleted. For example `7 days`. The `release` *must* contain the string `-pr-`
 
 Additional parameters: If the action is being triggered by a deployment event
 and the `task` parameter in the deployment event is set to `"remove"` then this
 action will execute a `helm delete $service`
 
 #### Versions
 
-- `helm`: v2.16.1
-- `helm3`: v3.0.0
+- `helm`: v3.19.0 (Helm 3)
 
 ### Environment
 

action.yml

@@ -28,7 +28,7 @@ inputs:
     description: If true, upgrade process rolls back changes made in case of failed upgrade. Defaults to true.
     required: false
   helm:
-    description: Helm binary to execute, one of [helm, helm3].
+    description: Helm binary to execute (defaults to helm, which uses Helm 3).
     required: false
   token:
     description: Github repository token. If included and the event is a deployment

charts/app/templates/ingress.yaml

@@ -1,6 +1,6 @@
 {{- if .Values.ingress.enabled -}}
 {{- $fullName := include "app.fullname" . -}}
-apiVersion: extensions/v1beta1
+apiVersion: networking.k8s.io/v1
 kind: Ingress
 metadata:
   name: {{ $fullName }}
@@ -29,9 +29,12 @@ spec:
         paths:
         {{- range .paths }}
           - path: {{ . }}
+            pathType: Prefix
             backend:
-              serviceName: {{ $fullName }}
-              servicePort: http
+              service:
+                name: {{ $fullName }}
+                port:
+                  name: http
         {{- end }}
   {{- end }}
 {{- end }}

index.js

@@ -135,17 +135,13 @@ function renderFiles(files, data) {
 }
 
 /**
- * Makes a delete command for compatibility between helm 2 and 3.
+ * Makes a delete command for helm.
  *
- * @param {string} helm
  * @param {string} namespace
  * @param {string} release
  */
-function deleteCmd(helm, namespace, release) {
-  if (helm === "helm3") {
-    return ["delete", "-n", namespace, release];
-  }
-  return ["delete", "--purge", release];
+function deleteCmd(namespace, release) {
+  return ["delete", "-n", namespace, release];
 }
 
 async function setupClusterAuthentication(project, location, name, sa_json) {
@@ -248,7 +244,7 @@ async function run() {
     core.debug(`param: fetchDepencencies = "${fetchDependencies}"`);
 
     // Assert that if ttl is set that release contains '-pr-'
-    if (helm === "helm3" && ttl !== "false") {
+    if (ttl !== "false") {
       if (!release.includes("-pr-")) {
         core.error(
           "ttl is set but release name does not contain '-pr-'. Aborting!"
@@ -275,17 +271,13 @@ async function run() {
     ];
 
     // Per https://helm.sh/docs/faq/#xdg-base-directory-support
-    if (helm === "helm3") {
-      process.env.XDG_DATA_HOME = "/root/.helm/";
-      process.env.XDG_CACHE_HOME = "/root/.helm/";
-      process.env.XDG_CONFIG_HOME = "/root/.helm/";
-      process.env.HELM_PLUGINS = "/root/.local/share/helm/plugins";
-      process.env.HELM_DATA_HOME = "/root/.local/share/helm";
-      process.env.HELM_CACHE_HOME = "/root/.cache/helm";
-      process.env.HELM_CONFIG_HOME = "/root/.config/helm";
-    } else {
-      process.env.HELM_HOME = "/root/.helm/";
-    }
+    process.env.XDG_DATA_HOME = "/root/.helm/";
+    process.env.XDG_CACHE_HOME = "/root/.helm/";
+    process.env.XDG_CONFIG_HOME = "/root/.helm/";
+    process.env.HELM_PLUGINS = "/root/.local/share/helm/plugins";
+    process.env.HELM_DATA_HOME = "/root/.local/share/helm";
+    process.env.HELM_CACHE_HOME = "/root/.cache/helm";
+    process.env.HELM_CONFIG_HOME = "/root/.config/helm";
 
     if (dryRun) args.push("--dry-run");
     if (appName) args.push(`--set=app.name=${appName}`);
@@ -333,31 +325,29 @@ async function run() {
     // Remove the canary deployment before continuing.
     if (removeCanary) {
       core.debug(`removing canary ${appName}-canary`);
-      await exec.exec(helm, deleteCmd(helm, namespace, `${appName}-canary`), {
+      await exec.exec(helm, deleteCmd(namespace, `${appName}-canary`), {
         ignoreReturnCode: true,
       });
     }
 
     // Actually execute the deployment here.
     if (task === "remove") {
-      if (helm === "helm3") {
-        // delete ttl cronjob in case it was set (it is not required).
-        await exec.exec(
-          helm,
-          [`--namespace=${namespace}`, "release", "ttl", release, `--unset`],
-          { env: process.env, ignoreReturnCode: true }
-        );
-      }
+      // delete ttl cronjob in case it was set (it is not required).
+      await exec.exec(
+        helm,
+        [`--namespace=${namespace}`, "release", "ttl", release, `--unset`],
+        { env: process.env, ignoreReturnCode: true }
+      );
 
-      await exec.exec(helm, deleteCmd(helm, namespace, release), {
+      await exec.exec(helm, deleteCmd(namespace, release), {
         ignoreReturnCode: true,
       });
     } else {
       await exec.exec(helm, args);
     }
 
     // Set ttl if set
-    if (helm === "helm3" && ttl !== "false") {
+    if (ttl !== "false") {
       core.info("Setting ttl: " + ttl);
       await exec.exec(
         helm,

tests/charts/rails-example/expected.yml

@@ -9,12 +9,11 @@ metadata:
     app.kubernetes.io/name: example-rails
     app.kubernetes.io/instance: rails-example
     app.kubernetes.io/version: "v1"
-    app.kubernetes.io/managed-by: Tiller
+    app.kubernetes.io/managed-by: Helm
     helm.sh/chart: app-0.0.2
 type: Opaque
 data:
   DATABASE_URL: "cG9zdGdyZXM6Ly8xMjNAdGVzdC5jb20="
-
 ---
 # Source: app/templates/service.yaml
 apiVersion: v1
@@ -26,7 +25,7 @@ metadata:
     app.kubernetes.io/name: example-rails
     app.kubernetes.io/instance: rails-example
     app.kubernetes.io/version: "v1"
-    app.kubernetes.io/managed-by: Tiller
+    app.kubernetes.io/managed-by: Helm
     helm.sh/chart: app-0.0.2
 spec:
   type: ClusterIP
@@ -37,7 +36,6 @@ spec:
       name: http
   selector:
     app.kubernetes.io/name: example-rails
-
 ---
 # Source: app/templates/deployment.yaml
 apiVersion: apps/v1
@@ -51,7 +49,7 @@ metadata:
     app.kubernetes.io/name: example-rails
     app.kubernetes.io/instance: rails-example
     app.kubernetes.io/version: "v1"
-    app.kubernetes.io/managed-by: Tiller
+    app.kubernetes.io/managed-by: Helm
     helm.sh/chart: app-0.0.2
 spec:
   replicas: 1
@@ -76,7 +74,6 @@ spec:
           env:
             - name: RAILS_ENV
               value: production
-            
           ports:
             - name: http
               containerPort: 80
@@ -86,17 +83,12 @@ spec:
             httpGet:
               path: /
               port: http
-            
           livenessProbe:
             httpGet:
               path: /
               port: http
-            
-
 ---
 # Source: app/templates/workers.yaml
-
----
 apiVersion: apps/v1
 kind: Deployment
 metadata:
@@ -109,7 +101,7 @@ metadata:
     app.kubernetes.io/name: example-rails
     app.kubernetes.io/instance: rails-example
     app.kubernetes.io/version: "v1"
-    app.kubernetes.io/managed-by: Tiller
+    app.kubernetes.io/managed-by: Helm
     helm.sh/chart: app-0.0.2
 spec:
   replicas: 1
@@ -138,7 +130,6 @@ spec:
           env:
             - name: RAILS_ENV
               value: production
-            
           ports:
             - name: http
               containerPort: 80
@@ -148,13 +139,35 @@ spec:
             httpGet:
               path: /
               port: http
-            
           livenessProbe:
             httpGet:
               path: /
               port: http
-            
-
+---
+# Source: app/templates/ingress.yaml
+apiVersion: networking.k8s.io/v1
+kind: Ingress
+metadata:
+  name: rails-example
+  namespace: default
+  labels:
+    app.kubernetes.io/name: example-rails
+    app.kubernetes.io/instance: rails-example
+    app.kubernetes.io/version: "v1"
+    app.kubernetes.io/managed-by: Helm
+    helm.sh/chart: app-0.0.2
+spec:
+  rules:
+    - host: "example.com"
+      http:
+        paths:
+          - path: /
+            pathType: Prefix
+            backend:
+              service:
+                name: rails-example
+                port:
+                  name: http
 ---
 # Source: app/templates/migration.yaml
 apiVersion: batch/v1
@@ -166,7 +179,7 @@ metadata:
     app.kubernetes.io/name: example-rails
     app.kubernetes.io/instance: rails-example
     app.kubernetes.io/version: "v1"
-    app.kubernetes.io/managed-by: Tiller
+    app.kubernetes.io/managed-by: Helm
     helm.sh/chart: app-0.0.2
   annotations:
     "helm.sh/hook": pre-upgrade
@@ -194,27 +207,3 @@ spec:
           env:
             - name: RAILS_ENV
               value: production
-            
----
-# Source: app/templates/ingress.yaml
-apiVersion: extensions/v1beta1
-kind: Ingress
-metadata:
-  name: rails-example
-  namespace: default
-  labels:
-    app.kubernetes.io/name: example-rails
-    app.kubernetes.io/instance: rails-example
-    app.kubernetes.io/version: "v1"
-    app.kubernetes.io/managed-by: Tiller
-    helm.sh/chart: app-0.0.2
-spec:
-  rules:
-    - host: "example.com"
-      http:
-        paths:
-          - path: /
-            backend:
-              serviceName: rails-example
-              servicePort: http
-