diff --git a/.github/actions/e2e/cleanup/action.yaml b/.github/actions/e2e/cleanup/action.yaml index 81e07b2d1b14..bb52439c29ff 100644 --- a/.github/actions/e2e/cleanup/action.yaml +++ b/.github/actions/e2e/cleanup/action.yaml @@ -32,7 +32,7 @@ runs: ref: ${{ inputs.git_ref }} - uses: ./.github/actions/e2e/install-eksctl with: - eksctl_version: ${{ inputs.eksctl_version }} + version: ${{ inputs.eksctl_version }} - name: delete-instance-profiles shell: run: | diff --git a/.github/actions/e2e/create-cluster/action.yaml b/.github/actions/e2e/create-cluster/action.yaml index 3abbd0432700..43fbbcc39bee 100644 --- a/.github/actions/e2e/create-cluster/action.yaml +++ b/.github/actions/e2e/create-cluster/action.yaml @@ -41,7 +41,7 @@ runs: ref: ${{ inputs.git_ref }} - uses: ./.github/actions/e2e/install-eksctl with: - eksctl_version: ${{ inputs.eksctl_version }} + version: ${{ inputs.eksctl_version }} - name: create iam policies shell: bash run: | diff --git a/.github/actions/e2e/install-eksctl/action.yaml b/.github/actions/e2e/install-eksctl/action.yaml index a696a4a9ef92..604b0d689a0e 100644 --- a/.github/actions/e2e/install-eksctl/action.yaml +++ b/.github/actions/e2e/install-eksctl/action.yaml @@ -1,7 +1,7 @@ name: InstallEKSCTL description: 'Installs eksctl' inputs: - eksctl_version: + version: description: "Version of EKSCTL to use for the launched cluster" required: true runs: @@ -12,9 +12,9 @@ runs: # for ARM systems, set ARCH to: `arm64`, `armv6` or `armv7` ARCH=amd64 PLATFORM=$(uname -s)_$ARCH - curl -sLO "https://github.com/weaveworks/eksctl/releases/download/${{ inputs.eksctl_version }}/eksctl_$PLATFORM.tar.gz" + curl -sLO "https://github.com/weaveworks/eksctl/releases/download/${{ inputs.version }}/eksctl_$PLATFORM.tar.gz" # (Optional) Verify checksum - curl -sL "https://github.com/weaveworks/eksctl/releases/download/${{ inputs.eksctl_version }}/eksctl_checksums.txt" | grep $PLATFORM | sha256sum --check + curl -sL "https://github.com/weaveworks/eksctl/releases/download/${{ inputs.version }}/eksctl_checksums.txt" | grep $PLATFORM | sha256sum --check tar -xzf eksctl_$PLATFORM.tar.gz -C /tmp && rm eksctl_$PLATFORM.tar.gz sudo mv /tmp/eksctl /usr/local/bin diff --git a/.github/actions/e2e/install-helm/action.yaml b/.github/actions/e2e/install-helm/action.yaml index d369c8bacaf3..72b2798bd26f 100644 --- a/.github/actions/e2e/install-helm/action.yaml +++ b/.github/actions/e2e/install-helm/action.yaml @@ -1,5 +1,9 @@ name: InstallHelm description: 'Installs helm' +inputs: + version: + description: "Version of Helm to install" + required: true runs: using: "composite" steps: @@ -8,7 +12,7 @@ runs: run: | curl -fsSL -o get_helm.sh https://raw.githubusercontent.com/helm/helm/main/scripts/get-helm-3 chmod 700 get_helm.sh - ./get_helm.sh + ./get_helm.sh --version ${{ inputs.version }} - name: install helm-diff shell: bash run: | diff --git a/.github/actions/e2e/install-karpenter/action.yaml b/.github/actions/e2e/install-karpenter/action.yaml index 05e13ee4ebe6..f73a28312e9c 100644 --- a/.github/actions/e2e/install-karpenter/action.yaml +++ b/.github/actions/e2e/install-karpenter/action.yaml @@ -34,6 +34,7 @@ runs: with: ref: ${{ inputs.git_ref }} - uses: ./.github/actions/e2e/install-helm + version: v3.12.3 # Pinned to this version since v3.13.0 has issues with anonymous pulls: https://github.com/helm/helm/issues/12423 - name: create karpenter namespace shell: bash run: | diff --git a/.github/actions/e2e/install-prometheus/action.yaml b/.github/actions/e2e/install-prometheus/action.yaml index d7e3abca0dda..f93710dbba38 100644 --- a/.github/actions/e2e/install-prometheus/action.yaml +++ b/.github/actions/e2e/install-prometheus/action.yaml @@ -25,6 +25,7 @@ runs: with: ref: ${{ inputs.git_ref }} - uses: ./.github/actions/e2e/install-helm + version: v3.12.3 # Pinned to this version since v3.13.0 has issues with anonymous pulls: https://github.com/helm/helm/issues/12423 - name: add prometheus repo shell: bash run: |