Skip to content

chore: Bump k8s to 1.34 && go to 1.25 #601

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.

Sign up for GitHub

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

Merged
soloio-bulldozer merged 4 commits into from
Dec 12, 2025
Merged

chore: Bump k8s to 1.34 && go to 1.25 #601

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
6211eba
chore: Bump go to 1.25
davidjumani Dec 11, 2025
58552eb
bump protoc-gen-openapi
davidjumani Dec 12, 2025
70a4742
codegen
davidjumani Dec 12, 2025
509b4f8
fix test
davidjumani Dec 12, 2025
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 Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ export PATH:=$(GOBIN):$(PATH)
install-go-tools: mod-download
mkdir -p $(DEPSGOBIN)
go install github.com/golang/protobuf/protoc-gen-go@v1.5.2
go install github.com/solo-io/protoc-gen-openapi@v0.2.4
go install github.com/solo-io/protoc-gen-openapi@v0.4.0
go install github.com/pseudomuto/protoc-gen-doc/cmd/protoc-gen-doc
go install github.com/solo-io/protoc-gen-ext@v0.0.18
go install github.com/golang/mock/mockgen@v1.4.4
Expand Down
38 changes: 38 additions & 0 deletions changelog/v0.45.0/bump-k8s.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
changelog:
- type: BREAKING_CHANGE
description: >
Bump dependencies to support Kubernetes 1.34
issueLink: https://github.com/solo-io/solo-projects/issues/8681
resolvesIssue: false
- type: DEPENDENCY_BUMP
dependencyOwner: k8s.io
dependencyRepo: api
dependencyTag: v0.34.2
- type: DEPENDENCY_BUMP
dependencyOwner: k8s.io
dependencyRepo: apimachinery
dependencyTag: v0.34.2
- type: DEPENDENCY_BUMP
dependencyOwner: k8s.io
dependencyRepo: apiextensions-apiserver
dependencyTag: v0.34.2
- type: DEPENDENCY_BUMP
dependencyOwner: k8s.io
dependencyRepo: client-go
dependencyTag: v0.34.2
- type: DEPENDENCY_BUMP
dependencyOwner: solo-io
dependencyRepo: go-utils
dependencyTag: v0.28.5
- type: DEPENDENCY_BUMP
dependencyOwner: golang
dependencyRepo: go
dependencyTag: v1.25.5
- type: DEPENDENCY_BUMP
dependencyOwner: solo.io
dependencyRepo: go-utils
dependencyTag: v0.29.0
- type: DEPENDENCY_BUMP
dependencyOwner: solo.io
dependencyRepo: k8a-utils
dependencyTag: v0.12.0
32 changes: 17 additions & 15 deletions ci/oss_compliance/osa_provided.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,29 +3,29 @@ Name|Version|License
[perks/quantile](https://github.com/beorn7/perks)|v1.0.1|MIT License
[xxhash/v2](https://github.com/cespare/xxhash)|v2.3.0|MIT License
[go-spew/spew](https://github.com/davecgh/go-spew)|v1.1.2-0.20180830191138-d8f796af33cc|ISC License
[v3/log](https://github.com/emicklei/go-restful)|v3.11.0|MIT License
[v3/log](https://github.com/emicklei/go-restful)|v3.12.2|MIT License
[internal/json](https://github.com/evanphx/json-patch)|v5.9.11|BSD 3-clause "New" or "Revised" License
[fsnotify/fsnotify](https://github.com/fsnotify/fsnotify)|v1.7.0|BSD 3-clause "New" or "Revised" License
[cbor/v2](https://github.com/fxamacker/cbor)|v2.7.0|MIT License
[fsnotify/internal](https://github.com/fsnotify/fsnotify)|v1.9.0|BSD 3-clause "New" or "Revised" License
[cbor/v2](https://github.com/fxamacker/cbor)|v2.9.0|MIT License
[go-logr/logr](https://github.com/go-logr/logr)|v1.4.2|Apache License 2.0
[go-openapi/jsonpointer](https://github.com/go-openapi/jsonpointer)|v0.21.0|Apache License 2.0
[jsonreference/internal](https://github.com/go-openapi/jsonreference)|v0.20.2|Apache License 2.0
[go-openapi/swag](https://github.com/go-openapi/swag)|v0.23.0|Apache License 2.0
[gogo/protobuf](https://github.com/gogo/protobuf)|v1.3.2|BSD 3-clause "New" or "Revised" License
[protobuf/proto](https://github.com/golang/protobuf)|v1.5.4|BSD 3-clause "New" or "Revised" License
[google/btree](https://github.com/google/btree)|v1.1.3|Apache License 2.0
[google/gnostic-models](https://github.com/google/gnostic-models)|v0.6.9|Apache License 2.0
[cmp/internal](https://github.com/google/go-cmp)|v0.7.0|BSD 3-clause "New" or "Revised" License
[google/gnostic-models](https://github.com/google/gnostic-models)|v0.7.0|Apache License 2.0
[google/uuid](https://github.com/google/uuid)|v1.6.0|BSD 3-clause "New" or "Revised" License
[pyroscope-go/godeltaprof](https://github.com/grafana/pyroscope-go)|v0.1.8|Apache License 2.0
[josharian/intern](https://github.com/josharian/intern)|v1.0.0|MIT License
[json-iterator/go](https://github.com/json-iterator/go)|v1.1.12|MIT License
[klauspost/compress](https://github.com/klauspost/compress)|v1.18.0|Apache License 2.0
[mailru/easyjson](https://github.com/mailru/easyjson)|v0.7.7|MIT License
[modern-go/concurrent](https://github.com/modern-go/concurrent)|v0.0.0-20180306012644-bacd9c7ef1dd|Apache License 2.0
[modern-go/reflect2](https://github.com/modern-go/reflect2)|v1.0.2|Apache License 2.0
[modern-go/reflect2](https://github.com/modern-go/reflect2)|v1.0.3-0.20250322232337-35a7c28c31ee|Apache License 2.0
[munnerz/goautoneg](https://github.com/munnerz/goautoneg)|v0.0.0-20191010083416-a7dc8b61c822|BSD 3-clause "New" or "Revised" License
[pkg/errors](https://github.com/pkg/errors)|v0.9.1|BSD 2-clause "Simplified" License
[go-difflib/difflib](https://github.com/pmezard/go-difflib)|v1.0.1-0.20181226105442-5d4384ee4fb2|BSD 3-clause "New" or "Revised" License
[prometheus/client_golang](https://github.com/prometheus/client_golang)|v1.22.0|Apache License 2.0
[client_model/go](https://github.com/prometheus/client_model)|v0.6.1|Apache License 2.0
[prometheus/common](https://github.com/prometheus/common)|v0.62.0|Apache License 2.0
Expand All @@ -34,6 +34,8 @@ Name|Version|License
[x448/float16](https://github.com/x448/float16)|v0.8.4|MIT License
[go.uber.org/multierr](https://go.uber.org/multierr)|v1.11.0|MIT License
[go.uber.org/zap](https://go.uber.org/zap)|v1.27.0|MIT License
[yaml/v2](https://go.yaml.in/yaml/v2)|v2.4.2|Apache License 2.0
[yaml/v3](https://go.yaml.in/yaml/v3)|v3.0.4|MIT License
[exp/maps](https://golang.org/x/exp/maps)|v0.0.0-20240719175910-8a7402abbf56|BSD 3-clause "New" or "Revised" License
[x/net](https://golang.org/x/net)|v0.38.0|BSD 3-clause "New" or "Revised" License
[oauth2/internal](https://golang.org/x/oauth2/internal)|v0.27.0|BSD 3-clause "New" or "Revised" License
Expand All @@ -46,17 +48,17 @@ Name|Version|License
[gopkg.in/inf.v0](https://gopkg.in/inf.v0)|v0.9.1|BSD 3-clause "New" or "Revised" License
[gopkg.in/yaml.v2](https://gopkg.in/yaml.v2)|v2.4.0|Apache License 2.0
[gopkg.in/yaml.v3](https://gopkg.in/yaml.v3)|v3.0.1|MIT License
[k8s.io/api](https://k8s.io/api)|v0.33.1|Apache License 2.0
[k8s.io/apimachinery](https://k8s.io/apimachinery)|v0.33.1|Apache License 2.0
[k8s.io/client-go](https://k8s.io/client-go)|v0.33.1|Apache License 2.0
[k8s.io/api](https://k8s.io/api)|v0.34.2|Apache License 2.0
[k8s.io/apimachinery](https://k8s.io/apimachinery)|v0.34.2|Apache License 2.0
[k8s.io/client-go](https://k8s.io/client-go)|v0.34.2|Apache License 2.0
[v2/internal](https://k8s.io/klog/v2/internal)|v2.130.1|Apache License 2.0
[kube-openapi/pkg](https://k8s.io/kube-openapi/pkg)|v0.0.0-20250318190949-c8a335a9a2ff|Apache License 2.0
[k8s.io/utils](https://k8s.io/utils)|v0.0.0-20241104100929-3ea5e8cea738|Apache License 2.0
[controller-runtime/pkg](https://sigs.k8s.io/controller-runtime/pkg)|v0.21.0|Apache License 2.0
[encoding/json](https://sigs.k8s.io/json/internal/golang/encoding/json)|v0.0.0-20241010143419-9aa6b5e7a4b3|Apache License 2.0
[kube-openapi/pkg](https://k8s.io/kube-openapi/pkg)|v0.0.0-20250710124328-f3f2b991d03b|Apache License 2.0
[k8s.io/utils](https://k8s.io/utils)|v0.0.0-20250604170112-4c0f3b243397|Apache License 2.0
[controller-runtime/pkg](https://sigs.k8s.io/controller-runtime/pkg)|v0.22.4|Apache License 2.0
[encoding/json](https://sigs.k8s.io/json/internal/golang/encoding/json)|v0.0.0-20241014173422-cfa47c3a1cc8|Apache License 2.0
[randfill/bytesource](https://sigs.k8s.io/randfill/bytesource)|v1.0.0|Apache License 2.0
[structured-merge-diff/v4](https://sigs.k8s.io/structured-merge-diff/v4)|v4.6.0|Apache License 2.0
[yaml/goyaml.v2](https://sigs.k8s.io/yaml/goyaml.v2)|v1.4.0|Apache License 2.0
[structured-merge-diff/v6](https://sigs.k8s.io/structured-merge-diff/v6)|v6.3.0|Apache License 2.0
[sigs.k8s.io/yaml](https://sigs.k8s.io/yaml)|v1.6.0|MIT License
[cmd/goimports](https://golang.org/x/tools/cmd/goimports)|latest|MIT License
[gogo/protobuf](https://github.com/gogo/protobuf)|latest|MIT License
[envoyproxy/envoy](https://github.com/envoyproxy/envoy)|latest|Apache License 2.0
Expand Down
2 changes: 1 addition & 1 deletion codegen/test/chart/values.schema.json
View file
Open in desktop

Large diffs are not rendered by default.

56 changes: 30 additions & 26 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/solo-io/skv2

go 1.24.6
go 1.25.5

require (
github.com/BurntSushi/toml v1.4.0
Expand All @@ -9,15 +9,15 @@ require (
github.com/avast/retry-go/v4 v4.3.3
github.com/envoyproxy/protoc-gen-validate v0.9.1
github.com/gertd/go-pluralize v0.1.1
github.com/getkin/kin-openapi v0.123.0
github.com/getkin/kin-openapi v0.131.0
github.com/ghodss/yaml v1.0.0
github.com/go-logr/logr v1.4.2
github.com/go-logr/zapr v1.3.0
github.com/go-test/deep v1.0.8
github.com/gobuffalo/packr v1.30.1
github.com/golang/mock v1.6.0
github.com/golang/protobuf v1.5.4
github.com/google/gnostic-models v0.6.9
github.com/google/gnostic-models v0.7.0
github.com/google/go-cmp v0.7.0
github.com/grafana/pyroscope-go/godeltaprof v0.1.8
github.com/hashicorp/go-multierror v1.1.1
Expand All @@ -39,26 +39,26 @@ require (
github.com/solo-io/anyvendor v0.2.0
github.com/solo-io/cue v0.4.7
github.com/solo-io/go-list-licenses v0.0.4
github.com/solo-io/go-utils v0.28.6
github.com/solo-io/k8s-utils v0.11.1
github.com/solo-io/go-utils v0.29.0
github.com/solo-io/k8s-utils v0.12.0
github.com/solo-io/protoc-gen-ext v0.1.0
github.com/solo-io/protoc-gen-openapi v0.3.0
github.com/spf13/pflag v1.0.5
github.com/solo-io/protoc-gen-openapi v0.4.0
github.com/spf13/pflag v1.0.6
go.uber.org/zap v1.27.0
golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
golang.org/x/tools v0.26.0
google.golang.org/protobuf v1.36.5
gopkg.in/yaml.v2 v2.4.0
gopkg.in/yaml.v3 v3.0.1
k8s.io/api v0.33.1
k8s.io/apiextensions-apiserver v0.33.1
k8s.io/apimachinery v0.33.1
k8s.io/client-go v0.33.1
k8s.io/code-generator v0.33.1
k8s.io/api v0.34.2
k8s.io/apiextensions-apiserver v0.34.2
k8s.io/apimachinery v0.34.2
k8s.io/client-go v0.34.2
k8s.io/code-generator v0.34.2
k8s.io/klog/v2 v2.130.1
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738
sigs.k8s.io/controller-runtime v0.21.0
sigs.k8s.io/yaml v1.4.0
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
sigs.k8s.io/controller-runtime v0.22.4
sigs.k8s.io/yaml v1.6.0
)

require (
Expand All @@ -72,12 +72,12 @@ require (
github.com/cespare/xxhash/v2 v2.3.0 // indirect
github.com/cockroachdb/apd/v2 v2.0.1 // indirect
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/emicklei/go-restful/v3 v3.12.2 // indirect
github.com/emicklei/proto v1.6.15 // indirect
github.com/evanphx/json-patch/v5 v5.9.11 // indirect
github.com/fgrosse/zaptest v1.1.0 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
github.com/fsnotify/fsnotify v1.9.0 // indirect
github.com/fxamacker/cbor/v2 v2.9.0 // indirect
github.com/go-openapi/jsonpointer v0.21.0 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.23.0 // indirect
Expand All @@ -93,7 +93,6 @@ require (
github.com/huandu/xstrings v1.5.0 // indirect
github.com/imdario/mergo v0.3.13 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/invopop/yaml v0.2.0 // indirect
github.com/joho/godotenv v1.3.0 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
Expand All @@ -107,22 +106,27 @@ require (
github.com/mitchellh/copystructure v1.2.0 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
github.com/modern-go/reflect2 v1.0.2 // indirect
github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee // indirect
github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826 // indirect
github.com/mpvl/unique v0.0.0-20150818121801-cbe035fff7de // indirect
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/mwitkow/go-proto-validators v0.0.0-20180403085117-0950a7990007 // indirect
github.com/oasdiff/yaml v0.0.0-20250309154309-f31be36b4037 // indirect
github.com/oasdiff/yaml3 v0.0.0-20250309153720-d2182401db90 // indirect
github.com/perimeterx/marshmallow v1.1.5 // indirect
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
github.com/prometheus/client_model v0.6.1 // indirect
github.com/prometheus/common v0.62.0 // indirect
github.com/prometheus/procfs v0.15.1 // indirect
github.com/pseudomuto/protokit v0.2.0 // indirect
github.com/shopspring/decimal v1.4.0 // indirect
github.com/spf13/afero v1.9.2 // indirect
github.com/spf13/cast v1.7.0 // indirect
github.com/spf13/cobra v1.8.1 // indirect
github.com/spf13/cobra v1.9.1 // indirect
github.com/x448/float16 v0.8.4 // indirect
go.uber.org/multierr v1.11.0 // indirect
go.yaml.in/yaml/v2 v2.4.2 // indirect
go.yaml.in/yaml/v3 v3.0.4 // indirect
golang.org/x/crypto v0.36.0 // indirect
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
golang.org/x/mod v0.21.0 // indirect
Expand All @@ -135,15 +139,15 @@ require (
golang.org/x/time v0.9.0 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20241209162323-e6fa225c2576 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20250303144028-a0af3efb3deb // indirect
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
k8s.io/gengo/v2 v2.0.0-20250207200755-1244d31929d7 // indirect
k8s.io/kube-openapi v0.0.0-20250318190949-c8a335a9a2ff // indirect
k8s.io/gengo/v2 v2.0.0-20250604051438-85fd79dbfd9f // indirect
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
sigs.k8s.io/controller-tools v0.14.0 // indirect
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
sigs.k8s.io/randfill v1.0.0 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.6.0 // indirect
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
)

replace (
Expand Down
Loading