From fa97a86684863ff7cb633581add355c8d4bb06a9 Mon Sep 17 00:00:00 2001 From: Nick Tran <10810510+njtran@users.noreply.github.com> Date: Mon, 30 Sep 2024 13:33:30 -0700 Subject: [PATCH 1/2] chore: update support for 1.31 (#7126) Co-authored-by: Jason Deal --- .github/actions/e2e/install-karpenter/action.yaml | 2 +- .github/actions/e2e/run-tests-private-cluster/action.yaml | 2 +- .github/actions/e2e/setup-cluster/action.yaml | 2 +- .github/actions/install-deps/action.yaml | 2 +- .github/workflows/ci-test.yaml | 4 ++-- .github/workflows/e2e-matrix.yaml | 5 +++-- .github/workflows/e2e-upgrade.yaml | 5 +++-- .github/workflows/e2e-version-compatibility-trigger.yaml | 2 +- .github/workflows/e2e.yaml | 5 +++-- pkg/providers/version/version.go | 2 +- website/hugo.yaml | 4 ++-- 11 files changed, 19 insertions(+), 16 deletions(-) diff --git a/.github/actions/e2e/install-karpenter/action.yaml b/.github/actions/e2e/install-karpenter/action.yaml index f134dd604a1b..a227f965b044 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.30" + default: "1.31" 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 86da1447d471..0c539dbf84f6 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.30" + default: "1.31" 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' diff --git a/.github/actions/e2e/setup-cluster/action.yaml b/.github/actions/e2e/setup-cluster/action.yaml index ff3d656d5d70..752403d26c88 100644 --- a/.github/actions/e2e/setup-cluster/action.yaml +++ b/.github/actions/e2e/setup-cluster/action.yaml @@ -27,7 +27,7 @@ inputs: required: true k8s_version: description: 'Version of Kubernetes to use for the launched cluster' - default: "1.30" + default: "1.31" eksctl_version: description: "Version of eksctl to install" default: v0.180.0 diff --git a/.github/actions/install-deps/action.yaml b/.github/actions/install-deps/action.yaml index 3475f09efc49..d91cb465b3aa 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.30.x" + default: "1.31.x" runs: using: "composite" steps: diff --git a/.github/workflows/ci-test.yaml b/.github/workflows/ci-test.yaml index 36fa38add4c0..be6d1de75919 100644 --- a/.github/workflows/ci-test.yaml +++ b/.github/workflows/ci-test.yaml @@ -14,7 +14,7 @@ jobs: strategy: fail-fast: false matrix: - k8sVersion: ["1.25.x", "1.26.x", "1.27.x", "1.28.x", "1.29.x", "1.30.x"] + k8sVersion: ["1.25.x", "1.26.x", "1.27.x", "1.28.x", "1.29.x", "1.30.x", "1.31.x"] steps: - uses: actions/checkout@9bb56186c3b09b4f86b1c65136769dd318469633 # v4.1.2 - uses: ./.github/actions/install-deps @@ -23,7 +23,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.30.x' + if: matrix.k8sVersion == '1.31.x' env: COVERALLS_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: goveralls -coverprofile=coverage.out -service=github diff --git a/.github/workflows/e2e-matrix.yaml b/.github/workflows/e2e-matrix.yaml index 4d0c569ac5e3..aea4b54764ea 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.30" + default: "1.31" cleanup: type: boolean required: true @@ -40,7 +40,8 @@ on: - "1.28" - "1.29" - "1.30" - default: "1.30" + - "1.31" + default: "1.31" cleanup: type: boolean required: true diff --git a/.github/workflows/e2e-upgrade.yaml b/.github/workflows/e2e-upgrade.yaml index f5751de20aac..f2657b9e8681 100644 --- a/.github/workflows/e2e-upgrade.yaml +++ b/.github/workflows/e2e-upgrade.yaml @@ -22,7 +22,8 @@ on: - "1.28" - "1.29" - "1.30" - default: "1.30" + - "1.31" + default: "1.31" cleanup: required: true default: true @@ -39,7 +40,7 @@ on: default: "us-east-2" k8s_version: type: string - default: "1.30" + default: "1.31" cleanup: required: true type: boolean diff --git a/.github/workflows/e2e-version-compatibility-trigger.yaml b/.github/workflows/e2e-version-compatibility-trigger.yaml index caa95f24509e..2feb902cd282 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.25", "1.26", "1.27", "1.28", "1.29", "1.30"] + k8s_version: ["1.25", "1.26", "1.27", "1.28", "1.29", "1.30", "1.31"] 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 118f04e91ed3..f24d542e3adb 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -36,7 +36,8 @@ on: - "1.28" - "1.29" - "1.30" - default: "1.30" + - "1.31" + default: "1.31" cluster_name: type: string cleanup: @@ -60,7 +61,7 @@ on: required: true k8s_version: type: string - default: "1.30" + default: "1.31" enable_metrics: type: boolean default: false diff --git a/pkg/providers/version/version.go b/pkg/providers/version/version.go index e021cd0615eb..98de1bc3a57e 100644 --- a/pkg/providers/version/version.go +++ b/pkg/providers/version/version.go @@ -35,7 +35,7 @@ const ( // If a user runs a karpenter image on a k8s version outside the min and max, // One error message will be fired to notify MinK8sVersion = "1.25" - MaxK8sVersion = "1.30" + MaxK8sVersion = "1.31" ) type Provider interface { diff --git a/website/hugo.yaml b/website/hugo.yaml index 80c2b0830b97..1d2252981968 100644 --- a/website/hugo.yaml +++ b/website/hugo.yaml @@ -76,8 +76,8 @@ params: url: "https://slack.k8s.io/" icon: fab fa-slack desc: "Chat with us on Slack in the #aws-provider channel" - latest_release_version: "0.37.0" - latest_k8s_version: "1.30" + latest_release_version: "1.0.2" + latest_k8s_version: "1.31" versions: - v0.37 - v0.36 From 25f02d95908a4a94fad3de79b8a5cba806524990 Mon Sep 17 00:00:00 2001 From: Jason Deal Date: Mon, 30 Sep 2024 13:58:54 -0700 Subject: [PATCH 2/2] ci: bump eksctl version (#7131) --- .github/actions/e2e/cleanup/action.yaml | 2 +- .github/actions/e2e/setup-cluster/action.yaml | 2 +- .github/workflows/e2e-cleanup.yaml | 2 +- .github/workflows/e2e-upgrade.yaml | 6 +++--- .github/workflows/e2e.yaml | 4 ++-- .../getting-started-with-karpenter/_index.md | 6 +++++- 6 files changed, 13 insertions(+), 9 deletions(-) diff --git a/.github/actions/e2e/cleanup/action.yaml b/.github/actions/e2e/cleanup/action.yaml index f74292acfe8d..0fdc4afd6fc3 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.180.0 + default: v0.191.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/setup-cluster/action.yaml b/.github/actions/e2e/setup-cluster/action.yaml index 752403d26c88..b9cc7aa9d2aa 100644 --- a/.github/actions/e2e/setup-cluster/action.yaml +++ b/.github/actions/e2e/setup-cluster/action.yaml @@ -30,7 +30,7 @@ inputs: default: "1.31" eksctl_version: description: "Version of eksctl to install" - default: v0.180.0 + default: v0.191.0 ip_family: description: "IP Family of the cluster. Valid values are IPv4 or IPv6" default: "IPv4" diff --git a/.github/workflows/e2e-cleanup.yaml b/.github/workflows/e2e-cleanup.yaml index 21b0f053abdd..8ee714a68142 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.180.0 + eksctl_version: v0.191.0 diff --git a/.github/workflows/e2e-upgrade.yaml b/.github/workflows/e2e-upgrade.yaml index f2657b9e8681..4f6ad560a9fe 100644 --- a/.github/workflows/e2e-upgrade.yaml +++ b/.github/workflows/e2e-upgrade.yaml @@ -90,7 +90,7 @@ jobs: region: ${{ inputs.region }} cluster_name: ${{ steps.generate-cluster-name.outputs.CLUSTER_NAME }} k8s_version: ${{ inputs.k8s_version }} - eksctl_version: v0.180.0 + eksctl_version: v0.191.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 }} @@ -116,7 +116,7 @@ jobs: region: ${{ inputs.region }} cluster_name: ${{ steps.generate-cluster-name.outputs.CLUSTER_NAME }} k8s_version: ${{ inputs.k8s_version }} - eksctl_version: v0.180.0 + eksctl_version: v0.191.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 }} @@ -152,7 +152,7 @@ jobs: region: ${{ inputs.region }} cluster_name: ${{ steps.generate-cluster-name.outputs.CLUSTER_NAME }} git_ref: ${{ inputs.to_git_ref }} - eksctl_version: v0.180.0 + eksctl_version: v0.191.0 - if: always() && github.event_name == 'workflow_run' uses: ./.github/actions/commit-status/end with: diff --git a/.github/workflows/e2e.yaml b/.github/workflows/e2e.yaml index f24d542e3adb..f7d953d891e9 100644 --- a/.github/workflows/e2e.yaml +++ b/.github/workflows/e2e.yaml @@ -132,7 +132,7 @@ jobs: region: ${{ inputs.region }} cluster_name: ${{ steps.generate-cluster-name.outputs.CLUSTER_NAME }} k8s_version: ${{ inputs.k8s_version }} - eksctl_version: v0.180.0 + eksctl_version: v0.191.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 }} @@ -204,7 +204,7 @@ jobs: region: ${{ inputs.region }} cluster_name: ${{ steps.generate-cluster-name.outputs.CLUSTER_NAME }} git_ref: ${{ inputs.git_ref }} - eksctl_version: v0.180.0 + eksctl_version: v0.191.0 private_cluster: ${{ inputs.workflow_trigger == 'private_cluster' }} - if: always() && github.event_name == 'workflow_run' uses: ./.github/actions/commit-status/end diff --git a/website/content/en/preview/getting-started/getting-started-with-karpenter/_index.md b/website/content/en/preview/getting-started/getting-started-with-karpenter/_index.md index e2b943108a1b..44a0bb208753 100644 --- a/website/content/en/preview/getting-started/getting-started-with-karpenter/_index.md +++ b/website/content/en/preview/getting-started/getting-started-with-karpenter/_index.md @@ -15,6 +15,10 @@ Currently, the following Cloud Providers are supported: - [AWS](https://github.com/aws/karpenter-provider-aws) - [Azure](https://github.com/Azure/karpenter-provider-azure) +The guide below explains how to utilize the [Karpenter provider for AWS](https://github.com/aws/karpenter-provider-aws) with EKS. + +See the [AKS Node autoprovisioning article](https://learn.microsoft.com/azure/aks/node-autoprovision) on how to use Karpenter on Azure's AKS or go to the [Karpenter provider for Azure open source repository](https://github.com/Azure/karpenter-provider-azure) for self-hosting on Azure and additional information. + ## Create a cluster and add Karpenter This guide uses `eksctl` to create the cluster. @@ -34,7 +38,7 @@ Install these tools before proceeding: 1. [AWS CLI](https://docs.aws.amazon.com/cli/latest/userguide/install-cliv2-linux.html) 2. `kubectl` - [the Kubernetes CLI](https://kubernetes.io/docs/tasks/tools/install-kubectl-linux/) -3. `eksctl` (>= v0.180.0) - [the CLI for AWS EKS](https://docs.aws.amazon.com/eks/latest/userguide/eksctl.html) +3. `eksctl` (>= v0.191.0) - [the CLI for AWS EKS](https://docs.aws.amazon.com/eks/latest/userguide/eksctl.html) 4. `helm` - [the package manager for Kubernetes](https://helm.sh/docs/intro/install/) [Configure the AWS CLI](https://docs.aws.amazon.com/cli/latest/userguide/cli-configure-quickstart.html)