Skip to content

Commit 45d037f

Browse files
davidjumanidavidjumani
authored
chore: bump k8s to 1.32 (#586)
* chore: bump k8s to 1.32 * add changelog * use release
1 parent 6b43ed3 commit 45d037f

File tree

6 files changed

+268
-116
lines changed

6 files changed

+268
-116
lines changed

‎.github/workflows/pull_request.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ jobs:
2626
runs-on: ubuntu-22.04
2727
steps:
2828
- uses: actions/checkout@v3
29-
- name: Set up Go 1.22
29+
- name: Set up Go
3030
uses: actions/setup-go@v4
3131
with:
3232
go-version-file: "go.mod"

‎changelog/v0.42.0/bump-k8s-132.yaml

+54
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
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: sigs.k8s.io
25+
dependencyRepo: code-generator
26+
dependencyTag: v0.32.2
27+
- type: DEPENDENCY_BUMP
28+
dependencyOwner: sigs.k8s.io
29+
dependencyRepo: controller-runtime
30+
dependencyTag: v0.20.1
31+
- type: DEPENDENCY_BUMP
32+
dependencyOwner: onsi
33+
dependencyRepo: ginkgo/v2
34+
dependencyTag: v2.21.0
35+
- type: DEPENDENCY_BUMP
36+
dependencyOwner: onsi
37+
dependencyRepo: gomega
38+
dependencyTag: v1.35.1
39+
- type: DEPENDENCY_BUMP
40+
dependencyOwner: go.uber.org
41+
dependencyRepo: zap
42+
dependencyTag: v1.27.0
43+
- type: DEPENDENCY_BUMP
44+
dependencyOwner: google
45+
dependencyRepo: protobuf
46+
dependencyTag: v1.35.1
47+
- type: DEPENDENCY_BUMP
48+
dependencyOwner: solo-io
49+
dependencyRepo: go-utils
50+
dependencyTag: v0.27.4
51+
- type: DEPENDENCY_BUMP
52+
dependencyOwner: solo-io
53+
dependencyRepo: k8s-utils
54+
dependencyTag: v0.9.0

‎ci/oss_compliance/osa_provided.md

+20-19
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,12 @@ Name|Version|License
88
[fsnotify/fsnotify](https://github.com/fsnotify/fsnotify)|v1.7.0|BSD 3-clause "New" or "Revised" License
99
[cbor/v2](https://github.com/fxamacker/cbor)|v2.7.0|MIT License
1010
[go-logr/logr](https://github.com/go-logr/logr)|v1.4.2|Apache License 2.0
11-
[go-openapi/jsonpointer](https://github.com/go-openapi/jsonpointer)|v0.20.2|Apache License 2.0
11+
[go-openapi/jsonpointer](https://github.com/go-openapi/jsonpointer)|v0.21.0|Apache License 2.0
1212
[jsonreference/internal](https://github.com/go-openapi/jsonreference)|v0.20.2|Apache License 2.0
13-
[go-openapi/swag](https://github.com/go-openapi/swag)|v0.22.8|Apache License 2.0
13+
[go-openapi/swag](https://github.com/go-openapi/swag)|v0.23.0|Apache License 2.0
1414
[gogo/protobuf](https://github.com/gogo/protobuf)|v1.3.2|BSD 3-clause "New" or "Revised" License
15-
[groupcache/lru](https://github.com/golang/groupcache)|v0.0.0-20210331224755-41bb18bfe9da|Apache License 2.0
1615
[golang/protobuf](https://github.com/golang/protobuf)|v1.5.4|BSD 3-clause "New" or "Revised" License
16+
[google/btree](https://github.com/google/btree)|v1.1.3|Apache License 2.0
1717
[google/gnostic-models](https://github.com/google/gnostic-models)|v0.6.8|Apache License 2.0
1818
[cmp/internal](https://github.com/google/go-cmp)|v0.6.0|BSD 3-clause "New" or "Revised" License
1919
[gofuzz/bytesource](https://github.com/google/gofuzz)|v1.2.0|Apache License 2.0
@@ -34,27 +34,28 @@ Name|Version|License
3434
[rotisserie/eris](https://github.com/rotisserie/eris)|v0.1.1|MIT License
3535
[x448/float16](https://github.com/x448/float16)|v0.8.4|MIT License
3636
[go.uber.org/multierr](https://go.uber.org/multierr)|v1.11.0|MIT License
37-
[go.uber.org/zap](https://go.uber.org/zap)|v1.26.0|MIT License
38-
[exp/maps](https://golang.org/x/exp/maps)|v0.0.0-20230515195305-f3d0a9c9a5cc|BSD 3-clause "New" or "Revised" License
39-
[x/net](https://golang.org/x/net)|v0.26.0|BSD 3-clause "New" or "Revised" License
40-
[oauth2/internal](https://golang.org/x/oauth2/internal)|v0.21.0|BSD 3-clause "New" or "Revised" License
41-
[x/term](https://golang.org/x/term)|v0.23.0|BSD 3-clause "New" or "Revised" License
42-
[x/text](https://golang.org/x/text)|v0.17.0|BSD 3-clause "New" or "Revised" License
43-
[time/rate](https://golang.org/x/time/rate)|v0.3.0|BSD 3-clause "New" or "Revised" License
37+
[go.uber.org/zap](https://go.uber.org/zap)|v1.27.0|MIT License
38+
[exp/maps](https://golang.org/x/exp/maps)|v0.0.0-20240719175910-8a7402abbf56|BSD 3-clause "New" or "Revised" License
39+
[x/net](https://golang.org/x/net)|v0.30.0|BSD 3-clause "New" or "Revised" License
40+
[oauth2/internal](https://golang.org/x/oauth2/internal)|v0.23.0|BSD 3-clause "New" or "Revised" License
41+
[x/term](https://golang.org/x/term)|v0.25.0|BSD 3-clause "New" or "Revised" License
42+
[x/text](https://golang.org/x/text)|v0.19.0|BSD 3-clause "New" or "Revised" License
43+
[time/rate](https://golang.org/x/time/rate)|v0.7.0|BSD 3-clause "New" or "Revised" License
4444
[jsonpatch/v2](https://gomodules.xyz/jsonpatch/v2)|v2.4.0|Apache License 2.0
45-
[google.golang.org/protobuf](https://google.golang.org/protobuf)|v1.34.2|BSD 3-clause "New" or "Revised" License
45+
[google.golang.org/protobuf](https://google.golang.org/protobuf)|v1.35.1|BSD 3-clause "New" or "Revised" License
46+
[evanphx/json-patch.v4](https://gopkg.in/evanphx/json-patch.v4)|v4.12.0|BSD 3-clause "New" or "Revised" License
4647
[gopkg.in/inf.v0](https://gopkg.in/inf.v0)|v0.9.1|BSD 3-clause "New" or "Revised" License
4748
[gopkg.in/yaml.v2](https://gopkg.in/yaml.v2)|v2.4.0|Apache License 2.0
4849
[gopkg.in/yaml.v3](https://gopkg.in/yaml.v3)|v3.0.1|MIT License
49-
[k8s.io/api](https://k8s.io/api)|v0.31.0|Apache License 2.0
50-
[k8s.io/apimachinery](https://k8s.io/apimachinery)|v0.31.0|Apache License 2.0
51-
[k8s.io/client-go](https://k8s.io/client-go)|v0.31.0|Apache License 2.0
50+
[k8s.io/api](https://k8s.io/api)|v0.32.2|Apache License 2.0
51+
[k8s.io/apimachinery](https://k8s.io/apimachinery)|v0.32.2|Apache License 2.0
52+
[k8s.io/client-go](https://k8s.io/client-go)|v0.32.2|Apache License 2.0
5253
[v2/internal](https://k8s.io/klog/v2/internal)|v2.130.1|Apache License 2.0
53-
[kube-openapi/pkg](https://k8s.io/kube-openapi/pkg)|v0.0.0-20240228011516-70dd3763d340|Apache License 2.0
54-
[k8s.io/utils](https://k8s.io/utils)|v0.0.0-20240711033017-18e509b52bc8|Apache License 2.0
55-
[controller-runtime/pkg](https://sigs.k8s.io/controller-runtime/pkg)|v0.19.0|Apache License 2.0
56-
[encoding/json](https://sigs.k8s.io/json/internal/golang/encoding/json)|v0.0.0-20221116044647-bc3834ca7abd|Apache License 2.0
57-
[structured-merge-diff/v4](https://sigs.k8s.io/structured-merge-diff/v4)|v4.4.1|Apache License 2.0
54+
[kube-openapi/pkg](https://k8s.io/kube-openapi/pkg)|v0.0.0-20241105132330-32ad38e42d3f|Apache License 2.0
55+
[k8s.io/utils](https://k8s.io/utils)|v0.0.0-20241104100929-3ea5e8cea738|Apache License 2.0
56+
[controller-runtime/pkg](https://sigs.k8s.io/controller-runtime/pkg)|v0.20.1|Apache License 2.0
57+
[encoding/json](https://sigs.k8s.io/json/internal/golang/encoding/json)|v0.0.0-20241010143419-9aa6b5e7a4b3|Apache License 2.0
58+
[structured-merge-diff/v4](https://sigs.k8s.io/structured-merge-diff/v4)|v4.4.2|Apache License 2.0
5859
[yaml/goyaml.v2](https://sigs.k8s.io/yaml/goyaml.v2)|v1.4.0|Apache License 2.0
5960
[cmd/goimports](https://golang.org/x/tools/cmd/goimports)|latest|MIT License
6061
[gogo/protobuf](https://github.com/gogo/protobuf)|latest|MIT License

‎codegen/test/chart/values.schema.json

+97
Original file line numberDiff line numberDiff line change
@@ -1061,6 +1061,16 @@
10611061
"type": "null"
10621062
}
10631063
]
1064+
},
1065+
"seLinuxChangePolicy": {
1066+
"anyOf": [
1067+
{
1068+
"type": "string"
1069+
},
1070+
{
1071+
"type": "null"
1072+
}
1073+
]
10641074
}
10651075
},
10661076
"type": "object"
@@ -7495,6 +7505,16 @@
74957505
"type": "null"
74967506
}
74977507
]
7508+
},
7509+
"seLinuxChangePolicy": {
7510+
"anyOf": [
7511+
{
7512+
"type": "string"
7513+
},
7514+
{
7515+
"type": "null"
7516+
}
7517+
]
74987518
}
74997519
},
75007520
"type": "object"
@@ -8932,6 +8952,83 @@
89328952
"type": "null"
89338953
}
89348954
]
8955+
},
8956+
"resources": {
8957+
"anyOf": [
8958+
{
8959+
"properties": {
8960+
"limits": {
8961+
"anyOf": [
8962+
{
8963+
"patternProperties": {
8964+
".*": {
8965+
"anyOf": [
8966+
{
8967+
"type": "string"
8968+
},
8969+
{
8970+
"type": "number"
8971+
}
8972+
]
8973+
}
8974+
},
8975+
"type": "object"
8976+
},
8977+
{
8978+
"type": "null"
8979+
}
8980+
]
8981+
},
8982+
"requests": {
8983+
"anyOf": [
8984+
{
8985+
"patternProperties": {
8986+
".*": {
8987+
"anyOf": [
8988+
{
8989+
"type": "string"
8990+
},
8991+
{
8992+
"type": "number"
8993+
}
8994+
]
8995+
}
8996+
},
8997+
"type": "object"
8998+
},
8999+
{
9000+
"type": "null"
9001+
}
9002+
]
9003+
},
9004+
"claims": {
9005+
"anyOf": [
9006+
{
9007+
"items": {
9008+
"properties": {
9009+
"name": {
9010+
"type": "string"
9011+
},
9012+
"request": {
9013+
"type": "string"
9014+
}
9015+
},
9016+
"type": "object"
9017+
},
9018+
"type": "array"
9019+
},
9020+
{
9021+
"type": "null"
9022+
}
9023+
]
9024+
}
9025+
},
9026+
"type": "object"
9027+
},
9028+
{
9029+
"type": "null"
9030+
}
9031+
]
89359032
}
89369033
},
89379034
"type": "object"

‎go.mod

+32-32
Original file line numberDiff line numberDiff line change
@@ -27,8 +27,8 @@ require (
2727
github.com/lithammer/dedent v1.1.0
2828
github.com/mitchellh/go-homedir v1.1.0
2929
github.com/mitchellh/hashstructure v1.0.0
30-
github.com/onsi/ginkgo/v2 v2.19.0
31-
github.com/onsi/gomega v1.33.1
30+
github.com/onsi/ginkgo/v2 v2.21.0
31+
github.com/onsi/gomega v1.35.1
3232
github.com/pborman/uuid v1.2.0
3333
github.com/pkg/errors v0.9.1
3434
github.com/prometheus/client_golang v1.19.1
@@ -39,25 +39,25 @@ require (
3939
github.com/solo-io/anyvendor v0.0.4
4040
github.com/solo-io/cue v0.4.7
4141
github.com/solo-io/go-list-licenses v0.0.4
42-
github.com/solo-io/go-utils v0.26.0
43-
github.com/solo-io/k8s-utils v0.8.0
42+
github.com/solo-io/go-utils v0.27.4
43+
github.com/solo-io/k8s-utils v0.9.0
4444
github.com/solo-io/protoc-gen-ext v0.0.20
4545
github.com/solo-io/protoc-gen-openapi v0.2.5
4646
github.com/spf13/pflag v1.0.5
47-
go.uber.org/zap v1.26.0
48-
golang.org/x/exp v0.0.0-20230515195305-f3d0a9c9a5cc
49-
golang.org/x/tools v0.22.0
50-
google.golang.org/protobuf v1.34.2
47+
go.uber.org/zap v1.27.0
48+
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
49+
golang.org/x/tools v0.26.0
50+
google.golang.org/protobuf v1.35.1
5151
gopkg.in/yaml.v2 v2.4.0
5252
gopkg.in/yaml.v3 v3.0.1
53-
k8s.io/api v0.31.0
54-
k8s.io/apiextensions-apiserver v0.31.0
55-
k8s.io/apimachinery v0.31.0
56-
k8s.io/client-go v0.31.0
57-
k8s.io/code-generator v0.31.0
53+
k8s.io/api v0.32.2
54+
k8s.io/apiextensions-apiserver v0.32.2
55+
k8s.io/apimachinery v0.32.2
56+
k8s.io/client-go v0.32.2
57+
k8s.io/code-generator v0.32.2
5858
k8s.io/klog/v2 v2.130.1
59-
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8
60-
sigs.k8s.io/controller-runtime v0.19.0
59+
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
60+
sigs.k8s.io/controller-runtime v0.20.1
6161
sigs.k8s.io/yaml v1.4.0
6262
)
6363

@@ -77,17 +77,17 @@ require (
7777
github.com/fgrosse/zaptest v1.1.0 // indirect
7878
github.com/fsnotify/fsnotify v1.7.0 // indirect
7979
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
80-
github.com/go-openapi/jsonpointer v0.20.2 // indirect
80+
github.com/go-openapi/jsonpointer v0.21.0 // indirect
8181
github.com/go-openapi/jsonreference v0.20.2 // indirect
82-
github.com/go-openapi/swag v0.22.8 // indirect
82+
github.com/go-openapi/swag v0.23.0 // indirect
8383
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
8484
github.com/gobuffalo/envy v1.8.1 // indirect
8585
github.com/gobuffalo/packd v0.3.0 // indirect
8686
github.com/gogo/protobuf v1.3.2 // indirect
8787
github.com/golang/glog v1.0.0 // indirect
88-
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
88+
github.com/google/btree v1.1.3 // indirect
8989
github.com/google/gofuzz v1.2.0 // indirect
90-
github.com/google/pprof v0.0.0-20240525223248-4bfdf5a9a2af // indirect
90+
github.com/google/pprof v0.0.0-20241029153458-d1b30febd7db // indirect
9191
github.com/google/uuid v1.6.0 // indirect
9292
github.com/hashicorp/errwrap v1.1.0 // indirect
9393
github.com/huandu/xstrings v1.4.0 // indirect
@@ -123,26 +123,26 @@ require (
123123
github.com/spf13/cobra v1.8.1 // indirect
124124
github.com/x448/float16 v0.8.4 // indirect
125125
go.uber.org/multierr v1.11.0 // indirect
126-
golang.org/x/crypto v0.26.0 // indirect
126+
golang.org/x/crypto v0.28.0 // indirect
127127
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
128-
golang.org/x/mod v0.20.0 // indirect
129-
golang.org/x/net v0.26.0 // indirect
130-
golang.org/x/oauth2 v0.21.0 // indirect
128+
golang.org/x/mod v0.21.0 // indirect
129+
golang.org/x/net v0.30.0 // indirect
130+
golang.org/x/oauth2 v0.23.0 // indirect
131131
golang.org/x/sync v0.8.0 // indirect
132-
golang.org/x/sys v0.24.0 // indirect
133-
golang.org/x/term v0.23.0 // indirect
134-
golang.org/x/text v0.17.0 // indirect
135-
golang.org/x/time v0.3.0 // indirect
132+
golang.org/x/sys v0.26.0 // indirect
133+
golang.org/x/term v0.25.0 // indirect
134+
golang.org/x/text v0.19.0 // indirect
135+
golang.org/x/time v0.7.0 // indirect
136136
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
137137
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
138-
google.golang.org/genproto/googleapis/api v0.0.0-20240528184218-531527333157 // indirect
138+
google.golang.org/genproto/googleapis/api v0.0.0-20240826202546-f6391c0de4c7 // indirect
139139
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
140140
gopkg.in/inf.v0 v0.9.1 // indirect
141-
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
142-
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
141+
k8s.io/gengo/v2 v2.0.0-20240911193312-2b36238f13e9 // indirect
142+
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
143143
sigs.k8s.io/controller-tools v0.14.0 // indirect
144-
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
145-
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
144+
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
145+
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
146146
)
147147

148148
replace (

0 commit comments

Comments
 (0)