From c380935b0d9a14aca8b5925c6b276e88fb93f21f Mon Sep 17 00:00:00 2001 From: edibble21 <85638465+edibble21@users.noreply.github.com> Date: Fri, 24 Jan 2025 09:51:22 -0800 Subject: [PATCH] Chore: Version bump to 1.32 (#1927) --- .github/workflows/kind-e2e.yaml | 2 +- .github/workflows/presubmit.yaml | 4 ++-- hack/toolchain.sh | 2 +- kwok/apis/crds/karpenter.kwok.sh_kwoknodeclasses.yaml | 2 +- kwok/charts/crds/karpenter.sh_nodeclaims.yaml | 2 +- kwok/charts/crds/karpenter.sh_nodepools.yaml | 2 +- pkg/apis/crds/karpenter.sh_nodeclaims.yaml | 2 +- pkg/apis/crds/karpenter.sh_nodepools.yaml | 2 +- pkg/test/environment.go | 7 ++++--- .../v1alpha1/crds/karpenter.test.sh_testnodeclasses.yaml | 2 +- 10 files changed, 14 insertions(+), 13 deletions(-) diff --git a/.github/workflows/kind-e2e.yaml b/.github/workflows/kind-e2e.yaml index 224e6a8273..09a9f7afdf 100644 --- a/.github/workflows/kind-e2e.yaml +++ b/.github/workflows/kind-e2e.yaml @@ -9,7 +9,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", "1.31.x"] + k8sVersion: ["1.25.x", "1.26.x", "1.27.x", "1.28.x", "1.29.x", "1.30.x", "1.31.x", "1.32.x"] steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - name: Set up Python 3.10 diff --git a/.github/workflows/presubmit.yaml b/.github/workflows/presubmit.yaml index 78c8a50b65..2bdd328f8e 100644 --- a/.github/workflows/presubmit.yaml +++ b/.github/workflows/presubmit.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", "1.31.x"] + k8sVersion: ["1.25.x", "1.26.x", "1.27.x", "1.28.x", "1.29.x", "1.30.x", "1.31.x", "1.32.x"] steps: - uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2 - uses: ./.github/actions/install-deps @@ -25,7 +25,7 @@ jobs: - run: K8S_VERSION=${{ matrix.k8sVersion }} make presubmit - name: Send coverage # should only send converage once https://docs.coveralls.io/parallel-builds - if: matrix.k8sVersion == '1.31.x' + if: matrix.k8sVersion == '1.32.x' env: COVERALLS_TOKEN: ${{ secrets.GITHUB_TOKEN }} run: goveralls -coverprofile=coverage.out -service=github diff --git a/hack/toolchain.sh b/hack/toolchain.sh index d1bf76ed2d..b33f3b09d9 100755 --- a/hack/toolchain.sh +++ b/hack/toolchain.sh @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -euo pipefail -K8S_VERSION="${K8S_VERSION:="1.31.x"}" +K8S_VERSION="${K8S_VERSION:="1.32.x"}" KUBEBUILDER_ASSETS="/usr/local/kubebuilder/bin" main() { diff --git a/kwok/apis/crds/karpenter.kwok.sh_kwoknodeclasses.yaml b/kwok/apis/crds/karpenter.kwok.sh_kwoknodeclasses.yaml index c93d3e75ca..e9a158a966 100644 --- a/kwok/apis/crds/karpenter.kwok.sh_kwoknodeclasses.yaml +++ b/kwok/apis/crds/karpenter.kwok.sh_kwoknodeclasses.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.5 + controller-gen.kubebuilder.io/version: v0.17.1 name: kwoknodeclasses.karpenter.kwok.sh spec: group: karpenter.kwok.sh diff --git a/kwok/charts/crds/karpenter.sh_nodeclaims.yaml b/kwok/charts/crds/karpenter.sh_nodeclaims.yaml index 1150d87ca5..92eb9dbe03 100644 --- a/kwok/charts/crds/karpenter.sh_nodeclaims.yaml +++ b/kwok/charts/crds/karpenter.sh_nodeclaims.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.5 + controller-gen.kubebuilder.io/version: v0.17.1 name: nodeclaims.karpenter.sh spec: group: karpenter.sh diff --git a/kwok/charts/crds/karpenter.sh_nodepools.yaml b/kwok/charts/crds/karpenter.sh_nodepools.yaml index 84ba89082f..bd608d655f 100644 --- a/kwok/charts/crds/karpenter.sh_nodepools.yaml +++ b/kwok/charts/crds/karpenter.sh_nodepools.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.5 + controller-gen.kubebuilder.io/version: v0.17.1 name: nodepools.karpenter.sh spec: group: karpenter.sh diff --git a/pkg/apis/crds/karpenter.sh_nodeclaims.yaml b/pkg/apis/crds/karpenter.sh_nodeclaims.yaml index 9465ed5b53..00018dc000 100644 --- a/pkg/apis/crds/karpenter.sh_nodeclaims.yaml +++ b/pkg/apis/crds/karpenter.sh_nodeclaims.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.5 + controller-gen.kubebuilder.io/version: v0.17.1 name: nodeclaims.karpenter.sh spec: group: karpenter.sh diff --git a/pkg/apis/crds/karpenter.sh_nodepools.yaml b/pkg/apis/crds/karpenter.sh_nodepools.yaml index 67d7d2d728..36ecac075d 100644 --- a/pkg/apis/crds/karpenter.sh_nodepools.yaml +++ b/pkg/apis/crds/karpenter.sh_nodepools.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.5 + controller-gen.kubebuilder.io/version: v0.17.1 name: nodepools.karpenter.sh spec: group: karpenter.sh diff --git a/pkg/test/environment.go b/pkg/test/environment.go index fc7a1dae7c..b04b66270b 100644 --- a/pkg/test/environment.go +++ b/pkg/test/environment.go @@ -114,16 +114,17 @@ func NewEnvironment(options ...option.Function[EnvironmentOptions]) *Environment opts := option.Resolve(options...) ctx, cancel := context.WithCancel(context.Background()) - version := version.MustParseSemantic(strings.Replace(env.WithDefaultString("K8S_VERSION", "1.31.x"), ".x", ".0", -1)) + version := version.MustParseSemantic(strings.Replace(env.WithDefaultString("K8S_VERSION", "1.32.x"), ".x", ".0", -1)) environment := envtest.Environment{Scheme: scheme.Scheme, CRDs: opts.crds} - if version.Minor() >= 21 { + if version.Minor() >= 21 && version.Minor() < 32 { // PodAffinityNamespaceSelector is used for label selectors in pod affinities. If the feature-gate is turned off, // the api-server just clears out the label selector so we never see it. If we turn it on, the label selectors // are passed to us and we handle them. This feature is alpha in apiextensionsv1.21, beta in apiextensionsv1.22 and will be GA in 1.24. See // https://github.com/kubernetes/enhancements/issues/2249 for more info. environment.ControlPlane.GetAPIServer().Configure().Set("feature-gates", "PodAffinityNamespaceSelector=true") } - if version.Minor() >= 24 { + //MinDomains got promoted to stable in 1.32 + if version.Minor() >= 24 && version.Minor() < 32 { // MinDomainsInPodTopologySpread enforces a minimum number of eligible node domains for pod scheduling // See https://kubernetes.io/docs/concepts/scheduling-eviction/topology-spread-constraints/#spread-constraint-definition // Ref: https://github.com/aws/karpenter-core/pull/330 diff --git a/pkg/test/v1alpha1/crds/karpenter.test.sh_testnodeclasses.yaml b/pkg/test/v1alpha1/crds/karpenter.test.sh_testnodeclasses.yaml index d36c4e448c..a80a21f279 100644 --- a/pkg/test/v1alpha1/crds/karpenter.test.sh_testnodeclasses.yaml +++ b/pkg/test/v1alpha1/crds/karpenter.test.sh_testnodeclasses.yaml @@ -3,7 +3,7 @@ apiVersion: apiextensions.k8s.io/v1 kind: CustomResourceDefinition metadata: annotations: - controller-gen.kubebuilder.io/version: v0.16.5 + controller-gen.kubebuilder.io/version: v0.17.1 name: testnodeclasses.karpenter.test.sh spec: group: karpenter.test.sh