Skip to content

Commit f133711

Browse files
committed
use v3.19.2 helm version (NOT latest 4.0.0)
Signed-off-by: Davanum Srinivas <[email protected]>
1 parent b6f3519 commit f133711

File tree

4 files changed

+36
-6
lines changed

4 files changed

+36
-6
lines changed

.github/actions/install-e2e-tools/action.yml

Lines changed: 20 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
# limitations under the License.
1414

1515
name: 'Install E2E Testing Tools'
16-
description: 'Installs ctlptl, kind, kubectl, and tilt for E2E testing'
16+
description: 'Installs ctlptl, kind, kubectl, helm, and tilt for E2E testing'
1717

1818
runs:
1919
using: "composite"
@@ -25,9 +25,11 @@ runs:
2525
KIND_VERSION=$(yq eval '.testing_tools.kind' .versions.yaml)
2626
CTLPTL_VERSION=$(yq eval '.testing_tools.ctlptl' .versions.yaml)
2727
TILT_VERSION=$(yq eval '.testing_tools.tilt' .versions.yaml)
28+
HELM_VERSION=$(yq eval '.testing_tools.helm' .versions.yaml)
2829
echo "kind_version=${KIND_VERSION}" >> $GITHUB_OUTPUT
2930
echo "ctlptl_version=${CTLPTL_VERSION}" >> $GITHUB_OUTPUT
3031
echo "tilt_version=${TILT_VERSION}" >> $GITHUB_OUTPUT
32+
echo "helm_version=${HELM_VERSION}" >> $GITHUB_OUTPUT
3133
3234
- name: Cache E2E testing tools
3335
uses: actions/cache@0057852bfaa89a56745cba8c7296529d2fc39830 # v4.3.0
@@ -37,7 +39,8 @@ runs:
3739
/usr/local/bin/kind
3840
/usr/local/bin/kubectl
3941
/usr/local/bin/tilt
40-
key: ${{ runner.os }}-${{ runner.arch }}-e2e-tools-${{ steps.versions.outputs.kind_version }}-${{ steps.versions.outputs.ctlptl_version }}-${{ steps.versions.outputs.tilt_version }}
42+
/usr/local/bin/helm
43+
key: ${{ runner.os }}-${{ runner.arch }}-e2e-tools-${{ steps.versions.outputs.kind_version }}-${{ steps.versions.outputs.ctlptl_version }}-${{ steps.versions.outputs.tilt_version }}-${{ steps.versions.outputs.helm_version }}
4144
restore-keys: |
4245
${{ runner.os }}-${{ runner.arch }}-e2e-tools-
4346
@@ -47,7 +50,7 @@ runs:
4750
echo "Runner OS: ${{ runner.os }}"
4851
echo "Runner architecture: ${{ runner.arch }}"
4952
echo "System architecture (uname -m): $(uname -m)"
50-
echo "Cache key will be: ${{ runner.os }}-${{ runner.arch }}-e2e-tools-${{ steps.versions.outputs.kind_version }}-${{ steps.versions.outputs.ctlptl_version }}-${{ steps.versions.outputs.tilt_version }}"
53+
echo "Cache key will be: ${{ runner.os }}-${{ runner.arch }}-e2e-tools-${{ steps.versions.outputs.kind_version }}-${{ steps.versions.outputs.ctlptl_version }}-${{ steps.versions.outputs.tilt_version }}-${{ steps.versions.outputs.helm_version }}"
5154
5255
- name: Install E2E testing tools
5356
shell: bash
@@ -98,11 +101,25 @@ runs:
98101
rm -rf "$TEMP_DIR"
99102
fi
100103
104+
# Install Helm (if not cached)
105+
HELM_VERSION="${{ steps.versions.outputs.helm_version }}"
106+
if command -v helm &> /dev/null && helm version --short | grep -q "${HELM_VERSION}"; then
107+
echo "Helm ${HELM_VERSION} already installed from cache"
108+
else
109+
echo "Installing Helm ${HELM_VERSION}..."
110+
ARCH=$(case $(uname -m) in x86_64) echo amd64;; aarch64|arm64) echo arm64;; *) echo $(uname -m);; esac)
111+
TEMP_DIR=$(mktemp -d)
112+
curl -fsSL --retry 3 --keepalive-time 2 https://get.helm.sh/helm-${HELM_VERSION}-linux-${ARCH}.tar.gz | tar -xzv -C "$TEMP_DIR"
113+
sudo mv "$TEMP_DIR/linux-${ARCH}/helm" /usr/local/bin/
114+
rm -rf "$TEMP_DIR"
115+
fi
116+
101117
# Verify installations
102118
echo "Verifying tool installations:"
103119
echo "ctlptl: $(ctlptl version)"
104120
echo "Kind: $(kind version)"
105121
echo "kubectl: $(kubectl version --client)"
106122
echo "Tilt: $(tilt version)"
123+
echo "Helm: $(helm version --short)"
107124
echo "Docker: $(docker version --format '{{.Client.Version}}')"
108125

.github/workflows/lint-test.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,11 +79,18 @@ jobs:
7979
- name: ${{ matrix.step_name }}
8080
run: ${{ matrix.make_command }}
8181

82+
- name: Load Helm version from .versions.yaml
83+
if: matrix.component == 'helm-charts'
84+
id: helm-version
85+
run: |
86+
HELM_VERSION=$(yq eval '.testing_tools.helm' .versions.yaml)
87+
echo "helm_version=${HELM_VERSION}" >> $GITHUB_OUTPUT
88+
8289
- name: Setup Helm
8390
if: matrix.component == 'helm-charts'
8491
uses: azure/setup-helm@1a275c3b69536ee54be43f2070a358922e12c8d4 # v4.3.1
8592
with:
86-
version: 'v3.14.4'
93+
version: ${{ steps.helm-version.outputs.helm_version }}
8794

8895
- name: Validate Helm Charts
8996
if: matrix.component == 'helm-charts'

.github/workflows/release.yml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -82,10 +82,16 @@ jobs:
8282
with:
8383
ref: ${{ github.event_name == 'workflow_dispatch' && github.event.inputs.tag || github.ref }}
8484

85+
- name: Load Helm version from .versions.yaml
86+
id: helm-version
87+
run: |
88+
HELM_VERSION=$(yq eval '.testing_tools.helm' .versions.yaml)
89+
echo "helm_version=${HELM_VERSION}" >> $GITHUB_OUTPUT
90+
8591
- name: Install helm
8692
uses: azure/setup-helm@1a275c3b69536ee54be43f2070a358922e12c8d4 # v4.3.1
8793
with:
88-
version: 'latest'
94+
version: ${{ steps.helm-version.outputs.helm_version }}
8995

9096
- name: Configure Helm for GitHub Packages
9197
run: |

.versions.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ container_tools:
6868
# Testing & E2E Tools
6969
testing_tools:
7070
kind: '0.30.0'
71-
helm: 'v3.14.4'
71+
helm: 'v3.19.2'
7272
kwok: 'v0.7.0'
7373
kwok_chart: '0.2.0' # KWOK Helm chart version (different from app version)
7474
ctlptl: '0.8.43'

0 commit comments

Comments
 (0)