Skip to content

Commit 75657d7

Browse files
nicksnicks
authored
vendor: update to k8s 1.30 (#80)
Signed-off-by: Nick Santos <[email protected]>
1 parent 6e632f9 commit 75657d7

File tree

966 files changed

+91532
-20128
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

966 files changed

+91532
-20128
lines changed

‎.circleci/config.yml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,14 @@ orbs:
44
jobs:
55
build:
66
docker:
7-
- image: cimg/go:1.21
7+
- image: cimg/go:1.22
88
working_directory: /home/circleci/go/src/github.com/tilt-dev/tilt-apiserver
99
steps:
1010
- checkout
1111
- run: make test verify-generate
1212
- slack/notify-on-failure:
1313
only_for_branches: master
14-
14+
1515
workflows:
1616
version: 2
1717
build:

‎go.mod‎

Lines changed: 26 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,25 @@
11
module github.com/tilt-dev/tilt-apiserver
22

3-
go 1.21
3+
go 1.22.0
4+
5+
toolchain go1.22.1
46

57
require (
68
github.com/akutz/memconn v0.1.0
79
github.com/go-logr/logr v1.4.1
810
github.com/spf13/cobra v1.7.0
911
github.com/spf13/pflag v1.0.5
1012
github.com/stretchr/testify v1.8.4
11-
golang.org/x/sync v0.5.0
12-
k8s.io/api v0.29.1
13-
k8s.io/apimachinery v0.29.1
14-
k8s.io/apiserver v0.29.1
15-
k8s.io/client-go v0.29.1
16-
k8s.io/code-generator v0.29.1
17-
k8s.io/component-base v0.29.1
18-
k8s.io/klog/v2 v2.110.1
19-
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00
20-
sigs.k8s.io/controller-runtime v0.17.0
13+
golang.org/x/sync v0.6.0
14+
k8s.io/api v0.30.0
15+
k8s.io/apimachinery v0.30.0
16+
k8s.io/apiserver v0.30.0
17+
k8s.io/client-go v0.30.0
18+
k8s.io/code-generator v0.30.0
19+
k8s.io/component-base v0.30.0
20+
k8s.io/klog/v2 v2.120.1
21+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340
22+
sigs.k8s.io/controller-runtime v0.18.0
2123
sigs.k8s.io/structured-merge-diff/v4 v4.4.1
2224
)
2325

@@ -34,7 +36,7 @@ require (
3436
github.com/davecgh/go-spew v1.1.1 // indirect
3537
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
3638
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
37-
github.com/evanphx/json-patch/v5 v5.8.0 // indirect
39+
github.com/evanphx/json-patch/v5 v5.9.0 // indirect
3840
github.com/felixge/httpsnoop v1.0.3 // indirect
3941
github.com/fsnotify/fsnotify v1.7.0 // indirect
4042
github.com/go-logr/stdr v1.2.2 // indirect
@@ -44,8 +46,8 @@ require (
4446
github.com/go-openapi/swag v0.22.3 // indirect
4547
github.com/gogo/protobuf v1.3.2 // indirect
4648
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
47-
github.com/golang/protobuf v1.5.3 // indirect
48-
github.com/google/cel-go v0.17.7 // indirect
49+
github.com/golang/protobuf v1.5.4 // indirect
50+
github.com/google/cel-go v0.17.8 // indirect
4951
github.com/google/gnostic-models v0.6.8 // indirect
5052
github.com/google/go-cmp v0.6.0 // indirect
5153
github.com/google/gofuzz v1.2.0 // indirect
@@ -82,16 +84,16 @@ require (
8284
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
8385
go.uber.org/multierr v1.11.0 // indirect
8486
go.uber.org/zap v1.26.0 // indirect
85-
golang.org/x/crypto v0.17.0 // indirect
87+
golang.org/x/crypto v0.21.0 // indirect
8688
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
87-
golang.org/x/mod v0.14.0 // indirect
88-
golang.org/x/net v0.19.0 // indirect
89+
golang.org/x/mod v0.15.0 // indirect
90+
golang.org/x/net v0.23.0 // indirect
8991
golang.org/x/oauth2 v0.12.0 // indirect
90-
golang.org/x/sys v0.16.0 // indirect
91-
golang.org/x/term v0.15.0 // indirect
92+
golang.org/x/sys v0.18.0 // indirect
93+
golang.org/x/term v0.18.0 // indirect
9294
golang.org/x/text v0.14.0 // indirect
9395
golang.org/x/time v0.3.0 // indirect
94-
golang.org/x/tools v0.16.1 // indirect
96+
golang.org/x/tools v0.18.0 // indirect
9597
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
9698
google.golang.org/appengine v1.6.7 // indirect
9799
google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect
@@ -103,11 +105,11 @@ require (
103105
gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
104106
gopkg.in/yaml.v2 v2.4.0 // indirect
105107
gopkg.in/yaml.v3 v3.0.1 // indirect
106-
k8s.io/apiextensions-apiserver v0.29.0 // indirect
107-
k8s.io/gengo v0.0.0-20230829151522-9cce18d56c01 // indirect
108-
k8s.io/kms v0.29.1 // indirect
108+
k8s.io/apiextensions-apiserver v0.30.0 // indirect
109+
k8s.io/gengo/v2 v2.0.0-20240228010128-51d4e06bde70 // indirect
110+
k8s.io/kms v0.30.0 // indirect
109111
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
110-
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.28.0 // indirect
112+
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.29.0 // indirect
111113
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
112114
sigs.k8s.io/yaml v1.4.0 // indirect
113115
)

‎go.sum‎

Lines changed: 50 additions & 63 deletions
Large diffs are not rendered by default.

‎hack/api_violations.list‎

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -1,30 +1,3 @@
1-
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,APIGroup,ServerAddressByClientCIDRs
2-
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,APIGroup,Versions
3-
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,APIGroupList,Groups
4-
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,APIResource,Categories
5-
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,APIResource,ShortNames
6-
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,APIResourceList,APIResources
7-
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,APIVersions,ServerAddressByClientCIDRs
8-
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,APIVersions,Versions
9-
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,ApplyOptions,DryRun
10-
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,CreateOptions,DryRun
11-
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,DeleteOptions,DryRun
12-
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,FieldsV1,Raw
13-
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,LabelSelector,MatchExpressions
14-
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,LabelSelectorRequirement,Values
15-
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,ObjectMeta,Finalizers
16-
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,ObjectMeta,ManagedFields
17-
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,ObjectMeta,OwnerReferences
18-
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,PatchOptions,DryRun
19-
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,RootPaths,Paths
20-
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,StatusDetails,Causes
21-
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,Table,ColumnDefinitions
22-
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,Table,Rows
23-
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,TableRow,Cells
24-
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,TableRow,Conditions
25-
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/apis/meta/v1,UpdateOptions,DryRun
26-
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/runtime,RawExtension,Raw
27-
API rule violation: list_type_missing,k8s.io/apimachinery/pkg/runtime,Unknown,Raw
281
API rule violation: names_match,k8s.io/apimachinery/pkg/apis/meta/v1,APIResourceList,APIResources
292
API rule violation: names_match,k8s.io/apimachinery/pkg/apis/meta/v1,Duration,Duration
303
API rule violation: names_match,k8s.io/apimachinery/pkg/apis/meta/v1,InternalEvent,Object

‎hack/hack.go‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
//go:build tools
2+
// +build tools
3+
4+
package hack
5+
6+
import (
7+
_ "k8s.io/kube-openapi/cmd/openapi-gen"
8+
)

‎hack/update-codegen-helper.sh‎

Lines changed: 13 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
set -o errexit
1818
set -o nounset
1919
set -o pipefail
20+
set -x
2021

2122
GOPATH=$(go env GOPATH)
2223
export GOPATH
@@ -27,29 +28,29 @@ git config --global --add safe.directory /go/src/github.com/tilt-dev/tilt-apiser
2728

2829
source "${CODEGEN_PKG}/kube_codegen.sh"
2930

30-
rm pkg/apis/**/zz_generated*
31+
rm -fR pkg/apis/**/zz_generated*
3132
kube::codegen::gen_helpers \
32-
--input-pkg-root github.com/tilt-dev/tilt-apiserver/pkg/apis \
33-
--output-base "$(dirname "${BASH_SOURCE[0]}")/../../../.." \
34-
--boilerplate "${SCRIPT_ROOT}"/hack/boilerplate.go.txt
33+
--boilerplate "${SCRIPT_ROOT}"/hack/boilerplate.go.txt \
34+
./pkg/apis
3535

3636
rm -fR pkg/generated
3737
mkdir -p pkg/generated
3838
kube::codegen::gen_client \
3939
--with-watch \
4040
--with-applyconfig \
41-
--input-pkg-root github.com/tilt-dev/tilt-apiserver/pkg/apis \
42-
--output-pkg-root github.com/tilt-dev/tilt-apiserver/pkg/generated \
43-
--output-base "$(dirname "${BASH_SOURCE[0]}")/../../../.." \
44-
--boilerplate "${SCRIPT_ROOT}"/hack/boilerplate.go.txt
41+
--output-pkg github.com/tilt-dev/tilt-apiserver/pkg/generated \
42+
--output-dir ./pkg/generated \
43+
--boilerplate "${SCRIPT_ROOT}"/hack/boilerplate.go.txt \
44+
./pkg/apis
4545

46+
mkdir -p pkg/generated/openapi
4647
kube::codegen::gen_openapi \
47-
--input-pkg-root github.com/tilt-dev/tilt-apiserver/pkg/apis \
48-
--output-pkg-root github.com/tilt-dev/tilt-apiserver/pkg/generated \
49-
--output-base "$(dirname "${BASH_SOURCE[0]}")/../../../.." \
48+
--output-pkg github.com/tilt-dev/tilt-apiserver/pkg/generated/openapi \
49+
--output-dir ./pkg/generated/openapi \
5050
--report-filename "${SCRIPT_ROOT}"/hack/api_violations.list \
5151
--update-report \
52-
--boilerplate "${SCRIPT_ROOT}"/hack/boilerplate.go.txt
52+
--boilerplate "${SCRIPT_ROOT}"/hack/boilerplate.go.txt \
53+
./pkg/apis
5354

5455
if [[ "$CODEGEN_UID" != "$(id -u)" ]]; then
5556
groupadd --gid "$CODEGEN_GID" codegen-user

0 commit comments

Comments
 (0)