Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: update support for 1.31 #7126

Merged
merged 5 commits into from
Sep 30, 2024
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/actions/e2e/install-karpenter/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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'
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/e2e/setup-cluster/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion .github/actions/install-deps/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/ci-test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.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
Expand All @@ -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
6 changes: 3 additions & 3 deletions .github/workflows/e2e-matrix.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ on:
default: "us-east-2"
k8s_version:
type: string
default: "1.30"
default: "1.31"
cleanup:
type: boolean
required: true
Expand All @@ -34,13 +34,13 @@ on:
k8s_version:
type: choice
options:
- "1.25"
- "1.26"
- "1.27"
- "1.28"
- "1.29"
- "1.30"
default: "1.30"
- "1.31"
default: "1.31"
cleanup:
type: boolean
required: true
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/e2e-upgrade.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -16,13 +16,13 @@ on:
k8s_version:
type: choice
options:
- "1.25"
- "1.26"
- "1.27"
- "1.28"
- "1.29"
- "1.30"
default: "1.30"
- "1.31"
default: "1.31"
cleanup:
required: true
default: true
Expand All @@ -39,7 +39,7 @@ on:
default: "us-east-2"
k8s_version:
type: string
default: "1.30"
default: "1.31"
cleanup:
required: true
type: boolean
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/e2e-version-compatibility-trigger.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -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.26", "1.27", "1.28", "1.29", "1.30", "1.31"]
uses: ./.github/workflows/e2e-matrix.yaml
with:
region: ${{ inputs.region || 'eu-west-1' }}
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/e2e.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,13 +30,13 @@ on:
k8s_version:
type: choice
options:
- "1.25"
- "1.26"
- "1.27"
- "1.28"
- "1.29"
- "1.30"
default: "1.30"
- "1.31"
default: "1.31"
cluster_name:
type: string
cleanup:
Expand All @@ -60,7 +60,7 @@ on:
required: true
k8s_version:
type: string
default: "1.30"
default: "1.31"
enable_metrics:
type: boolean
default: false
Expand Down
2 changes: 2 additions & 0 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -100,3 +100,5 @@ require (
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
)

replace sigs.k8s.io/karpenter => github.com/njtran/karpenter v0.0.0-20240930143956-b1d1d532ac73
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,8 @@ github.com/modern-go/reflect2 v1.0.2 h1:xBagoLtFs94CBntxluKeaWgTMpvLxC4ur3nMaC9G
github.com/modern-go/reflect2 v1.0.2/go.mod h1:yWuevngMOJpCy52FWWMvUC8ws7m/LJsjYzDa0/r8luk=
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
github.com/njtran/karpenter v0.0.0-20240930143956-b1d1d532ac73 h1:xP8HOdGYHyIoMueTpn+yeswrhBkkIn/p5DUL5OQN4ow=
github.com/njtran/karpenter v0.0.0-20240930143956-b1d1d532ac73/go.mod h1:odwr/cPdG0y6oTMHsItGMazdAMGUJzz8Kd1+SfrqjKs=
github.com/olekukonko/tablewriter v0.0.5 h1:P2Ga83D34wi1o9J6Wh1mRuqd4mF/x/lgBS7N7AbDhec=
github.com/olekukonko/tablewriter v0.0.5/go.mod h1:hPp6KlRPjbx+hW8ykQs1w3UBbZlj6HuIJcUGPhkA7kY=
github.com/onsi/ginkgo/v2 v2.20.2 h1:7NVCeyIWROIAheY21RLS+3j2bb52W0W82tkberYytp4=
Expand Down Expand Up @@ -276,8 +278,6 @@ sigs.k8s.io/controller-runtime v0.19.0 h1:nWVM7aq+Il2ABxwiCizrVDSlmDcshi9llbaFbC
sigs.k8s.io/controller-runtime v0.19.0/go.mod h1:iRmWllt8IlaLjvTTDLhRBXIEtkCK6hwVBJJsYS9Ajf4=
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
sigs.k8s.io/karpenter v1.0.1-0.20240921204958-04a921c00ad8 h1:F0eGjPSRLd6emk614DNjxgNc97AkVqRSvpnSxxxm0hM=
sigs.k8s.io/karpenter v1.0.1-0.20240921204958-04a921c00ad8/go.mod h1:U70Yuu2wiH1nBC5/nDYYpqYNadYnMgetmVQ5s2NouyU=
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 h1:150L+0vs/8DA78h1u02ooW1/fFq/Lwr+sGiqlzvrtq4=
sigs.k8s.io/structured-merge-diff/v4 v4.4.1/go.mod h1:N8hJocpFajUSSeSJ9bOZ77VzejKZaXsTtZo4/u7Io08=
sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
Expand Down
4 changes: 2 additions & 2 deletions pkg/providers/version/version.go
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,8 @@ const (
// Karpenter's supported version of Kubernetes
// 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"
MinK8sVersion = "1.26"
MaxK8sVersion = "1.31"
)

type Provider interface {
Expand Down
2 changes: 1 addition & 1 deletion website/hugo.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ params:
icon: fab fa-slack
desc: "Chat with us on Slack in the #aws-provider channel"
latest_release_version: "1.0.2"
latest_k8s_version: "1.30"
latest_k8s_version: "1.31"
versions:
- v1.0
- v0.37
Expand Down
Loading