From 2cb6399a148a2efaabe963420ca11e34d2150cf7 Mon Sep 17 00:00:00 2001 From: Jason Deal Date: Fri, 24 May 2024 02:58:18 -0700 Subject: [PATCH] ci: enable eks 1.30 --- .github/actions/e2e/cleanup/action.yaml | 2 +- .github/actions/e2e/install-karpenter/action.yaml | 2 +- .../actions/e2e/run-tests-private-cluster/action.yaml | 4 ++-- .github/actions/e2e/setup-cluster/action.yaml | 9 +++++++-- .github/actions/install-deps/action.yaml | 2 +- .github/workflows/ci-test.yaml | 4 ++-- .github/workflows/e2e-cleanup.yaml | 2 +- .github/workflows/e2e-matrix.yaml | 5 +++-- .github/workflows/e2e-upgrade.yaml | 11 ++++++----- .../workflows/e2e-version-compatibility-trigger.yaml | 2 +- .github/workflows/e2e.yaml | 9 +++++---- 11 files changed, 30 insertions(+), 22 deletions(-) diff --git a/.github/actions/e2e/cleanup/action.yaml b/.github/actions/e2e/cleanup/action.yaml index a4b92a667409..b9cad257c1d8 100644 --- a/.github/actions/e2e/cleanup/action.yaml +++ b/.github/actions/e2e/cleanup/action.yaml @@ -17,7 +17,7 @@ inputs: description: "The git commit, tag, or branch to check out. Requires a corresponding Karpenter snapshot release" eksctl_version: description: "Version of eksctl to install" - default: v0.169.0 + default: v0.179.0 private_cluster: description: "Whether the cluster that has to be deleted is private or not. Valid values are 'true' or 'false'" default: 'false' diff --git a/.github/actions/e2e/install-karpenter/action.yaml b/.github/actions/e2e/install-karpenter/action.yaml index c542500d324b..41997e72a0da 100644 --- a/.github/actions/e2e/install-karpenter/action.yaml +++ b/.github/actions/e2e/install-karpenter/action.yaml @@ -21,7 +21,7 @@ inputs: required: true k8s_version: description: 'Version of Kubernetes to use for the launched cluster' - default: "1.29" + default: "1.30" git_ref: description: "The git commit, tag, or branch to check out. Requires a corresponding Karpenter snapshot release" private_cluster: diff --git a/.github/actions/e2e/run-tests-private-cluster/action.yaml b/.github/actions/e2e/run-tests-private-cluster/action.yaml index c6304aa8cee6..4b21e11ffe75 100644 --- a/.github/actions/e2e/run-tests-private-cluster/action.yaml +++ b/.github/actions/e2e/run-tests-private-cluster/action.yaml @@ -33,7 +33,7 @@ inputs: required: true k8s_version: description: 'Version of Kubernetes to use for the launched cluster' - default: "1.29" + default: "1.30" private_cluster: description: "Whether to create a private cluster which does not add access to the public internet. Valid values are 'true' or 'false'" default: 'false' @@ -160,4 +160,4 @@ runs: VPC_CB, CLUSTER_VPC_ID, EKS_CLUSTER_SG, - CLEANUP \ No newline at end of file + CLEANUP diff --git a/.github/actions/e2e/setup-cluster/action.yaml b/.github/actions/e2e/setup-cluster/action.yaml index 1b5b045872d1..fe10dc4d66c6 100644 --- a/.github/actions/e2e/setup-cluster/action.yaml +++ b/.github/actions/e2e/setup-cluster/action.yaml @@ -27,10 +27,10 @@ inputs: required: true k8s_version: description: 'Version of Kubernetes to use for the launched cluster' - default: "1.29" + default: "1.30" eksctl_version: description: "Version of eksctl to install" - default: v0.175.0 + default: v0.179.0 ip_family: description: "IP Family of the cluster. Valid values are IPv4 or IPv6" default: "IPv4" @@ -215,6 +215,11 @@ runs: eksctl ${cmd} cluster -f clusterconfig.yaml fi + # TODO (jmdeal): Remove this once eksctl resolves this issue + # Remove the serviceaccount created by eksctl as of 1.77.0 for pod identity associations. This service account causes our helm chart installation to fail. + # Reference: https://github.com/eksctl-io/eksctl/issues/7775 + kubectl delete sa -n kube-system karpenter || true + # Adding taints after all necessary pods have scheduled to the manged node group nodes # amazon-cloudwatch-observability pods do no not tolerate CriticalAddonsOnly=true:NoSchedule and # amazon-cloudwatch-observability addons does not allow to add tolerations to the addon pods as part of the advanced configuration diff --git a/.github/actions/install-deps/action.yaml b/.github/actions/install-deps/action.yaml index 46b73833e151..6a0477c7be38 100644 --- a/.github/actions/install-deps/action.yaml +++ b/.github/actions/install-deps/action.yaml @@ -3,7 +3,7 @@ description: 'Installs Go Downloads and installs Karpenter Dependencies' inputs: k8sVersion: description: Kubernetes version to use when installing the toolchain - default: "1.29.x" + default: "1.30.x" runs: using: "composite" steps: diff --git a/.github/workflows/ci-test.yaml b/.github/workflows/ci-test.yaml index 8f67ba8501b3..1bb6cdf7254e 100644 --- a/.github/workflows/ci-test.yaml +++ b/.github/workflows/ci-test.yaml @@ -13,7 +13,7 @@ jobs: if: github.repository == 'aws/karpenter-provider-aws' strategy: matrix: - k8sVersion: ["1.23.x", "1.24.x", "1.25.x", "1.26.x", "1.27.x", "1.28.x", "1.29.x"] + k8sVersion: ["1.23.x", "1.24.x", "1.25.x", "1.26.x", "1.27.x", "1.28.x", "1.29.x", "1.30.x"] steps: - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - uses: ./.github/actions/install-deps @@ -22,7 +22,7 @@ jobs: - run: K8S_VERSION=${{ matrix.k8sVersion }} make ci-test - name: Send coverage # should only send converage once https://docs.coveralls.io/parallel-builds - if: matrix.k8sVersion == '1.29.x' + if: matrix.k8sVersion == '1.30.x' env: COVERALLS_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: goveralls -coverprofile=coverage.out -service=github diff --git a/.github/workflows/e2e-cleanup.yaml b/.github/workflows/e2e-cleanup.yaml index a5844c6331bf..191a86dcee02 100644 --- a/.github/workflows/e2e-cleanup.yaml +++ b/.github/workflows/e2e-cleanup.yaml @@ -38,4 +38,4 @@ jobs: region: ${{ inputs.region }} cluster_name: ${{ inputs.cluster_name }} git_ref: ${{ inputs.git_ref }} - eksctl_version: v0.169.0 + eksctl_version: v0.179.0 diff --git a/.github/workflows/e2e-matrix.yaml b/.github/workflows/e2e-matrix.yaml index 267c5c70934e..f9bce70a8f57 100644 --- a/.github/workflows/e2e-matrix.yaml +++ b/.github/workflows/e2e-matrix.yaml @@ -7,7 +7,7 @@ on: default: "us-east-2" k8s_version: type: string - default: "1.29" + default: "1.30" cleanup: type: boolean required: true @@ -41,7 +41,8 @@ on: - "1.27" - "1.28" - "1.29" - default: "1.29" + - "1.30" + default: "1.30" cleanup: type: boolean required: true diff --git a/.github/workflows/e2e-upgrade.yaml b/.github/workflows/e2e-upgrade.yaml index 032c4c544338..28421d8b92cf 100644 --- a/.github/workflows/e2e-upgrade.yaml +++ b/.github/workflows/e2e-upgrade.yaml @@ -23,7 +23,8 @@ on: - "1.27" - "1.28" - "1.29" - default: "1.29" + - "1.30" + default: "1.30" cleanup: required: true default: true @@ -40,7 +41,7 @@ on: default: "us-east-2" k8s_version: type: string - default: "1.29" + default: "1.30" cleanup: required: true type: boolean @@ -90,7 +91,7 @@ jobs: region: ${{ inputs.region }} cluster_name: ${{ steps.generate-cluster-name.outputs.CLUSTER_NAME }} k8s_version: ${{ inputs.k8s_version }} - eksctl_version: v0.175.0 + eksctl_version: v0.179.0 ip_family: IPv4 # Set the value to IPv6 if IPv6 suite, else IPv4 git_ref: ${{ inputs.from_git_ref }} ecr_account_id: ${{ vars.SNAPSHOT_ACCOUNT_ID }} @@ -108,7 +109,7 @@ jobs: region: ${{ inputs.region }} cluster_name: ${{ steps.generate-cluster-name.outputs.CLUSTER_NAME }} k8s_version: ${{ inputs.k8s_version }} - eksctl_version: v0.175.0 + eksctl_version: v0.179.0 ip_family: IPv4 # Set the value to IPv6 if IPv6 suite, else IPv4 git_ref: ${{ inputs.to_git_ref }} ecr_account_id: ${{ vars.SNAPSHOT_ACCOUNT_ID }} @@ -161,7 +162,7 @@ jobs: region: ${{ inputs.region }} cluster_name: ${{ steps.generate-cluster-name.outputs.CLUSTER_NAME }} git_ref: ${{ inputs.to_git_ref }} - eksctl_version: v0.169.0 + eksctl_version: v0.179.0 - if: always() && github.event_name == 'workflow_run' uses: ./.github/actions/commit-status/end with: diff --git a/.github/workflows/e2e-version-compatibility-trigger.yaml b/.github/workflows/e2e-version-compatibility-trigger.yaml index e4b9f59ddab8..c69bd32eafc8 100644 --- a/.github/workflows/e2e-version-compatibility-trigger.yaml +++ b/.github/workflows/e2e-version-compatibility-trigger.yaml @@ -34,7 +34,7 @@ jobs: strategy: fail-fast: false matrix: - k8s_version: [ "1.23", "1.24", "1.25", "1.26", "1.27", "1.28", "1.29"] + k8s_version: [ "1.23", "1.24", "1.25", "1.26", "1.27", "1.28", "1.29", "1.30"] uses: ./.github/workflows/e2e-matrix.yaml with: region: ${{ inputs.region || 'eu-west-1' }} diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index 53f3d74eeaed..16f950b9b1c2 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -37,7 +37,8 @@ on: - "1.27" - "1.28" - "1.29" - default: "1.29" + - "1.30" + default: "1.30" cluster_name: type: string cleanup: @@ -61,7 +62,7 @@ on: required: true k8s_version: type: string - default: "1.29" + default: "1.30" enable_metrics: type: boolean default: false @@ -132,7 +133,7 @@ jobs: region: ${{ inputs.region }} cluster_name: ${{ steps.generate-cluster-name.outputs.CLUSTER_NAME }} k8s_version: ${{ inputs.k8s_version }} - eksctl_version: v0.175.0 + eksctl_version: v0.179.0 ip_family: ${{ contains(inputs.suite, 'IPv6') && 'IPv6' || 'IPv4' }} # Set the value to IPv6 if IPv6 suite, else IPv4 private_cluster: ${{ inputs.workflow_trigger == 'private_cluster' }} git_ref: ${{ inputs.git_ref }} @@ -213,7 +214,7 @@ jobs: region: ${{ inputs.region }} cluster_name: ${{ steps.generate-cluster-name.outputs.CLUSTER_NAME }} git_ref: ${{ inputs.git_ref }} - eksctl_version: v0.169.0 + eksctl_version: v0.179.0 private_cluster: ${{ inputs.workflow_trigger == 'private_cluster' }} - if: always() && github.event_name == 'workflow_run' uses: ./.github/actions/commit-status/end