K8s 1.27 upgrade (#464)

* manual go.mod update * download/tidy * Create palceholder.yaml * changelog * Rewrite inject * generated * [WIP] Additional k8s 1.27 upgrade changes (#465) * enqueue_static_handler: function signature change to include context * predicate_request_tracking: function signature change to include context * multi_handler: function signature change to include context * register_queue_handler: function signature change to include context * cache: function signature change to include context * support source.kind constructor * undo unnecessary context adjustment to function signature of event handler * Adding changelog file to new location * Deleting changelog file from old location * changelog * Update enqueue_static_handler.go * Defensive coding * add new client funcs * timeout context gvk logging Update runner.go Update runner.go Revert "Update runner.go" This reverts commit 5a459f0. revert waitforcachesync timeout --------- Co-authored-by: Sam Heilbron <[email protected]> Co-authored-by: changelog-bot <changelog-bot> Co-authored-by: Jenny Shu <[email protected]> Co-authored-by: Jenny Shu <[email protected]>
solo-io · Jul 31, 2023 · 0d5c2a5 · 0d5c2a5
1 parent f54869f
commit 0d5c2a5
Show file tree

Hide file tree

Showing 17 changed files with 334 additions and 276 deletions.
diff --git a/.github/workflows/pull_request.yaml b/.github/workflows/pull_request.yaml
@@ -13,7 +13,7 @@ jobs:
     steps:
       - name: Check out code into the Go module directory
         uses: actions/checkout@v3
-      - name: Set up Go 1.18
+      - name: Set up Go
         uses: actions/setup-go@v4
         with:
           go-version-file: "go.mod"

diff --git a/changelog/v0.32.0/k8s-1.27-upgrade.yaml b/changelog/v0.32.0/k8s-1.27-upgrade.yaml
@@ -0,0 +1,29 @@
+changelog:
+  - type: BREAKING_CHANGE
+    issueLink: https://github.com/solo-io/gloo/issues/8214
+    resolvesIssue: false
+    description: Upgrade Kubernetes dependencies to 1.27.X
+  - type: DEPENDENCY_BUMP
+    dependencyOwner: k8s.io
+    dependencyRepo: api
+    dependencyTag: v0.27.3
+  - type: DEPENDENCY_BUMP
+    dependencyOwner: k8s.io
+    dependencyRepo: apiextensions-apiserver
+    dependencyTag: v0.27.3
+  - type: DEPENDENCY_BUMP
+    dependencyOwner: k8s.io
+    dependencyRepo: apimachinery
+    dependencyTag: v0.27.3
+  - type: DEPENDENCY_BUMP
+    dependencyOwner: k8s.io
+    dependencyRepo: client-go
+    dependencyTag: v0.27.3
+  - type: DEPENDENCY_BUMP
+    dependencyOwner: k8s.io
+    dependencyRepo: code-generator
+    dependencyTag: v0.27.3
+  - type: DEPENDENCY_BUMP
+    dependencyOwner: sigs.k8s.io
+    dependencyRepo: controller-runtime
+    dependencyTag: v0.15.0
diff --git a/ci/oss_compliance/osa_provided.md b/ci/oss_compliance/osa_provided.md
@@ -1,58 +1,58 @@
 Name|Version|License
 ---|---|---
 [perks/quantile](https://github.com/beorn7/perks)|v1.0.1|MIT License
-[xxhash/v2](https://github.com/cespare/xxhash)|v2.1.2|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
 [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.3|Apache License 2.0
-[go-openapi/jsonpointer](https://github.com/go-openapi/jsonpointer)|v0.19.5|Apache License 2.0
-[jsonreference/internal](https://github.com/go-openapi/jsonreference)|v0.20.0|Apache License 2.0
-[go-openapi/swag](https://github.com/go-openapi/swag)|v0.19.14|Apache License 2.0
+[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
+[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.2|BSD 3-clause "New" or "Revised" License
+[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
 [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
-[google/uuid](https://github.com/google/uuid)|v1.2.0|BSD 3-clause "New" or "Revised" License
+[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
-[mailru/easyjson](https://github.com/mailru/easyjson)|v0.7.6|MIT License
-[golang_protobuf_extensions/pbutil](https://github.com/matttproud/golang_protobuf_extensions)|v1.0.2|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
 [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.14.0|Apache License 2.0
-[client_model/go](https://github.com/prometheus/client_model)|v0.3.0|Apache License 2.0
-[prometheus/common](https://github.com/prometheus/common)|v0.37.0|Apache License 2.0
-[procfs/internal](https://github.com/prometheus/procfs)|v0.8.0|Apache License 2.0
+[client_golang/prometheus](https://github.com/prometheus/client_golang)|v1.15.1|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
 [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
 [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.7.0|BSD 3-clause "New" or "Revised" License
-[oauth2/internal](https://golang.org/x/oauth2/internal)|v0.0.0-20220223155221-ee480838109b|BSD 3-clause "New" or "Revised" License
-[x/term](https://golang.org/x/term)|v0.5.0|BSD 3-clause "New" or "Revised" License
-[x/text](https://golang.org/x/text)|v0.7.0|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
 [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.2.0|Apache License 2.0
-[google.golang.org/protobuf](https://google.golang.org/protobuf)|v1.28.1|BSD 3-clause "New" or "Revised" License
+[jsonpatch/v2](https://gomodules.xyz/jsonpatch/v2)|v2.3.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.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
-[config/v1alpha1](https://k8s.io/component-base/config/v1alpha1)|v0.26.4|Apache License 2.0
-[v2/internal](https://k8s.io/klog/v2/internal)|v2.80.1|Apache License 2.0
-[kube-openapi/pkg](https://k8s.io/kube-openapi/pkg)|v0.0.0-20221012153701-172d655c2280|Apache License 2.0
-[k8s.io/utils](https://k8s.io/utils)|v0.0.0-20221128185143-99ec85e7a448|Apache License 2.0
-[controller-runtime/pkg](https://sigs.k8s.io/controller-runtime/pkg)|v0.14.4|Apache License 2.0
-[encoding/json](https://sigs.k8s.io/json/internal/golang/encoding/json)|v0.0.0-20220713155537-f223a00ba0e2|Apache License 2.0
+[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
+[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
 [cmd/goimports](https://golang.org/x/tools/cmd/goimports)|latest|MIT License

diff --git a/codegen/test/chart/values.schema.json b/codegen/test/chart/values.schema.json
@@ -3240,6 +3240,27 @@
                                         },
                                         "type": "object"
                                       },
+                                      "resizePolicy": {
+                                        "anyOf": [
+                                          {
+                                            "items": {
+                                              "properties": {
+                                                "resourceName": {
+                                                  "type": "string"
+                                                },
+                                                "restartPolicy": {
+                                                  "type": "string"
+                                                }
+                                              },
+                                              "type": "object"
+                                            },
+                                            "type": "array"
+                                          },
+                                          {
+                                            "type": "null"
+                                          }
+                                        ]
+                                      },
                                       "volumeMounts": {
                                         "anyOf": [
                                           {
@@ -4462,6 +4483,27 @@
                                         },
                                         "type": "object"
                                       },
+                                      "resizePolicy": {
+                                        "anyOf": [
+                                          {
+                                            "items": {
+                                              "properties": {
+                                                "resourceName": {
+                                                  "type": "string"
+                                                },
+                                                "restartPolicy": {
+                                                  "type": "string"
+                                                }
+                                              },
+                                              "type": "object"
+                                            },
+                                            "type": "array"
+                                          },
+                                          {
+                                            "type": "null"
+                                          }
+                                        ]
+                                      },
                                       "volumeMounts": {
                                         "anyOf": [
                                           {
@@ -5684,6 +5726,27 @@
                                         },
                                         "type": "object"
                                       },
+                                      "resizePolicy": {
+                                        "anyOf": [
+                                          {
+                                            "items": {
+                                              "properties": {
+                                                "resourceName": {
+                                                  "type": "string"
+                                                },
+                                                "restartPolicy": {
+                                                  "type": "string"
+                                                }
+                                              },
+                                              "type": "object"
+                                            },
+                                            "type": "array"
+                                          },
+                                          {
+                                            "type": "null"
+                                          }
+                                        ]
+                                      },
                                       "volumeMounts": {
                                         "anyOf": [
                                           {

diff --git a/go.mod b/go.mod
@@ -9,12 +9,12 @@ require (
 	github.com/avast/retry-go/v4 v4.3.3
 	github.com/envoyproxy/protoc-gen-validate v0.6.1
 	github.com/gertd/go-pluralize v0.1.1
-	github.com/go-logr/logr v1.2.3
-	github.com/go-logr/zapr v1.2.3
+	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.2
+	github.com/golang/protobuf v1.5.3
 	github.com/google/gnostic v0.5.7-v3refs
 	github.com/hashicorp/go-multierror v1.1.0
 	github.com/iancoleman/orderedmap v0.0.0-20190318233801-ac98e3ecb4b0
@@ -23,15 +23,15 @@ 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.8.1
-	github.com/onsi/gomega v1.26.0
+	github.com/onsi/ginkgo/v2 v2.9.5
+	github.com/onsi/gomega v1.27.7
 	github.com/pborman/uuid v1.2.0
 	github.com/pkg/errors v0.9.1
-	github.com/prometheus/client_golang v1.14.0
+	github.com/prometheus/client_golang v1.15.1
 	github.com/pseudomuto/protoc-gen-doc v1.4.1
-	github.com/rogpeppe/go-internal v1.8.0
+	github.com/rogpeppe/go-internal v1.10.0
 	github.com/rotisserie/eris v0.1.1
-	github.com/sirupsen/logrus v1.8.1
+	github.com/sirupsen/logrus v1.9.0
 	github.com/solo-io/anyvendor v0.0.4
 	github.com/solo-io/cue v0.4.7
 	github.com/solo-io/go-list-licenses v0.0.4
@@ -41,18 +41,18 @@ require (
 	github.com/spf13/pflag v1.0.5
 	go.uber.org/zap v1.24.0
 	golang.org/x/exp v0.0.0-20220921164117-439092de6870
-	golang.org/x/tools v0.6.0
-	google.golang.org/protobuf v1.28.1
+	golang.org/x/tools v0.9.1
+	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.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/klog/v2 v2.80.1
-	k8s.io/utils v0.0.0-20221128185143-99ec85e7a448
-	sigs.k8s.io/controller-runtime v0.14.4
+	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
 	sigs.k8s.io/yaml v1.3.0
 )
 
@@ -63,7 +63,7 @@ require (
 	github.com/aokoli/goutils v1.0.1 // indirect
 	github.com/avast/retry-go v2.2.0+incompatible // indirect
 	github.com/beorn7/perks v1.0.1 // indirect
-	github.com/cespare/xxhash/v2 v2.1.2 // indirect
+	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
@@ -72,16 +72,18 @@ require (
 	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.5 // indirect
-	github.com/go-openapi/jsonreference v0.20.0 // indirect
-	github.com/go-openapi/swag v0.19.14 // indirect
+	github.com/go-openapi/jsonpointer v0.19.6 // indirect
+	github.com/go-openapi/jsonreference v0.20.1 // 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/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
 	github.com/google/go-cmp v0.5.9 // indirect
 	github.com/google/gofuzz v1.1.0 // indirect
-	github.com/google/uuid 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
@@ -91,21 +93,21 @@ require (
 	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/mailru/easyjson v0.7.6 // 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
 	github.com/mattn/go-zglob v0.0.3 // indirect
-	github.com/matttproud/golang_protobuf_extensions v1.0.2 // indirect
+	github.com/matttproud/golang_protobuf_extensions v1.0.4 // 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
 	github.com/modern-go/reflect2 v1.0.2 // 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/prometheus/client_model v0.3.0 // indirect
-	github.com/prometheus/common v0.37.0 // indirect
-	github.com/prometheus/procfs v0.8.0 // 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/pseudomuto/protokit v0.2.0 // indirect
 	github.com/spf13/afero v1.6.0 // indirect
 	github.com/spf13/cast v1.3.1 // indirect
@@ -114,23 +116,23 @@ require (
 	go.uber.org/multierr v1.6.0 // indirect
 	golang.org/x/crypto v0.1.0 // indirect
 	golang.org/x/lint v0.0.0-20210508222113-6edffad5e616 // indirect
-	golang.org/x/mod v0.8.0 // indirect
-	golang.org/x/net v0.7.0 // indirect
-	golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
-	golang.org/x/sync v0.1.0 // 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/mod v0.10.0 // indirect
+	golang.org/x/net v0.10.0 // indirect
+	golang.org/x/oauth2 v0.5.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/time v0.3.0 // indirect
-	golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
-	gomodules.xyz/jsonpatch/v2 v2.2.0 // indirect
+	golang.org/x/xerrors v0.0.0-20220907171357-04be3eba64a2 // indirect
+	gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
 	google.golang.org/appengine v1.6.7 // indirect
 	google.golang.org/genproto v0.0.0-20220502173005-c8bf987b8c21 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
-	k8s.io/component-base v0.26.4 // indirect
+	k8s.io/component-base v0.27.3 // indirect
 	k8s.io/gengo v0.0.0-20220902162205-c0856e24416d // indirect
-	k8s.io/kube-openapi v0.0.0-20221012153701-172d655c2280 // indirect
-	sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
+	k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
+	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 	sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
 )