Skip to content

Commit 6bdf5b5

Browse files
liangyuanpengliangyuanpeng
committed
Update to Kubernetes v1.28.4 And update go version to 1.20
- bump k8s.io packages to v0.28.4 - bump sigs.k8s.io/kustomize to v5.2.1 - bump sigs.k8s.io/controller-runtime to v0.16.3 - bump sigs.k8s.io/yaml to v1.4.0 - migrate from google/gnostic to google/gnostic-models Signed-off-by: Lan Liang <[email protected]>
1 parent 8964a66 commit 6bdf5b5

File tree

4 files changed

+121
-118
lines changed

4 files changed

+121
-118
lines changed

‎Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ export PATH := $(MYGOBIN):$(PATH)
1010
all: generate license fix vet fmt test lint tidy
1111

1212
"$(MYGOBIN)/stringer":
13-
go install golang.org/x/tools/cmd/stringer@v0.1.10
13+
go install golang.org/x/tools/cmd/stringer@v0.12.0
1414

1515
"$(MYGOBIN)/addlicense":
1616
go install github.com/google/[email protected]

‎go.mod

Lines changed: 38 additions & 34 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module sigs.k8s.io/cli-utils
22

3-
go 1.18
3+
go 1.20
44

55
require (
66
github.com/google/go-cmp v0.5.9
@@ -11,20 +11,22 @@ require (
1111
github.com/spyzhov/ajson v0.9.0
1212
github.com/stretchr/testify v1.8.4
1313
gopkg.in/yaml.v3 v3.0.1
14-
k8s.io/api v0.27.2
15-
k8s.io/apiextensions-apiserver v0.27.2
16-
k8s.io/apimachinery v0.27.2
17-
k8s.io/cli-runtime v0.27.2
18-
k8s.io/client-go v0.27.2
19-
k8s.io/component-base v0.27.2
20-
k8s.io/klog/v2 v2.90.1
21-
k8s.io/kubectl v0.27.2
14+
k8s.io/api v0.28.4
15+
k8s.io/apiextensions-apiserver v0.28.4
16+
k8s.io/apimachinery v0.28.4
17+
k8s.io/cli-runtime v0.28.4
18+
k8s.io/client-go v0.28.4
19+
k8s.io/component-base v0.28.4
20+
k8s.io/klog/v2 v2.100.1
21+
k8s.io/kubectl v0.28.4
2222
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
23-
sigs.k8s.io/controller-runtime v0.15.0
24-
sigs.k8s.io/kustomize/kyaml v0.14.1
25-
sigs.k8s.io/yaml v1.3.0
23+
sigs.k8s.io/controller-runtime v0.16.3
24+
sigs.k8s.io/kustomize/kyaml v0.15.0
25+
sigs.k8s.io/yaml v1.4.0
2626
)
2727

28+
require gopkg.in/evanphx/json-patch.v5 v5.6.0 // indirect
29+
2830
require (
2931
github.com/Azure/go-ansiterm v0.0.0-20210617225240-d185dfc1b5a1 // indirect
3032
github.com/MakeNowJust/heredoc v1.0.0 // indirect
@@ -33,37 +35,37 @@ require (
3335
github.com/cespare/xxhash/v2 v2.2.0 // indirect
3436
github.com/chai2010/gettext-go v1.0.2 // indirect
3537
github.com/davecgh/go-spew v1.1.1 // indirect
36-
github.com/emicklei/go-restful/v3 v3.9.0 // indirect
37-
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
38+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
39+
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
3840
github.com/evanphx/json-patch/v5 v5.6.0 // indirect
3941
github.com/exponent-io/jsonpath v0.0.0-20151013193312-d6023ce2651d // indirect
4042
github.com/fatih/camelcase v1.0.0 // indirect
4143
github.com/fsnotify/fsnotify v1.6.0 // indirect
42-
github.com/fvbommel/sortorder v1.0.1 // indirect
44+
github.com/fvbommel/sortorder v1.1.0 // indirect
4345
github.com/go-errors/errors v1.4.2 // indirect
4446
github.com/go-logr/logr v1.2.4 // indirect
4547
github.com/go-openapi/jsonpointer v0.19.6 // indirect
46-
github.com/go-openapi/jsonreference v0.20.1 // indirect
48+
github.com/go-openapi/jsonreference v0.20.2 // indirect
4749
github.com/go-openapi/swag v0.22.3 // indirect
4850
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
4951
github.com/gogo/protobuf v1.3.2 // indirect
5052
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
5153
github.com/golang/protobuf v1.5.3 // indirect
5254
github.com/google/btree v1.0.1 // indirect
53-
github.com/google/gnostic v0.5.7-v3refs // indirect
54-
github.com/google/gofuzz v1.1.0 // indirect
55+
github.com/google/gnostic-models v0.6.8 // indirect
56+
github.com/google/gofuzz v1.2.0 // indirect
5557
github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
5658
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
5759
github.com/gregjones/httpcache v0.0.0-20180305231024-9cad4c3443a7 // indirect
58-
github.com/imdario/mergo v0.3.12 // indirect
60+
github.com/imdario/mergo v0.3.13 // indirect
5961
github.com/inconshreveable/mousetrap v1.1.0 // indirect
6062
github.com/jonboulle/clockwork v0.2.2 // indirect
6163
github.com/josharian/intern v1.0.0 // indirect
6264
github.com/json-iterator/go v1.1.12 // indirect
6365
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
6466
github.com/mailru/easyjson v0.7.7 // indirect
6567
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
66-
github.com/mitchellh/go-wordwrap v1.0.0 // indirect
68+
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
6769
github.com/moby/spdystream v0.2.0 // indirect
6870
github.com/moby/term v0.0.0-20221205130635-1aeaba878587 // indirect
6971
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
@@ -73,28 +75,30 @@ require (
7375
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
7476
github.com/pkg/errors v0.9.1 // indirect
7577
github.com/pmezard/go-difflib v1.0.0 // indirect
76-
github.com/prometheus/client_golang v1.15.1 // indirect
78+
github.com/prometheus/client_golang v1.16.0 // indirect
7779
github.com/prometheus/client_model v0.4.0 // indirect
78-
github.com/prometheus/common v0.42.0 // indirect
79-
github.com/prometheus/procfs v0.9.0 // indirect
80+
github.com/prometheus/common v0.44.0 // indirect
81+
github.com/prometheus/procfs v0.10.1 // indirect
8082
github.com/russross/blackfriday/v2 v2.1.0 // indirect
8183
github.com/spf13/pflag v1.0.5 // indirect
82-
github.com/xlab/treeprint v1.1.0 // indirect
83-
go.starlark.net v0.0.0-20200306205701-8dd3e2ee1dd5 // indirect
84-
golang.org/x/net v0.12.0 // indirect
85-
golang.org/x/oauth2 v0.5.0 // indirect
86-
golang.org/x/sys v0.10.0 // indirect
87-
golang.org/x/term v0.10.0 // indirect
88-
golang.org/x/text v0.11.0 // indirect
84+
github.com/xlab/treeprint v1.2.0 // indirect
85+
go.starlark.net v0.0.0-20230525235612-a134d8f9ddca // indirect
86+
golang.org/x/exp v0.0.0-20220722155223-a9213eeb770e // indirect
87+
golang.org/x/net v0.17.0 // indirect
88+
golang.org/x/oauth2 v0.8.0 // indirect
89+
golang.org/x/sync v0.2.0 // indirect
90+
golang.org/x/sys v0.13.0 // indirect
91+
golang.org/x/term v0.13.0 // indirect
92+
golang.org/x/text v0.13.0 // indirect
8993
golang.org/x/time v0.3.0 // indirect
9094
golang.org/x/tools v0.9.3 // indirect
91-
gomodules.xyz/jsonpatch/v2 v2.3.0 // indirect
95+
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
9296
google.golang.org/appengine v1.6.7 // indirect
93-
google.golang.org/protobuf v1.30.0 // indirect
97+
google.golang.org/protobuf v1.31.0 // indirect
9498
gopkg.in/inf.v0 v0.9.1 // indirect
9599
gopkg.in/yaml.v2 v2.4.0 // indirect
96-
k8s.io/kube-openapi v0.0.0-20230501164219-8b0f38b5fd1f // indirect
100+
k8s.io/kube-openapi v0.0.0-20230717233707-2695361300d9 // indirect
97101
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
98-
sigs.k8s.io/kustomize/api v0.13.2 // indirect
102+
sigs.k8s.io/kustomize/api v0.15.0 // indirect
99103
sigs.k8s.io/structured-merge-diff/v4 v4.2.3 // indirect
100104
)

0 commit comments

Comments
 (0)