vendor: update to k8s 1.30 (#80)

Signed-off-by: Nick Santos <nick.santos@docker.com>
tilt-dev · Apr 26, 2024 · 75657d7 · 75657d7
1 parent 6e632f9
commit 75657d7
Show file tree

Hide file tree

Showing 966 changed files with 91,532 additions and 20,128 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -4,14 +4,14 @@ orbs:
 jobs:
   build:
     docker:
-      - image: cimg/go:1.21
+      - image: cimg/go:1.22
     working_directory: /home/circleci/go/src/github.com/tilt-dev/tilt-apiserver
     steps:
       - checkout
       - run: make test verify-generate
       - slack/notify-on-failure:
           only_for_branches: master
-        
+
 workflows:
   version: 2
   build:

diff --git a/go.mod b/go.mod
@@ -1,23 +1,25 @@
 module github.com/tilt-dev/tilt-apiserver
 
-go 1.21
+go 1.22.0
+
+toolchain go1.22.1
 
 require (
 	github.com/akutz/memconn v0.1.0
 	github.com/go-logr/logr v1.4.1
 	github.com/spf13/cobra v1.7.0
 	github.com/spf13/pflag v1.0.5
 	github.com/stretchr/testify v1.8.4
-	golang.org/x/sync v0.5.0
-	k8s.io/api v0.29.1
-	k8s.io/apimachinery v0.29.1
-	k8s.io/apiserver v0.29.1
-	k8s.io/client-go v0.29.1
-	k8s.io/code-generator v0.29.1
-	k8s.io/component-base v0.29.1
-	k8s.io/klog/v2 v2.110.1
-	k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00
-	sigs.k8s.io/controller-runtime v0.17.0
+	golang.org/x/sync v0.6.0
+	k8s.io/api v0.30.0
+	k8s.io/apimachinery v0.30.0
+	k8s.io/apiserver v0.30.0
+	k8s.io/client-go v0.30.0
+	k8s.io/code-generator v0.30.0
+	k8s.io/component-base v0.30.0
+	k8s.io/klog/v2 v2.120.1
+	k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340
+	sigs.k8s.io/controller-runtime v0.18.0
 	sigs.k8s.io/structured-merge-diff/v4 v4.4.1
 )
 
@@ -34,7 +36,7 @@ require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
 	github.com/emicklei/go-restful/v3 v3.11.0 // indirect
 	github.com/evanphx/json-patch v5.6.0+incompatible // indirect
-	github.com/evanphx/json-patch/v5 v5.8.0 // indirect
+	github.com/evanphx/json-patch/v5 v5.9.0 // indirect
 	github.com/felixge/httpsnoop v1.0.3 // indirect
 	github.com/fsnotify/fsnotify v1.7.0 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
@@ -44,8 +46,8 @@ require (
 	github.com/go-openapi/swag v0.22.3 // indirect
 	github.com/gogo/protobuf v1.3.2 // indirect
 	github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
-	github.com/golang/protobuf v1.5.3 // indirect
-	github.com/google/cel-go v0.17.7 // indirect
+	github.com/golang/protobuf v1.5.4 // indirect
+	github.com/google/cel-go v0.17.8 // indirect
 	github.com/google/gnostic-models v0.6.8 // indirect
 	github.com/google/go-cmp v0.6.0 // indirect
 	github.com/google/gofuzz v1.2.0 // indirect
@@ -82,16 +84,16 @@ require (
 	go.opentelemetry.io/proto/otlp v1.0.0 // indirect
 	go.uber.org/multierr v1.11.0 // indirect
 	go.uber.org/zap v1.26.0 // indirect
-	golang.org/x/crypto v0.17.0 // indirect
+	golang.org/x/crypto v0.21.0 // indirect
 	golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
-	golang.org/x/mod v0.14.0 // indirect
-	golang.org/x/net v0.19.0 // indirect
+	golang.org/x/mod v0.15.0 // indirect
+	golang.org/x/net v0.23.0 // indirect
 	golang.org/x/oauth2 v0.12.0 // indirect
-	golang.org/x/sys v0.16.0 // indirect
-	golang.org/x/term v0.15.0 // indirect
+	golang.org/x/sys v0.18.0 // indirect
+	golang.org/x/term v0.18.0 // indirect
 	golang.org/x/text v0.14.0 // indirect
 	golang.org/x/time v0.3.0 // indirect
-	golang.org/x/tools v0.16.1 // indirect
+	golang.org/x/tools v0.18.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-20230803162519-f966b187b2e5 // indirect
@@ -103,11 +105,11 @@ require (
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
 	gopkg.in/yaml.v2 v2.4.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
-	k8s.io/apiextensions-apiserver v0.29.0 // indirect
-	k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 // indirect
-	k8s.io/kms v0.29.1 // indirect
+	k8s.io/apiextensions-apiserver v0.30.0 // indirect
+	k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
+	k8s.io/kms v0.30.0 // indirect
 	k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
-	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 // indirect
+	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect
 	sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
 	sigs.k8s.io/yaml v1.4.0 // indirect
 )
diff --git a/go.sum b/go.sum
diff --git a/hack/api_violations.list b/hack/api_violations.list
@@ -1,30 +1,3 @@
-API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,APIGroup,ServerAddressByClientCIDRs
-API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,APIGroup,Versions
-API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,APIGroupList,Groups
-API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,APIResource,Categories
-API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,APIResource,ShortNames
-API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,APIResourceList,APIResources
-API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,APIVersions,ServerAddressByClientCIDRs
-API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,APIVersions,Versions
-API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,ApplyOptions,DryRun
-API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,CreateOptions,DryRun
-API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,DeleteOptions,DryRun
-API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,FieldsV1,Raw
-API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,LabelSelector,MatchExpressions
-API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,LabelSelectorRequirement,Values
-API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,ObjectMeta,Finalizers
-API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,ObjectMeta,ManagedFields
-API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,ObjectMeta,OwnerReferences
-API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,PatchOptions,DryRun
-API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,RootPaths,Paths
-API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,StatusDetails,Causes
-API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,Table,ColumnDefinitions
-API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,Table,Rows
-API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,TableRow,Cells
-API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,TableRow,Conditions
-API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,UpdateOptions,DryRun
-API rule violation: list_type_missing,k8s.io/apimachinery/pkg/runtime,RawExtension,Raw
-API rule violation: list_type_missing,k8s.io/apimachinery/pkg/runtime,Unknown,Raw
 API rule violation: names_match,k8s.io/apimachinery/pkg/apis/meta/v1,APIResourceList,APIResources
 API rule violation: names_match,k8s.io/apimachinery/pkg/apis/meta/v1,Duration,Duration
 API rule violation: names_match,k8s.io/apimachinery/pkg/apis/meta/v1,InternalEvent,Object

diff --git a/hack/hack.go b/hack/hack.go
@@ -0,0 +1,8 @@
+//go:build tools
+// +build tools
+
+package hack
+
+import (
+	_ "k8s.io/kube-openapi/cmd/openapi-gen"
+)
diff --git a/hack/update-codegen-helper.sh b/hack/update-codegen-helper.sh
@@ -17,6 +17,7 @@
 set -o errexit
 set -o nounset
 set -o pipefail
+set -x
 
 GOPATH=$(go env GOPATH)
 export GOPATH
@@ -27,29 +28,29 @@ git config --global --add safe.directory /go/src/github.com/tilt-dev/tilt-apiser
 
 source "${CODEGEN_PKG}/kube_codegen.sh"
 
-rm pkg/apis/**/zz_generated*
+rm -fR pkg/apis/**/zz_generated*
 kube::codegen::gen_helpers \
-  --input-pkg-root github.com/tilt-dev/tilt-apiserver/pkg/apis \
-  --output-base "$(dirname "${BASH_SOURCE[0]}")/../../../.." \
-  --boilerplate "${SCRIPT_ROOT}"/hack/boilerplate.go.txt
+  --boilerplate "${SCRIPT_ROOT}"/hack/boilerplate.go.txt \
+  ./pkg/apis
 
 rm -fR pkg/generated
 mkdir -p pkg/generated
 kube::codegen::gen_client \
   --with-watch \
   --with-applyconfig \
-  --input-pkg-root github.com/tilt-dev/tilt-apiserver/pkg/apis \
-  --output-pkg-root github.com/tilt-dev/tilt-apiserver/pkg/generated \
-  --output-base "$(dirname "${BASH_SOURCE[0]}")/../../../.." \
-  --boilerplate "${SCRIPT_ROOT}"/hack/boilerplate.go.txt
+  --output-pkg github.com/tilt-dev/tilt-apiserver/pkg/generated \
+  --output-dir ./pkg/generated \
+  --boilerplate "${SCRIPT_ROOT}"/hack/boilerplate.go.txt \
+  ./pkg/apis
 
+mkdir -p pkg/generated/openapi
 kube::codegen::gen_openapi \
-  --input-pkg-root github.com/tilt-dev/tilt-apiserver/pkg/apis \
-  --output-pkg-root github.com/tilt-dev/tilt-apiserver/pkg/generated \
-  --output-base "$(dirname "${BASH_SOURCE[0]}")/../../../.." \
+  --output-pkg github.com/tilt-dev/tilt-apiserver/pkg/generated/openapi \
+  --output-dir ./pkg/generated/openapi \
   --report-filename "${SCRIPT_ROOT}"/hack/api_violations.list \
   --update-report \
-  --boilerplate "${SCRIPT_ROOT}"/hack/boilerplate.go.txt
+  --boilerplate "${SCRIPT_ROOT}"/hack/boilerplate.go.txt \
+  ./pkg/apis
 
 if [[ "$CODEGEN_UID" != "$(id -u)" ]]; then
     groupadd --gid "$CODEGEN_GID" codegen-user