chore: update k8s dependencies (#560)

* chore: update k8s dependencies * cl * fix cl * code gen * cl * chore: update k8s dependencies * changelog * use correct event handler * gen * update tests * update hash
solo-io · May 17, 2024 · 4022e6c · 4022e6c
1 parent 01eb817
commit 4022e6c
Show file tree

Hide file tree

Showing 20 changed files with 364 additions and 122 deletions.
diff --git a/changelog/v0.40.0/bump-k8s-v0.30.yaml b/changelog/v0.40.0/bump-k8s-v0.30.yaml
@@ -0,0 +1,28 @@
+changelog:
+- type: BREAKING_CHANGE
+  description: "Bump dependencies to support Kubernetes 1.30"
+  issueLink: https://github.com/solo-io/gloo-mesh-enterprise/issues/14822
+- type: DEPENDENCY_BUMP
+  dependencyOwner: sigs.k8s.io
+  dependencyRepo: controller-runtime
+  dependencyTag: v0.18.2
+- type: DEPENDENCY_BUMP
+  dependencyOwner: k8s.io
+  dependencyRepo: api
+  dependencyTag: v0.30.0
+  description: pulled in by sigs.k8s.io/sontroller-runtime
+- type: DEPENDENCY_BUMP
+  dependencyOwner: k8s.io
+  dependencyRepo: apiextensions-apiserver
+  dependencyTag: v0.30.0
+  description: pulled in by sigs.k8s.io/sontroller-runtime
+- type: DEPENDENCY_BUMP
+  dependencyOwner: k8s.io
+  dependencyRepo: client-go
+  dependencyTag: v0.30.0
+  description: pulled in by sigs.k8s.io/sontroller-runtime
+- type: DEPENDENCY_BUMP
+  dependencyOwner: k8s.io
+  dependencyRepo: code-generator
+  dependencyTag: v0.30.0
+  description: pulled in by sigs.k8s.io/sontroller-runtime
diff --git a/ci/oss_compliance/osa_provided.md b/ci/oss_compliance/osa_provided.md
@@ -4,15 +4,15 @@ 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
-[internal/json](https://github.com/evanphx/json-patch)|v5.8.0|BSD 3-clause "New" or "Revised" License
+[internal/json](https://github.com/evanphx/json-patch)|v5.9.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.4.1|Apache License 2.0
+[go-logr/logr](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
 [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
+[golang/protobuf](https://github.com/golang/protobuf)|v1.5.4|BSD 3-clause "New" or "Revised" License
 [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.6.0|BSD 3-clause "New" or "Revised" License
 [gofuzz/bytesource](https://github.com/google/gofuzz)|v1.2.0|Apache License 2.0
@@ -35,24 +35,23 @@ Name|Version|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.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
+[x/net](https://golang.org/x/net)|v0.23.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/term](https://golang.org/x/term)|v0.18.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
 [jsonpatch/v2](https://gomodules.xyz/jsonpatch/v2)|v2.4.0|Apache License 2.0
-[google.golang.org/protobuf](https://google.golang.org/protobuf)|v1.31.0|BSD 3-clause "New" or "Revised" License
+[google.golang.org/protobuf](https://google.golang.org/protobuf)|v1.33.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.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/api](https://k8s.io/api)|v0.30.0|Apache License 2.0
+[k8s.io/apimachinery](https://k8s.io/apimachinery)|v0.30.0|Apache License 2.0
+[k8s.io/client-go](https://k8s.io/client-go)|v0.30.0|Apache License 2.0
+[v2/internal](https://k8s.io/klog/v2/internal)|v2.120.1|Apache License 2.0
+[kube-openapi/pkg](https://k8s.io/kube-openapi/pkg)|v0.0.0-20240228011516-70dd3763d340|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.17.4|Apache License 2.0
+[controller-runtime/pkg](https://sigs.k8s.io/controller-runtime/pkg)|v0.18.2|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

diff --git a/codegen/kuberesource/crd_test.go b/codegen/kuberesource/crd_test.go
@@ -58,9 +58,9 @@ var _ = Describe("Crd", func() {
 			o, err := CustomResourceDefinitions(grps)
 			Expect(err).NotTo(HaveOccurred())
 			Expect(o).To(HaveLen(2))
-			// note: we intentionally provide the "b6ec737002f7d02e" hash in the test, as it shouldn't change
+			// note: we intentionally provide the "13a71ec8b0049565" hash in the test, as it shouldn't change
 			// between runs.
-			Expect(o[0].GetAnnotations()).To(HaveKeyWithValue(crdutils.CRDSpecHashKey, "b6ec737002f7d02e"))
+			Expect(o[0].GetAnnotations()).To(HaveKeyWithValue(crdutils.CRDSpecHashKey, "13a71ec8b0049565"))
 		})
 		It("should not generate spec hash", func() {
 			grps[0].SkipSpecHash = true

diff --git a/codegen/render/manifests_renderer_test.go b/codegen/render/manifests_renderer_test.go
@@ -251,7 +251,7 @@ var _ = Describe("ManifestsRenderer", func() {
 			Expect(err).NotTo(HaveOccurred())
 			Expect(outFiles).To(HaveLen(2)) // legacy and templated manifests
 			Expect(outFiles[0].Content).To(ContainSubstring(crdutils.CRDVersionKey + ": 1.0.0"))
-			Expect(outFiles[0].Content).To(ContainSubstring(crdutils.CRDSpecHashKey + ": b6ec737002f7d02e"))
+			Expect(outFiles[0].Content).To(ContainSubstring(crdutils.CRDSpecHashKey + ": 13a71ec8b0049565"))
 			// only alpha versioned CRDs contain logic to conditionally render templates
 			Expect(outFiles[0].Content).To(Equal(outFiles[0].Content))
 		})
@@ -302,7 +302,7 @@ var _ = Describe("ManifestsRenderer", func() {
 			Expect(outFiles[1].Content).To(HavePrefix("\n{{- if has \"kinds.things.test.io/v1alpha1\" $.Values.enabledExperimentalApi }}"))
 			Expect(outFiles[1].Content).To(ContainSubstring("{{- end  }}"))
 			Expect(outFiles[1].Content).To(ContainSubstring(crdutils.CRDVersionKey + ": 1.0.0"))
-			Expect(outFiles[1].Content).To(ContainSubstring(crdutils.CRDSpecHashKey + ": 80c06d3e2484e4c8"))
+			Expect(outFiles[1].Content).To(ContainSubstring(crdutils.CRDSpecHashKey + ": 105d1e4c78cac3c"))
 		})
 	})
 

diff --git a/codegen/test/chart-no-desc/crds/things.test.io_crds.yaml b/codegen/test/chart-no-desc/crds/things.test.io_crds.yaml
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    crd.solo.io/specHash: a7f6c51daca2a86e
+    crd.solo.io/specHash: b4c75d890672c087
   labels:
     app: ""
     app.kubernetes.io/name: ""
@@ -37,7 +37,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    crd.solo.io/specHash: 52f9159d46759d37
+    crd.solo.io/specHash: 8a81acb3e89f2785
   labels:
     app: ""
     app.kubernetes.io/name: ""

diff --git a/codegen/test/chart-no-desc/templates/things.test.io_crds.yaml b/codegen/test/chart-no-desc/templates/things.test.io_crds.yaml
@@ -5,7 +5,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    crd.solo.io/specHash: a7f6c51daca2a86e
+    crd.solo.io/specHash: b4c75d890672c087
   labels:
     app: ""
     app.kubernetes.io/name: ""
@@ -38,7 +38,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    crd.solo.io/specHash: 52f9159d46759d37
+    crd.solo.io/specHash: 8a81acb3e89f2785
   labels:
     app: ""
     app.kubernetes.io/name: ""

diff --git a/codegen/test/chart/conditional-crds/templates/things.test.io_crds.yaml b/codegen/test/chart/conditional-crds/templates/things.test.io_crds.yaml
@@ -6,7 +6,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    crd.solo.io/specHash: 7e527d75eb594ad1
+    crd.solo.io/specHash: 8523302ab12f9228
   labels:
     app: ""
     app.kubernetes.io/name: ""

diff --git a/codegen/test/chart/crds/things.test.io_crds.yaml b/codegen/test/chart/crds/things.test.io_crds.yaml
@@ -4,7 +4,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    crd.solo.io/specHash: a7f6c51daca2a86e
+    crd.solo.io/specHash: b4c75d890672c087
   labels:
     app: ""
     app.kubernetes.io/name: ""
@@ -37,7 +37,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    crd.solo.io/specHash: 888c42601b3e10b6
+    crd.solo.io/specHash: 72871191eeb27a61
   labels:
     app: ""
     app.kubernetes.io/name: ""

diff --git a/codegen/test/chart/templates/things.test.io_crds.yaml b/codegen/test/chart/templates/things.test.io_crds.yaml
@@ -5,7 +5,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    crd.solo.io/specHash: a7f6c51daca2a86e
+    crd.solo.io/specHash: b4c75d890672c087
   labels:
     app: ""
     app.kubernetes.io/name: ""
@@ -38,7 +38,7 @@ apiVersion: apiextensions.k8s.io/v1
 kind: CustomResourceDefinition
 metadata:
   annotations:
-    crd.solo.io/specHash: 888c42601b3e10b6
+    crd.solo.io/specHash: 72871191eeb27a61
   labels:
     app: ""
     app.kubernetes.io/name: ""