Skip to content

Commit

Permalink
chore: update k8s dependencies (#559)
Browse files Browse the repository at this point in the history
* chore: update k8s dependencies

* cl

* fix cl

* code gen

* cl
  • Loading branch information
puertomontt authored May 7, 2024
1 parent a8c19c8 commit 3e58001
Show file tree
Hide file tree
Showing 4 changed files with 101 additions and 81 deletions.
28 changes: 28 additions & 0 deletions changelog/v0.39.0/bump-k8s-v0.29.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
changelog:
- type: BREAKING_CHANGE
description: "Bump dependencies to support Kubernetes 1.29"
issueLink: https://github.com/solo-io/gloo-mesh-enterprise/issues/14822
- type: DEPENDENCY_BUMP
dependencyOwner: sigs.k8s.io
dependencyRepo: controller-runtime
dependencyTag: v0.17.4
- type: DEPENDENCY_BUMP
dependencyOwner: k8s.io
dependencyRepo: api
dependencyTag: v0.29.2
description: pulled in by sigs.k8s.io/sontroller-runtime
- type: DEPENDENCY_BUMP
dependencyOwner: k8s.io
dependencyRepo: apiextensions-apiserver
dependencyTag: v0.29.2
description: pulled in by sigs.k8s.io/sontroller-runtime
- type: DEPENDENCY_BUMP
dependencyOwner: k8s.io
dependencyRepo: client-go
dependencyTag: v0.29.2
description: pulled in by sigs.k8s.io/sontroller-runtime
- type: DEPENDENCY_BUMP
dependencyOwner: k8s.io
dependencyRepo: code-generator
dependencyTag: v0.29.2
description: pulled in by sigs.k8s.io/sontroller-runtime
28 changes: 14 additions & 14 deletions ci/oss_compliance/osa_provided.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,9 @@ Name|Version|License
[xxhash/v2](https://github.com/cespare/xxhash)|v2.2.0|MIT License
[go-spew/spew](https://github.com/davecgh/go-spew)|v1.1.1|ISC License
[v3/log](https://github.com/emicklei/go-restful)|v3.11.0|MIT License
[json-patch/v5](https://github.com/evanphx/json-patch)|v5.6.0|BSD 3-clause "New" or "Revised" License
[internal/json](https://github.com/evanphx/json-patch)|v5.8.0|BSD 3-clause "New" or "Revised" License
[fsnotify/fsnotify](https://github.com/fsnotify/fsnotify)|v1.7.0|BSD 3-clause "New" or "Revised" License
[logr/slogr](https://github.com/go-logr/logr)|v1.3.0|Apache License 2.0
[logr/slogr](https://github.com/go-logr/logr)|v1.4.1|Apache License 2.0
[go-openapi/jsonpointer](https://github.com/go-openapi/jsonpointer)|v0.20.2|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.22.8|Apache License 2.0
Expand All @@ -22,21 +22,21 @@ Name|Version|License
[json-iterator/go](https://github.com/json-iterator/go)|v1.1.12|MIT License
[klauspost/compress](https://github.com/klauspost/compress)|v1.17.3|Apache License 2.0
[mailru/easyjson](https://github.com/mailru/easyjson)|v0.7.7|MIT License
[golang_protobuf_extensions/pbutil](https://github.com/matttproud/golang_protobuf_extensions)|v1.0.4|Apache License 2.0
[v2/pbutil](https://github.com/matttproud/golang_protobuf_extensions)|v2.0.0|Apache License 2.0
[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
[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
[client_golang/prometheus](https://github.com/prometheus/client_golang)|v1.16.0|Apache License 2.0
[client_model/go](https://github.com/prometheus/client_model)|v0.4.0|Apache License 2.0
[prometheus/common](https://github.com/prometheus/common)|v0.44.0|Apache License 2.0
[procfs/internal](https://github.com/prometheus/procfs)|v0.10.1|Apache License 2.0
[client_golang/prometheus](https://github.com/prometheus/client_golang)|v1.18.0|Apache License 2.0
[client_model/go](https://github.com/prometheus/client_model)|v0.5.0|Apache License 2.0
[prometheus/common](https://github.com/prometheus/common)|v0.45.0|Apache License 2.0
[procfs/internal](https://github.com/prometheus/procfs)|v0.12.0|Apache License 2.0
[rotisserie/eris](https://github.com/rotisserie/eris)|v0.1.1|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.25.0|MIT License
[go.uber.org/zap](https://go.uber.org/zap)|v1.26.0|MIT License
[exp/maps](https://golang.org/x/exp/maps)|v0.0.0-20220921164117-439092de6870|BSD 3-clause "New" or "Revised" License
[x/net](https://golang.org/x/net)|v0.19.0|BSD 3-clause "New" or "Revised" License
[oauth2/internal](https://golang.org/x/oauth2/internal)|v0.10.0|BSD 3-clause "New" or "Revised" License
[oauth2/internal](https://golang.org/x/oauth2/internal)|v0.12.0|BSD 3-clause "New" or "Revised" License
[x/term](https://golang.org/x/term)|v0.15.0|BSD 3-clause "New" or "Revised" License
[x/text](https://golang.org/x/text)|v0.14.0|BSD 3-clause "New" or "Revised" License
[time/rate](https://golang.org/x/time/rate)|v0.3.0|BSD 3-clause "New" or "Revised" License
Expand All @@ -45,14 +45,14 @@ 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.29.0|Apache License 2.0
[k8s.io/apimachinery](https://k8s.io/apimachinery)|v0.29.0|Apache License 2.0
[k8s.io/client-go](https://k8s.io/client-go)|v0.29.0|Apache License 2.0
[config/v1alpha1](https://k8s.io/component-base/config/v1alpha1)|v0.29.0|Apache License 2.0
[k8s.io/api](https://k8s.io/api)|v0.29.2|Apache License 2.0
[k8s.io/apimachinery](https://k8s.io/apimachinery)|v0.29.2|Apache License 2.0
[k8s.io/client-go](https://k8s.io/client-go)|v0.29.2|Apache License 2.0
[config/v1alpha1](https://k8s.io/component-base/config/v1alpha1)|v0.29.2|Apache License 2.0
[v2/internal](https://k8s.io/klog/v2/internal)|v2.110.1|Apache License 2.0
[kube-openapi/pkg](https://k8s.io/kube-openapi/pkg)|v0.0.0-20231010175941-2dd684a91f00|Apache License 2.0
[k8s.io/utils](https://k8s.io/utils)|v0.0.0-20230726121419-3b25d923346b|Apache License 2.0
[controller-runtime/pkg](https://sigs.k8s.io/controller-runtime/pkg)|v0.16.3|Apache License 2.0
[controller-runtime/pkg](https://sigs.k8s.io/controller-runtime/pkg)|v0.17.4|Apache License 2.0
[encoding/json](https://sigs.k8s.io/json/internal/golang/encoding/json)|v0.0.0-20221116044647-bc3834ca7abd|Apache License 2.0
[structured-merge-diff/v4](https://sigs.k8s.io/structured-merge-diff/v4)|v4.4.1|Apache License 2.0
[yaml/goyaml.v2](https://sigs.k8s.io/yaml/goyaml.v2)|v1.4.0|Apache License 2.0
Expand Down
38 changes: 19 additions & 19 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@ require (
github.com/gertd/go-pluralize v0.1.1
github.com/getkin/kin-openapi v0.123.0
github.com/ghodss/yaml v1.0.0
github.com/go-logr/logr v1.3.0
github.com/go-logr/zapr v1.2.4
github.com/go-logr/logr v1.4.1
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
Expand All @@ -29,11 +29,11 @@ require (
github.com/lithammer/dedent v1.1.0
github.com/mitchellh/go-homedir v1.1.0
github.com/mitchellh/hashstructure v1.0.0
github.com/onsi/ginkgo/v2 v2.13.0
github.com/onsi/ginkgo/v2 v2.14.0
github.com/onsi/gomega v1.30.0
github.com/pborman/uuid v1.2.0
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.16.0
github.com/prometheus/client_golang v1.18.0
github.com/pseudomuto/protoc-gen-doc v1.4.1
github.com/rogpeppe/go-internal v1.12.0
github.com/rotisserie/eris v0.1.1
Expand All @@ -46,20 +46,20 @@ require (
github.com/solo-io/protoc-gen-ext v0.0.18
github.com/solo-io/protoc-gen-openapi v0.2.1
github.com/spf13/pflag v1.0.5
go.uber.org/zap v1.25.0
go.uber.org/zap v1.26.0
golang.org/x/exp v0.0.0-20220921164117-439092de6870
golang.org/x/tools v0.16.1
google.golang.org/protobuf v1.31.0
gopkg.in/yaml.v2 v2.4.0
gopkg.in/yaml.v3 v3.0.1
k8s.io/api v0.29.0
k8s.io/apiextensions-apiserver v0.29.0
k8s.io/apimachinery v0.29.0
k8s.io/client-go v0.29.0
k8s.io/code-generator v0.29.0
k8s.io/api v0.29.2
k8s.io/apiextensions-apiserver v0.29.2
k8s.io/apimachinery v0.29.2
k8s.io/client-go v0.29.2
k8s.io/code-generator v0.29.2
k8s.io/klog/v2 v2.110.1
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
sigs.k8s.io/controller-runtime v0.16.3
sigs.k8s.io/controller-runtime v0.17.4
sigs.k8s.io/yaml v1.4.0
)

Expand All @@ -76,7 +76,7 @@ require (
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/emicklei/proto v1.6.15 // indirect
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
github.com/fsnotify/fsnotify v1.7.0 // indirect
github.com/go-openapi/jsonpointer v0.20.2 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
Expand Down Expand Up @@ -105,7 +105,7 @@ require (
github.com/mattn/go-colorable v0.1.13 // indirect
github.com/mattn/go-isatty v0.0.20 // indirect
github.com/mattn/go-zglob v0.0.3 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
github.com/matttproud/golang_protobuf_extensions/v2 v2.0.0 // indirect
github.com/mitchellh/copystructure v1.0.0 // indirect
github.com/mitchellh/reflectwalk v1.0.0 // indirect
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
Expand All @@ -115,9 +115,9 @@ require (
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
github.com/mwitkow/go-proto-validators v0.0.0-20180403085117-0950a7990007 // indirect
github.com/perimeterx/marshmallow v1.1.5 // indirect
github.com/prometheus/client_model v0.4.0 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/procfs v0.10.1 // indirect
github.com/prometheus/client_model v0.5.0 // indirect
github.com/prometheus/common v0.45.0 // indirect
github.com/prometheus/procfs v0.12.0 // indirect
github.com/pseudomuto/protokit v0.2.0 // indirect
github.com/spf13/afero v1.9.2 // indirect
github.com/spf13/cast v1.3.1 // indirect
Expand All @@ -127,9 +127,9 @@ require (
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
golang.org/x/mod v0.14.0 // indirect
golang.org/x/net v0.19.0 // indirect
golang.org/x/oauth2 v0.10.0 // indirect
golang.org/x/oauth2 v0.12.0 // indirect
golang.org/x/sync v0.5.0 // indirect
golang.org/x/sys v0.15.0 // indirect
golang.org/x/sys v0.16.0 // indirect
golang.org/x/term v0.15.0 // indirect
golang.org/x/text v0.14.0 // indirect
golang.org/x/time v0.3.0 // indirect
Expand All @@ -139,7 +139,7 @@ require (
google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
k8s.io/component-base v0.29.0 // indirect
k8s.io/component-base v0.29.2 // indirect
k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 // indirect
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
sigs.k8s.io/controller-tools v0.14.0 // indirect
Expand Down
Loading

0 comments on commit 3e58001

Please sign in to comment.