Skip to content
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.

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

chore: bump k8s to 1.28 #518

Merged
merged 6 commits into from
Dec 5, 2023
Merged
Show file tree
Hide file tree
Changes from 4 commits
Commits
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 .github/workflows/pull_request.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ jobs:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- name: Set up Go 1.18
- name: Set up Go 1.21
uses: actions/setup-go@v4
with:
go-version-file: "go.mod"
Expand Down
51 changes: 51 additions & 0 deletions changelog/v0.36.0/bump-k8s-128.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,51 @@
changelog:
- type: BREAKING_CHANGE
description: >
Bump dependencies to support Kubernetes 1.28
issueLink: https://github.com/solo-io/gloo/issues/8515
resolvesIssue: false
- type: DEPENDENCY_BUMP
dependencyOwner: k8s.io
dependencyRepo: api
dependencyTag: v0.28.3
- type: DEPENDENCY_BUMP
dependencyOwner: k8s.io
dependencyRepo: apiextensions-apiserver
dependencyTag: v0.28.3
- type: DEPENDENCY_BUMP
dependencyOwner: k8s.io
dependencyRepo: apimachinery
dependencyTag: v0.28.3
- type: DEPENDENCY_BUMP
dependencyOwner: k8s.io
dependencyRepo: client-go
dependencyTag: v0.28.3
- type: DEPENDENCY_BUMP
dependencyOwner: sigs.k8s.io
dependencyRepo: code-generator
dependencyTag: v0.28.3
- type: DEPENDENCY_BUMP
dependencyOwner: sigs.k8s.io
dependencyRepo: controller-runtime
dependencyTag: v0.16.3
- type: DEPENDENCY_BUMP
dependencyOwner: onsi
dependencyRepo: ginkgo/v2
dependencyTag: v2.11.0
- type: DEPENDENCY_BUMP
dependencyOwner: onsi
dependencyRepo: gomega
dependencyTag: v1.27.10
- type: DEPENDENCY_BUMP
dependencyOwner: go.uber.org
dependencyRepo: zap
dependencyTag: v1.25.0

- type: DEPENDENCY_BUMP
dependencyOwner: solo-io
dependencyRepo: go-utils
dependencyTag: v0.24.8
- type: DEPENDENCY_BUMP
dependencyOwner: solo-io
dependencyRepo: k8s-utils
dependencyTag: v0.6.0
45 changes: 22 additions & 23 deletions ci/oss_compliance/osa_provided.md
Original file line number Diff line number Diff line change
Expand Up @@ -3,19 +3,19 @@ Name|Version|License
[perks/quantile](https://github.com/beorn7/perks)|v1.0.1|MIT 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.9.0|MIT 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
[fsnotify/fsnotify](https://github.com/fsnotify/fsnotify)|v1.6.0|BSD 3-clause "New" or "Revised" License
[go-logr/logr](https://github.com/go-logr/logr)|v1.2.4|Apache License 2.0
[go-openapi/jsonpointer](https://github.com/go-openapi/jsonpointer)|v0.19.6|Apache License 2.0
[jsonreference/internal](https://github.com/go-openapi/jsonreference)|v0.20.1|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.3|Apache License 2.0
[gogo/protobuf](https://github.com/gogo/protobuf)|v1.3.2|BSD 3-clause "New" or "Revised" License
[groupcache/lru](https://github.com/golang/groupcache)|v0.0.0-20210331224755-41bb18bfe9da|Apache License 2.0
[golang/protobuf](https://github.com/golang/protobuf)|v1.5.3|BSD 3-clause "New" or "Revised" License
[google/gnostic](https://github.com/google/gnostic)|v0.5.7-v3refs|Apache License 2.0
[google/gnostic-models](https://github.com/google/gnostic-models)|v0.6.8|Apache License 2.0
[cmp/internal](https://github.com/google/go-cmp)|v0.5.9|BSD 3-clause "New" or "Revised" License
[google/gofuzz](https://github.com/google/gofuzz)|v1.1.0|Apache License 2.0
[gofuzz/bytesource](https://github.com/google/gofuzz)|v1.2.0|Apache License 2.0
[google/uuid](https://github.com/google/uuid)|v1.3.0|BSD 3-clause "New" or "Revised" License
[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
Expand All @@ -25,33 +25,32 @@ Name|Version|License
[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.15.1|Apache License 2.0
[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.42.0|Apache License 2.0
[procfs/internal](https://github.com/prometheus/procfs)|v0.9.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
[rotisserie/eris](https://github.com/rotisserie/eris)|v0.1.1|MIT License
[go.uber.org/atomic](https://go.uber.org/atomic)|v1.7.0|MIT License
[go.uber.org/multierr](https://go.uber.org/multierr)|v1.6.0|MIT License
[go.uber.org/zap](https://go.uber.org/zap)|v1.24.0|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
[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.10.0|BSD 3-clause "New" or "Revised" License
[oauth2/internal](https://golang.org/x/oauth2/internal)|v0.5.0|BSD 3-clause "New" or "Revised" License
[x/term](https://golang.org/x/term)|v0.8.0|BSD 3-clause "New" or "Revised" License
[x/text](https://golang.org/x/text)|v0.9.0|BSD 3-clause "New" or "Revised" License
[x/net](https://golang.org/x/net)|v0.17.0|BSD 3-clause "New" or "Revised" License
[oauth2/internal](https://golang.org/x/oauth2/internal)|v0.8.0|BSD 3-clause "New" or "Revised" License
[x/term](https://golang.org/x/term)|v0.13.0|BSD 3-clause "New" or "Revised" License
[x/text](https://golang.org/x/text)|v0.13.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
[jsonpatch/v2](https://gomodules.xyz/jsonpatch/v2)|v2.3.0|Apache License 2.0
[jsonpatch/v2](https://gomodules.xyz/jsonpatch/v2)|v2.4.0|Apache License 2.0
[google.golang.org/protobuf](https://google.golang.org/protobuf)|v1.30.0|BSD 3-clause "New" or "Revised" 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.27.3|Apache License 2.0
[k8s.io/apimachinery](https://k8s.io/apimachinery)|v0.27.3|Apache License 2.0
[k8s.io/client-go](https://k8s.io/client-go)|v0.27.3|Apache License 2.0
[config/v1alpha1](https://k8s.io/component-base/config/v1alpha1)|v0.27.3|Apache License 2.0
[v2/internal](https://k8s.io/klog/v2/internal)|v2.90.1|Apache License 2.0
[kube-openapi/pkg](https://k8s.io/kube-openapi/pkg)|v0.0.0-20230501164219-8b0f38b5fd1f|Apache License 2.0
[k8s.io/utils](https://k8s.io/utils)|v0.0.0-20230209194617-a36077c30491|Apache License 2.0
[controller-runtime/pkg](https://sigs.k8s.io/controller-runtime/pkg)|v0.15.0|Apache License 2.0
[k8s.io/api](https://k8s.io/api)|v0.28.3|Apache License 2.0
[k8s.io/apimachinery](https://k8s.io/apimachinery)|v0.28.3|Apache License 2.0
[k8s.io/client-go](https://k8s.io/client-go)|v0.28.3|Apache License 2.0
[config/v1alpha1](https://k8s.io/component-base/config/v1alpha1)|v0.28.3|Apache License 2.0
[v2/internal](https://k8s.io/klog/v2/internal)|v2.100.1|Apache License 2.0
[kube-openapi/pkg](https://k8s.io/kube-openapi/pkg)|v0.0.0-20230717233707-2695361300d9|Apache License 2.0
[k8s.io/utils](https://k8s.io/utils)|v0.0.0-20230406110748-d93618cff8a2|Apache License 2.0
[controller-runtime/pkg](https://sigs.k8s.io/controller-runtime/pkg)|v0.16.3|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.2.3|Apache License 2.0
[sigs.k8s.io/yaml](https://sigs.k8s.io/yaml)|v1.3.0|MIT License
Expand Down
13 changes: 11 additions & 2 deletions codegen/render/kube_multicluster_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/client-go/kubernetes"
"sigs.k8s.io/controller-runtime/pkg/cache"
"sigs.k8s.io/controller-runtime/pkg/client"
"sigs.k8s.io/controller-runtime/pkg/log"
zaputil "sigs.k8s.io/controller-runtime/pkg/log/zap"
Expand Down Expand Up @@ -121,7 +122,11 @@ var _ = WithRemoteClusterContextDescribe("Multicluster", func() {

Describe("clientset", func() {
It("works", func() {
cw := watch.NewClusterWatcher(ctx, manager.Options{Namespace: ns}, watch.RetryOptions{}, nil)
cw := watch.NewClusterWatcher(ctx, manager.Options{
Cache: cache.Options{
DefaultNamespaces: map[string]cache.Config{ns: cache.Config{}},
},
}, watch.RetryOptions{}, nil)
err := cw.Run(masterManager)
Expect(err).NotTo(HaveOccurred())
mcClientset := multicluster.NewClient(cw)
Expand Down Expand Up @@ -188,7 +193,11 @@ var _ = WithRemoteClusterContextDescribe("Multicluster", func() {
}

BeforeEach(func() {
cw = watch.NewClusterWatcher(ctx, manager.Options{Namespace: ns}, watch.RetryOptions{}, nil)
cw = watch.NewClusterWatcher(ctx, manager.Options{
Cache: cache.Options{
DefaultNamespaces: map[string]cache.Config{ns: cache.Config{}},
},
}, watch.RetryOptions{}, nil)
})

It("works when a loop is registered before the watcher is started", func() {
Expand Down
23 changes: 23 additions & 0 deletions codegen/test/chart/values.schema.json
Original file line number Diff line number Diff line change
Expand Up @@ -3261,6 +3261,16 @@
}
]
},
"restartPolicy": {
"anyOf": [
{
"type": "string"
},
{
"type": "null"
}
]
},
"volumeMounts": {
"anyOf": [
{
Expand Down Expand Up @@ -4504,6 +4514,16 @@
}
]
},
"restartPolicy": {
"anyOf": [
{
"type": "string"
},
{
"type": "null"
}
]
},
"volumeMounts": {
"anyOf": [
{
Expand Down Expand Up @@ -5747,6 +5767,9 @@
}
]
},
"restartPolicy": {
"type": "string"
},
"volumeMounts": {
"anyOf": [
{
Expand Down
79 changes: 40 additions & 39 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -7,28 +7,28 @@ require (
github.com/Masterminds/semver v1.4.2
github.com/Masterminds/sprig/v3 v3.1.0
github.com/avast/retry-go/v4 v4.3.3
github.com/envoyproxy/protoc-gen-validate v0.6.1
github.com/envoyproxy/protoc-gen-validate v0.9.1
github.com/gertd/go-pluralize v0.1.1
github.com/go-logr/logr v1.2.4
github.com/go-logr/zapr v1.2.4
github.com/go-test/deep v1.0.7
github.com/gobuffalo/packr v1.30.1
github.com/golang/mock v1.6.0
github.com/golang/protobuf v1.5.3
github.com/google/gnostic v0.5.7-v3refs
github.com/google/gnostic-models v0.6.8
github.com/google/go-cmp v0.5.9
github.com/hashicorp/go-multierror v1.1.0
github.com/iancoleman/orderedmap v0.0.0-20190318233801-ac98e3ecb4b0
github.com/iancoleman/strcase v0.1.3
github.com/iancoleman/strcase v0.2.0
github.com/invopop/jsonschema v0.7.0
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.9.5
github.com/onsi/gomega v1.27.7
github.com/onsi/ginkgo/v2 v2.11.0
github.com/onsi/gomega v1.27.10
github.com/pborman/uuid v1.2.0
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.15.1
github.com/prometheus/client_golang v1.16.0
github.com/pseudomuto/protoc-gen-doc v1.4.1
github.com/rogpeppe/go-internal v1.10.0
github.com/rotisserie/eris v0.1.1
Expand All @@ -40,20 +40,20 @@ require (
github.com/solo-io/k8s-utils v0.0.1
github.com/solo-io/protoc-gen-ext v0.0.18
github.com/spf13/pflag v1.0.5
go.uber.org/zap v1.24.0
go.uber.org/zap v1.25.0
golang.org/x/exp v0.0.0-20220921164117-439092de6870
golang.org/x/tools v0.9.1
golang.org/x/tools v0.9.3
google.golang.org/protobuf v1.30.0
gopkg.in/yaml.v2 v2.4.0
gopkg.in/yaml.v3 v3.0.1
k8s.io/api v0.27.3
k8s.io/apiextensions-apiserver v0.27.3
k8s.io/apimachinery v0.27.3
k8s.io/client-go v0.27.3
k8s.io/code-generator v0.27.3
k8s.io/klog/v2 v2.90.1
k8s.io/utils v0.0.0-20230209194617-a36077c30491
sigs.k8s.io/controller-runtime v0.15.0
k8s.io/api v0.28.3
k8s.io/apiextensions-apiserver v0.28.3
k8s.io/apimachinery v0.28.3
k8s.io/client-go v0.28.3
k8s.io/code-generator v0.28.3
k8s.io/klog/v2 v2.100.1
k8s.io/utils v0.0.0-20230406110748-d93618cff8a2
sigs.k8s.io/controller-runtime v0.16.3
sigs.k8s.io/yaml v1.3.0
)

Expand All @@ -67,32 +67,33 @@ require (
github.com/cespare/xxhash/v2 v2.2.0 // 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.9.0 // indirect
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
github.com/emicklei/proto v1.6.15 // indirect
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
github.com/fsnotify/fsnotify v1.6.0 // indirect
github.com/ghodss/yaml v1.0.0 // indirect
github.com/go-openapi/jsonpointer v0.19.6 // indirect
github.com/go-openapi/jsonreference v0.20.1 // indirect
github.com/go-openapi/jsonreference v0.20.2 // indirect
github.com/go-openapi/swag v0.22.3 // indirect
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
github.com/gobuffalo/envy v1.8.1 // indirect
github.com/gobuffalo/packd v0.3.0 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/glog v1.0.0 // indirect
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/google/gofuzz v1.2.0 // indirect
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
github.com/google/uuid v1.3.0 // indirect
github.com/hashicorp/errwrap v1.0.0 // indirect
github.com/huandu/xstrings v1.3.1 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/inconshreveable/mousetrap v1.0.1 // indirect
github.com/inconshreveable/mousetrap v1.1.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
github.com/k0kubun/pp v2.3.0+incompatible // indirect
github.com/lyft/protoc-gen-star v0.6.0 // indirect
github.com/lyft/protoc-gen-star v0.6.1 // indirect
github.com/mailru/easyjson v0.7.7 // indirect
github.com/mattn/go-colorable v0.1.7 // indirect
github.com/mattn/go-isatty v0.0.12 // indirect
Expand All @@ -106,32 +107,32 @@ 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/prometheus/client_model v0.4.0 // indirect
github.com/prometheus/common v0.42.0 // indirect
github.com/prometheus/procfs v0.9.0 // indirect
github.com/prometheus/common v0.44.0 // indirect
github.com/prometheus/procfs v0.10.1 // indirect
github.com/pseudomuto/protokit v0.2.0 // indirect
github.com/spf13/afero v1.6.0 // indirect
github.com/spf13/afero v1.9.2 // indirect
github.com/spf13/cast v1.3.1 // indirect
github.com/spf13/cobra v1.6.0 // 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
github.com/spf13/cobra v1.7.0 // indirect
go.uber.org/multierr v1.11.0 // indirect
golang.org/x/crypto v0.14.0 // indirect
golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
golang.org/x/mod v0.10.0 // indirect
golang.org/x/net v0.10.0 // indirect
golang.org/x/oauth2 v0.5.0 // indirect
golang.org/x/net v0.17.0 // indirect
golang.org/x/oauth2 v0.8.0 // indirect
golang.org/x/sync v0.2.0 // indirect
golang.org/x/sys v0.8.0 // indirect
golang.org/x/term v0.8.0 // indirect
golang.org/x/text v0.9.0 // indirect
golang.org/x/sys v0.13.0 // indirect
golang.org/x/term v0.13.0 // indirect
golang.org/x/text v0.13.0 // indirect
golang.org/x/time v0.3.0 // indirect
golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
google.golang.org/genproto v0.0.0-20230526161137-0005af68ea54 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20230525234035-dd9d682886f9 // indirect
gopkg.in/inf.v0 v0.9.1 // indirect
k8s.io/component-base v0.27.3 // indirect
k8s.io/component-base v0.28.3 // indirect
k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
)
Expand All @@ -143,6 +144,6 @@ replace (
git.apache.org/thrift.git => github.com/apache/thrift v0.0.0-20180902110319-2566ecd5d999
//github.com/Azure/go-autorest => github.com/Azure/go-autorest v13.0.0+incompatible
github.com/Sirupsen/logrus => github.com/sirupsen/logrus v1.4.2
github.com/docker/docker => github.com/moby/moby v0.7.3-0.20190826074503-38ab9da00309
github.com/docker/docker => github.com/moby/moby v24.0.7+incompatible
github.com/operator-framework/operator-lifecycle-manager => github.com/operator-framework/operator-lifecycle-manager v0.0.0-20190605231540-b8a4faf68e36
)
Loading