Skip to content

Commit

Permalink
K8s 1.26 upgrade (#542)
Browse files Browse the repository at this point in the history
* upgrade k8s to 1.26

* upgrade k8s-utils to unreleased version

* codegen

* Revert "codegen"

This reverts commit e376eca.

* codegen + manually pick out what ci expects

* manually update spacing in test/mocks/v2alpha1/kube/client/informers/externalversions/factory.go for CI codegens failure

* bump k8s-utils to v0.4.0

* add changelog

* run tests in gh action

* remove unused action call

* remove -c from test runner

* wait 1 minute for the cluster to be created before running tests

* Revert "wait 1 minute for the cluster to be created before running tests"

This reverts commit 891c600.

* Revert "remove -c from test runner"

This reverts commit 6cf70d5.

* Revert "remove unused action call"

This reverts commit 42c879f.

* Revert "run tests in gh action"

This reverts commit d8c8d0c.
  • Loading branch information
inFocus7 authored May 19, 2023
1 parent a971214 commit 8bd9a4a
Show file tree
Hide file tree
Showing 6 changed files with 204 additions and 103 deletions.
33 changes: 33 additions & 0 deletions changelog/v0.32.0/bump-k8s126.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
changelog:
- type: BREAKING_CHANGE
issueLink: https://github.com/solo-io/gloo/issues/8164
resolvesIssue: false
description: Upgrade Kubernetes dependencies to 1.26.X
- type: DEPENDENCY_BUMP
dependencyOwner: solo-io
dependencyRepo: go-utils
dependencyTag: v0.24.2
- type: DEPENDENCY_BUMP
dependencyOwner: solo-io
dependencyRepo: k8s-utils
dependencyTag: v0.4.0
- type: DEPENDENCY_BUMP
dependencyOwner: k8s.io
dependencyRepo: api
dependencyTag: v0.26.4
- type: DEPENDENCY_BUMP
dependencyOwner: k8s.io
dependencyRepo: apiextensions-apiserver
dependencyTag: v0.26.4
- type: DEPENDENCY_BUMP
dependencyOwner: k8s.io
dependencyRepo: apimachinery
dependencyTag: v0.26.4
- type: DEPENDENCY_BUMP
dependencyOwner: k8s.io
dependencyRepo: client-go
dependencyTag: v0.26.4
- type: DEPENDENCY_BUMP
dependencyOwner: k8s.io
dependencyRepo: code-generator
dependencyTag: v0.26.4
18 changes: 9 additions & 9 deletions ci/oss_compliance/osa_provided.md
Original file line number Diff line number Diff line change
Expand Up @@ -13,26 +13,26 @@ Name|Version|License
[grpc-ecosystem/go-grpc-middleware](https://github.com/grpc-ecosystem/go-grpc-middleware)|v1.3.0|Apache License 2.0
[iancoleman/strcase](https://github.com/iancoleman/strcase)|v0.0.0-20191112232945-16388991a334|MIT License
[mitchellh/hashstructure](https://github.com/mitchellh/hashstructure)|v1.0.0|MIT License
[ginkgo/v2](https://github.com/onsi/ginkgo)|v2.5.0|MIT License
[ginkgo/v2](https://github.com/onsi/ginkgo)|v2.6.0|MIT License
[onsi/gomega](https://github.com/onsi/gomega)|v1.24.1|MIT License
[pkg/errors](https://github.com/pkg/errors)|v0.9.1|BSD 2-clause "Simplified" License
[pseudomuto/protoc-gen-doc](https://github.com/pseudomuto/protoc-gen-doc)|v1.5.1|MIT License
[pseudomuto/protoc-gen-doc](https://github.com/pseudomuto/protoc-gen-doc)|v1.5.0|MIT License
[pseudomuto/protokit](https://github.com/pseudomuto/protokit)|v0.2.0|MIT License
[radovskyb/watcher](https://github.com/radovskyb/watcher)|v1.0.2|BSD 3-clause "New" or "Revised" License
[rotisserie/eris](https://github.com/rotisserie/eris)|v0.1.1|MIT License
[go.opencensus.io](https://go.opencensus.io)|v0.24.0|Apache License 2.0
[go.uber.org/zap](https://go.uber.org/zap)|v1.19.0|MIT License
[go.uber.org/zap](https://go.uber.org/zap)|v1.24.0|MIT License
[x/sync](https://golang.org/x/sync)|v0.1.0|BSD 3-clause "New" or "Revised" License
[google.golang.org/genproto](https://google.golang.org/genproto)|v0.0.0-20221201164419-0e50fba7f41c|Apache License 2.0
[google.golang.org/grpc](https://google.golang.org/grpc)|v1.51.0|Apache License 2.0
[google.golang.org/protobuf](https://google.golang.org/protobuf)|v1.28.1|BSD 3-clause "New" or "Revised" License
[gopkg.in/yaml.v2](https://gopkg.in/yaml.v2)|v2.4.0|Apache License 2.0
[k8s.io/api](https://k8s.io/api)|v0.25.4|Apache License 2.0
[k8s.io/apiextensions-apiserver](https://k8s.io/apiextensions-apiserver)|v0.25.4|Apache License 2.0
[k8s.io/apimachinery](https://k8s.io/apimachinery)|v0.25.4|Apache License 2.0
[k8s.io/client-go](https://k8s.io/client-go)|v0.25.4|Apache License 2.0
[k8s.io/code-generator](https://k8s.io/code-generator)|v0.25.4|Apache License 2.0
[k8s.io/utils](https://k8s.io/utils)|v0.0.0-20220728103510-ee6ede2d64ed|Apache License 2.0
[k8s.io/api](https://k8s.io/api)|v0.26.4|Apache License 2.0
[k8s.io/apiextensions-apiserver](https://k8s.io/apiextensions-apiserver)|v0.26.4|Apache License 2.0
[k8s.io/apimachinery](https://k8s.io/apimachinery)|v0.26.4|Apache License 2.0
[k8s.io/client-go](https://k8s.io/client-go)|v0.26.4|Apache License 2.0
[k8s.io/code-generator](https://k8s.io/code-generator)|v0.26.4|Apache License 2.0
[k8s.io/utils](https://k8s.io/utils)|v0.0.0-20221128185143-99ec85e7a448|Apache License 2.0
[sigs.k8s.io/yaml](https://sigs.k8s.io/yaml)|v1.3.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
Expand Down
50 changes: 23 additions & 27 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -20,54 +20,50 @@ require (
github.com/hashicorp/vault/api v1.0.5-0.20191108163347-bdd38fca2cff
github.com/iancoleman/strcase v0.0.0-20191112232945-16388991a334
github.com/mitchellh/hashstructure v1.0.0
github.com/onsi/ginkgo/v2 v2.5.0
github.com/onsi/ginkgo/v2 v2.6.0
github.com/onsi/gomega v1.24.1
github.com/pkg/errors v0.9.1
github.com/pseudomuto/protoc-gen-doc v1.5.1
github.com/pseudomuto/protoc-gen-doc v1.5.0
github.com/pseudomuto/protokit v0.2.0
github.com/radovskyb/watcher v1.0.2
github.com/rotisserie/eris v0.1.1
github.com/solo-io/anyvendor v0.0.1
github.com/solo-io/go-list-licenses v0.1.4
github.com/solo-io/go-utils v0.24.0
github.com/solo-io/k8s-utils v0.3.0
github.com/solo-io/go-utils v0.24.2
github.com/solo-io/k8s-utils v0.4.0
github.com/solo-io/protoc-gen-ext v0.0.18
github.com/solo-io/protoc-gen-openapi v0.1.0
go.opencensus.io v0.24.0
go.uber.org/zap v1.19.0
go.uber.org/zap v1.24.0
golang.org/x/sync v0.1.0
google.golang.org/genproto v0.0.0-20221201164419-0e50fba7f41c
google.golang.org/grpc v1.51.0
google.golang.org/protobuf v1.28.1
gopkg.in/yaml.v2 v2.4.0
k8s.io/api v0.25.4
k8s.io/apiextensions-apiserver v0.25.4
k8s.io/apimachinery v0.25.4
k8s.io/client-go v0.25.4
k8s.io/code-generator v0.25.4
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed
k8s.io/api v0.26.4
k8s.io/apiextensions-apiserver v0.26.4
k8s.io/apimachinery v0.26.4
k8s.io/client-go v0.26.4
k8s.io/code-generator v0.26.4
k8s.io/utils v0.0.0-20221128185143-99ec85e7a448
sigs.k8s.io/yaml v1.3.0
)

require (
cloud.google.com/go/compute v1.12.1 // indirect
cloud.google.com/go/compute/metadata v0.2.1 // indirect
github.com/Masterminds/goutils v1.1.1 // indirect
github.com/Masterminds/semver v1.4.2 // indirect
github.com/PuerkitoBio/purell v1.1.1 // indirect
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
github.com/armon/go-metrics v0.3.0 // indirect
github.com/avast/retry-go v2.2.0+incompatible // indirect
github.com/census-instrumentation/opencensus-proto v0.2.1 // indirect
github.com/cncf/xds/go v0.0.0-20211011173535-cb28da3451f1 // indirect
github.com/cockroachdb/apd/v2 v2.0.1 // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
github.com/emicklei/proto v1.6.15 // indirect
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
github.com/go-logr/logr v1.2.3 // indirect
github.com/go-openapi/jsonpointer v0.19.5 // indirect
github.com/go-openapi/jsonreference v0.19.5 // indirect
github.com/go-openapi/jsonreference v0.20.0 // indirect
github.com/go-openapi/swag v0.19.14 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
Expand All @@ -89,7 +85,7 @@ require (
github.com/hashicorp/vault/sdk v0.1.14-0.20191108161836-82f2b5571044 // indirect
github.com/huandu/xstrings v1.3.2 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/inconshreveable/mousetrap v1.0.1 // indirect
github.com/josharian/intern v1.0.0 // indirect
github.com/json-iterator/go v1.1.12 // indirect
github.com/k0kubun/pp v2.3.0+incompatible // indirect
Expand All @@ -109,28 +105,28 @@ require (
github.com/pierrec/lz4 v2.0.5+incompatible // indirect
github.com/ryanuber/go-glob v1.0.0 // indirect
github.com/spf13/afero v1.6.0 // indirect
github.com/spf13/cobra v1.4.0 // indirect
github.com/spf13/cobra v1.6.0 // indirect
github.com/spf13/pflag v1.0.5 // indirect
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
golang.org/x/crypto v0.1.0 // indirect
golang.org/x/lint v0.0.0-20200302205851-738671d3881b // indirect
golang.org/x/mod v0.7.0 // indirect
golang.org/x/net v0.5.0 // indirect
golang.org/x/net v0.7.0 // indirect
golang.org/x/oauth2 v0.0.0-20221014153046-6fdb5e3db783 // indirect
golang.org/x/sys v0.4.0 // indirect
golang.org/x/term v0.4.0 // indirect
golang.org/x/text v0.6.0 // indirect
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
golang.org/x/sys v0.5.0 // indirect
golang.org/x/term v0.5.0 // indirect
golang.org/x/text v0.7.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/tools v0.5.0 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
google.golang.org/appengine v1.6.7 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
gopkg.in/square/go-jose.v2 v2.3.1 // indirect
gopkg.in/yaml.v3 v3.0.1 // indirect
k8s.io/gengo v0.0.0-20211129171323-c02415ce4185 // indirect
k8s.io/klog/v2 v2.70.1 // indirect
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
k8s.io/klog/v2 v2.80.1 // indirect
k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
)
Expand Down
Loading

0 comments on commit 8bd9a4a

Please sign in to comment.