Skip to content

Commit 86cfd90

Browse files
sheidkampdavidjumani
sheidkamp
and
davidjumani
authored
k8s 1.32 bump (#10616)
Co-authored-by: changelog-bot <changelog-bot> Co-authored-by: David Jumani <[email protected]>
1 parent f70b203 commit 86cfd90

File tree

12 files changed

+175
-107
lines changed

12 files changed

+175
-107
lines changed

‎.github/workflows/.env/nightly-tests/max_versions.env

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
node_version='v1.31.0@sha256:53df588e04085fd41ae12de0c3fe4c72f7013bba32a20e7325357a1ac94ba865'
2-
kubectl_version='v1.31.0'
3-
kind_version='v0.24.0'
4-
helm_version='v3.14.4'
5-
argocd_version='v2.8.4'
1+
node_version='v1.32.0@sha256:c48c62eac5da28cdadcf560d1d8616cfa6783b58f0d94cf63ad1bf49600cb027'
2+
kubectl_version='v1.32.2'
3+
kind_version='v0.26.0'
4+
helm_version='v3.17.1'
5+
argocd_version='v2.14.2'
66
istio_version='1.22.0'
77
k8sgateway_api_version='v1.2.1'

‎.github/workflows/.env/nightly-tests/min_versions.env

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
1-
node_version='v1.27.3@sha256:3966ac761ae0136263ffdb6cfd4db23ef8a83cba8a463690e98317add2c9ba72'
2-
kubectl_version='v1.27.3'
3-
kind_version='v0.20.0'
4-
helm_version='v3.12.2'
1+
node_version='v1.28.6@sha256:b7e1cf6b2b729f604133c667a6be8aab6f4dde5bb042c1891ae248d9154f665b'
2+
kubectl_version='v1.28.15'
3+
kind_version='v0.21.0'
4+
helm_version='v3.13.3'
55
argocd_version='v2.8.4'
66
istio_version='1.16.7'
77
k8sgateway_api_version='v1.0.0'

‎.github/workflows/.env/pr-tests/versions.env

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
1-
node_version='v1.31.0@sha256:53df588e04085fd41ae12de0c3fe4c72f7013bba32a20e7325357a1ac94ba865'
2-
kubectl_version='v1.31.0'
3-
kind_version='v0.24.0'
4-
helm_version='v3.14.4'
5-
argocd_version='v2.8.4'
1+
node_version='v1.32.0@sha256:c48c62eac5da28cdadcf560d1d8616cfa6783b58f0d94cf63ad1bf49600cb027'
2+
kubectl_version='v1.32.2'
3+
kind_version='v0.26.0'
4+
helm_version='v3.17.1'
5+
argocd_version='v2.14.2'
66
istio_version='1.22.0'
7+

‎.github/workflows/composite-actions/kube-gateway-api-conformance-tests/action.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@ runs:
1010
with:
1111
install_only: true
1212
version: ${{ matrix.kube-version.kind }}
13+
node_image: kindest/node:${{ matrix.kube-version.node }}
1314
- uses: azure/setup-kubectl@v4
1415
id: kubectl
1516
with:

‎.github/workflows/composite-actions/regression-tests/action.yaml

+1
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ runs:
1212
with:
1313
install_only: true
1414
version: ${{ matrix.kube-version.kind }}
15+
node_image: kindest/node:${{ matrix.kube-version.node }}
1516
- uses: azure/setup-kubectl@v4
1617
id: kubectl
1718
with:

‎.github/workflows/conformance-tests.yaml

+4-4
Original file line numberDiff line numberDiff line change
@@ -25,10 +25,10 @@ jobs:
2525
# how this was setup and there's a limited # of dispatch inputs that GH
2626
# supports. We can revisit this later.
2727
kube-version:
28-
- node: 'v1.31.0@sha256:53df588e04085fd41ae12de0c3fe4c72f7013bba32a20e7325357a1ac94ba865'
29-
kubectl: 'v1.31.0'
30-
kind: 'v0.24.0'
31-
helm: 'v3.14.4'
28+
- node: 'v1.32.0@sha256:c48c62eac5da28cdadcf560d1d8616cfa6783b58f0d94cf63ad1bf49600cb027'
29+
kubectl: 'v1.32.2'
30+
kind: 'v0.26.0'
31+
helm: 'v3.17.1'
3232
image-variant:
3333
- ${{ inputs.image-variant }}
3434
version:

‎changelog/v1.19.0-beta10/k8s-1.32-bump.yaml

+66
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
changelog:
2+
- type: BREAKING_CHANGE
3+
description: >
4+
Bump dependencies to support Kubernetes 1.32
5+
issueLink: https://github.com/solo-io/solo-projects/issues/7788
6+
resolvesIssue: false
7+
- type: DEPENDENCY_BUMP
8+
dependencyOwner: k8s.io
9+
dependencyRepo: api
10+
dependencyTag: v0.32.2
11+
- type: DEPENDENCY_BUMP
12+
dependencyOwner: k8s.io
13+
dependencyRepo: apiextensions-apiserver
14+
dependencyTag: v0.32.2
15+
- type: DEPENDENCY_BUMP
16+
dependencyOwner: k8s.io
17+
dependencyRepo: apimachinery
18+
dependencyTag: v0.32.2
19+
- type: DEPENDENCY_BUMP
20+
dependencyOwner: k8s.io
21+
dependencyRepo: client-go
22+
dependencyTag: v0.32.2
23+
- type: DEPENDENCY_BUMP
24+
dependencyOwner: k8s.io
25+
dependencyRepo: code-generator
26+
dependencyTag: v0.32.2
27+
- type: DEPENDENCY_BUMP
28+
dependencyOwner: k8s.io
29+
dependencyRepo: component-base
30+
dependencyTag: v0.32.2
31+
- type: DEPENDENCY_BUMP
32+
dependencyOwner: k8s.io
33+
dependencyRepo: kubectl
34+
dependencyTag: v0.32.2
35+
- type: DEPENDENCY_BUMP
36+
dependencyOwner: sigs.k8s.io
37+
dependencyRepo: controller-runtime
38+
dependencyTag: v0.20.1
39+
- type: DEPENDENCY_BUMP
40+
dependencyOwner: onsi
41+
dependencyRepo: gomega
42+
dependencyTag: v1.35.1
43+
- type: DEPENDENCY_BUMP
44+
dependencyOwner: onsi
45+
dependencyRepo: ginkgo
46+
dependencyTag: v2.21.0
47+
- type: DEPENDENCY_BUMP
48+
dependencyOwner: go.uber.org
49+
dependencyRepo: zap
50+
dependencyTag: v1.27.0
51+
- type: DEPENDENCY_BUMP
52+
dependencyOwner: solo-io
53+
dependencyRepo: go-utils
54+
dependencyTag: v0.27.4
55+
- type: DEPENDENCY_BUMP
56+
dependencyOwner: solo-io
57+
dependencyRepo: cloud-builders
58+
dependencyTag: v0.11.1
59+
- type: DEPENDENCY_BUMP
60+
dependencyOwner: solo-io
61+
dependencyRepo: skv2
62+
dependencyTag: v0.42.0
63+
- type: DEPENDENCY_BUMP
64+
dependencyOwner: solo-io
65+
dependencyRepo: solo-kit
66+
dependencyTag: v0.37.0

‎ci/cloudbuild/publish-artifacts.yaml

+5-5
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
steps:
22

3-
- name: 'gcr.io/$PROJECT_ID/prepare-go-workspace:0.10.2'
3+
- name: 'gcr.io/$PROJECT_ID/prepare-go-workspace:0.11.1'
44
id: 'prepare-workspace'
55
args:
66
- '--repo-name'
@@ -51,7 +51,7 @@ steps:
5151
- create
5252
- --use
5353

54-
- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.10.2'
54+
- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.11.1'
5555
id: 'build-certgen-arm64-binary'
5656
args:
5757
- 'certgen-docker'
@@ -60,7 +60,7 @@ steps:
6060
- 'GOARCH=arm64'
6161

6262
# Run make targets to push docker images to quay.io
63-
- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.10.2'
63+
- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.11.1'
6464
id: 'publish-docker'
6565
args:
6666
- 'publish-docker'
@@ -86,7 +86,7 @@ steps:
8686
waitFor:
8787
- 'publish-docker'
8888

89-
- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.10.2'
89+
- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.11.1'
9090
id: 'release-chart'
9191
dir: *dir
9292
args:
@@ -101,7 +101,7 @@ steps:
101101
- 'gcr-auth'
102102

103103
# Run make targets to build and push docker images to GCR
104-
- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.10.2'
104+
- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.11.1'
105105
id: 'publish-docker-extended-gcr'
106106
dir: *dir
107107
args:

‎ci/cloudbuild/run-tests.yaml

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
steps:
22

3-
- name: 'gcr.io/$PROJECT_ID/prepare-go-workspace:0.10.2'
3+
- name: 'gcr.io/$PROJECT_ID/prepare-go-workspace:0.11.1'
44
id: 'prepare-workspace'
55
args:
66
- '--repo-name'
@@ -23,7 +23,7 @@ steps:
2323
cd /go/pkg
2424
gsutil cat gs://$PROJECT_ID-cache/gloo/gloo-mod.tar.gz | tar -xzf - || echo "untar mod cache failed; continuing because we can download deps as we need them"
2525
26-
- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.10.2'
26+
- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.11.1'
2727
id: 'prepare-envoy'
2828
dir: *dir
2929
entrypoint: 'bash'
@@ -77,7 +77,7 @@ steps:
7777
waitFor:
7878
- 'prepare-gcr-zone'
7979

80-
- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.10.2'
80+
- name: 'gcr.io/$PROJECT_ID/go-mod-make:0.11.1'
8181
id: 'prepare-test-tools'
8282
dir: *dir
8383
args:
@@ -88,7 +88,7 @@ steps:
8888
- 'prepare-gcr-zone'
8989
- 'prepare-test-credentials'
9090

91-
- name: 'gcr.io/$PROJECT_ID/e2e-go-mod-ginkgo:0.10.2'
91+
- name: 'gcr.io/$PROJECT_ID/e2e-go-mod-ginkgo:0.11.1'
9292
id: 'run-tests'
9393
dir: *dir
9494
entrypoint: 'make'
@@ -99,7 +99,7 @@ steps:
9999
secretEnv:
100100
- 'JWT_PRIVATE_KEY'
101101

102-
- name: 'gcr.io/$PROJECT_ID/e2e-go-mod-ginkgo:0.10.2'
102+
- name: 'gcr.io/$PROJECT_ID/e2e-go-mod-ginkgo:0.11.1'
103103
id: 'run-e2e-tests'
104104
dir: *dir
105105
entrypoint: 'make'
@@ -110,7 +110,7 @@ steps:
110110
secretEnv:
111111
- 'JWT_PRIVATE_KEY'
112112

113-
- name: 'gcr.io/$PROJECT_ID/e2e-go-mod-ginkgo:0.10.2'
113+
- name: 'gcr.io/$PROJECT_ID/e2e-go-mod-ginkgo:0.11.1'
114114
id: 'run-hashicorp-e2e-tests'
115115
dir: *dir
116116
entrypoint: 'make'

‎docs/content/static/content/osa_provided.md

+8-8
Original file line numberDiff line numberDiff line change
@@ -72,14 +72,14 @@ Name|Version|License
7272
[istio.io/api](https://istio.io/api)|v1.25.0-alpha.0.0.20250210220544-0b64afd2de85|Apache License 2.0
7373
[istio.io/client-go](https://istio.io/client-go)|v1.25.0-alpha.0.0.20250210220843-5a4065fded65|Apache License 2.0
7474
[istio.io/istio](https://istio.io/istio)|v0.0.0-20250212203644-c2ac935c5888|Apache License 2.0
75-
[k8s.io/api](https://k8s.io/api)|v0.32.1|Apache License 2.0
76-
[k8s.io/apiextensions-apiserver](https://k8s.io/apiextensions-apiserver)|v0.32.1|Apache License 2.0
77-
[k8s.io/apimachinery](https://k8s.io/apimachinery)|v0.32.1|Apache License 2.0
78-
[k8s.io/client-go](https://k8s.io/client-go)|v0.32.1|Apache License 2.0
79-
[k8s.io/code-generator](https://k8s.io/code-generator)|v0.32.1|Apache License 2.0
80-
[k8s.io/component-base](https://k8s.io/component-base)|v0.32.1|Apache License 2.0
81-
[k8s.io/kubectl](https://k8s.io/kubectl)|v0.32.1|Apache License 2.0
82-
[k8s.io/utils](https://k8s.io/utils)|v0.0.0-20240711033017-18e509b52bc8|Apache License 2.0
75+
[k8s.io/api](https://k8s.io/api)|v0.32.2|Apache License 2.0
76+
[k8s.io/apiextensions-apiserver](https://k8s.io/apiextensions-apiserver)|v0.32.2|Apache License 2.0
77+
[k8s.io/apimachinery](https://k8s.io/apimachinery)|v0.32.2|Apache License 2.0
78+
[k8s.io/client-go](https://k8s.io/client-go)|v0.32.2|Apache License 2.0
79+
[k8s.io/code-generator](https://k8s.io/code-generator)|v0.32.2|Apache License 2.0
80+
[k8s.io/component-base](https://k8s.io/component-base)|v0.32.2|Apache License 2.0
81+
[k8s.io/kubectl](https://k8s.io/kubectl)|v0.32.2|Apache License 2.0
82+
[k8s.io/utils](https://k8s.io/utils)|v0.0.0-20241104100929-3ea5e8cea738|Apache License 2.0
8383
[knative.dev/networking](https://knative.dev/networking)|v0.0.0-20211210083629-bace06e98aee|Apache License 2.0
8484
[knative.dev/pkg](https://knative.dev/pkg)|v0.0.0-20211206113427-18589ac7627e|Apache License 2.0
8585
[sigs.k8s.io/controller-runtime](https://sigs.k8s.io/controller-runtime)|v0.20.1|Apache License 2.0

‎go.mod

+32-32
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module github.com/solo-io/gloo
22

3-
go 1.23.3
3+
go 1.23.6
44

55
// Note for developers: upgrading go will also require upgrading go in the following files:
66
// ./cloudbuild-cache.yaml,
@@ -49,17 +49,17 @@ require (
4949
github.com/saiskee/gettercheck v0.0.0-20210820204958-38443d06ebe0
5050
github.com/sergi/go-diff v1.2.0
5151
github.com/solo-io/go-list-licenses v0.1.4
52-
github.com/solo-io/go-utils v0.27.3
53-
github.com/solo-io/k8s-utils v0.8.1
52+
github.com/solo-io/go-utils v0.27.4
53+
github.com/solo-io/k8s-utils v0.9.0
5454
github.com/solo-io/protoc-gen-ext v0.0.25
5555
github.com/solo-io/protoc-gen-openapi v0.2.5
56-
github.com/solo-io/skv2 v0.41.0
56+
github.com/solo-io/skv2 v0.42.0
5757

58-
// Pinned to the `sa-k8s-1.29-bump` tag of solo-apis on `gloo-main` branch
58+
// Pinned to the `k8s-1.32-bump` tag of solo-apis on `gloo-main` branch
5959
// Ref: https://github.com/solo-io/gloo/pull/9463/files#r1594409655 && https://solo-io-corp.slack.com/archives/C03MFATU265/p1716913420716729?thread_ts=1716476992.938679&cid=C03MFATU265
6060
// as to why it is now based off `gloo-main` and not `gloo-repo-branch`
61-
github.com/solo-io/solo-apis v0.0.0-20240917212400-9103ca169358
62-
github.com/solo-io/solo-kit v0.36.4
61+
github.com/solo-io/solo-apis v0.0.0-20250218202255-bad789c9de63
62+
github.com/solo-io/solo-kit v0.37.0
6363
github.com/spf13/afero v1.11.0
6464
github.com/spf13/cobra v1.8.1
6565
github.com/spf13/pflag v1.0.5
@@ -75,13 +75,13 @@ require (
7575
google.golang.org/protobuf v1.36.5
7676
gopkg.in/AlecAivazis/survey.v1 v1.8.7
7777
helm.sh/helm/v3 v3.17.0
78-
k8s.io/api v0.32.1
79-
k8s.io/apiextensions-apiserver v0.32.1
80-
k8s.io/apimachinery v0.32.1
81-
k8s.io/client-go v0.32.1
82-
k8s.io/code-generator v0.32.1
83-
k8s.io/component-base v0.32.1
84-
k8s.io/kubectl v0.32.1
78+
k8s.io/api v0.32.2
79+
k8s.io/apiextensions-apiserver v0.32.2
80+
k8s.io/apimachinery v0.32.2
81+
k8s.io/client-go v0.32.2
82+
k8s.io/code-generator v0.32.2
83+
k8s.io/component-base v0.32.2
84+
k8s.io/kubectl v0.32.2
8585
k8s.io/utils v0.0.0-20241210054802-24370beab758
8686
knative.dev/networking v0.0.0-20211210083629-bace06e98aee
8787
knative.dev/pkg v0.0.0-20211206113427-18589ac7627e
@@ -335,14 +335,14 @@ require (
335335
gopkg.in/warnings.v0 v0.1.2 // indirect
336336
gopkg.in/yaml.v2 v2.4.0 // indirect
337337
gopkg.in/yaml.v3 v3.0.1 // indirect
338-
k8s.io/apiserver v0.32.1 // indirect
339-
k8s.io/cli-runtime v0.32.1 // indirect
340-
k8s.io/component-helpers v0.32.1 // indirect
338+
k8s.io/apiserver v0.32.2 // indirect
339+
k8s.io/cli-runtime v0.32.2 // indirect
340+
k8s.io/component-helpers v0.32.2 // indirect
341341
k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 // indirect
342342
k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 // indirect
343343
k8s.io/klog/v2 v2.130.1 // indirect
344344
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect
345-
k8s.io/metrics v0.32.1 // indirect
345+
k8s.io/metrics v0.32.2 // indirect
346346
oras.land/oras-go v1.2.5 // indirect
347347
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
348348
sigs.k8s.io/kustomize/api v0.18.0 // indirect
@@ -383,20 +383,20 @@ replace (
383383

384384
// Pin Kube libraries to v0.32
385385
// These should be upgraded collectively
386-
k8s.io/api => k8s.io/api v0.32.1
387-
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.32.1
388-
k8s.io/apimachinery => k8s.io/apimachinery v0.32.1
389-
k8s.io/apiserver => k8s.io/apiserver v0.32.1
390-
k8s.io/cli-runtime => k8s.io/cli-runtime v0.32.1
391-
k8s.io/client-go => k8s.io/client-go v0.32.1
392-
k8s.io/code-generator => k8s.io/code-generator v0.32.1
393-
k8s.io/component-base => k8s.io/component-base v0.32.1
394-
k8s.io/component-helpers => k8s.io/component-helpers v0.32.1
395-
// version of kube-openapi used by client-go v0.32.1
396-
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20240827152857-f7e401e7b4c2
397-
k8s.io/kubectl => k8s.io/kubectl v0.32.1
398-
k8s.io/metrics => k8s.io/metrics v0.32.1
399-
k8s.io/utils => k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
386+
k8s.io/api => k8s.io/api v0.32.2
387+
k8s.io/apiextensions-apiserver => k8s.io/apiextensions-apiserver v0.32.2
388+
k8s.io/apimachinery => k8s.io/apimachinery v0.32.2
389+
k8s.io/apiserver => k8s.io/apiserver v0.32.2
390+
k8s.io/cli-runtime => k8s.io/cli-runtime v0.32.2
391+
k8s.io/client-go => k8s.io/client-go v0.32.2
392+
k8s.io/code-generator => k8s.io/code-generator v0.32.2
393+
k8s.io/component-base => k8s.io/component-base v0.32.2
394+
k8s.io/component-helpers => k8s.io/component-helpers v0.32.2
395+
// version of kube-openapi used by client-go v0.32.2
396+
k8s.io/kube-openapi => k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f
397+
k8s.io/kubectl => k8s.io/kubectl v0.32.2
398+
k8s.io/metrics => k8s.io/metrics v0.32.2
399+
k8s.io/utils => k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
400400
)
401401

402402
exclude (

0 commit comments

Comments
 (0)