Skip to content

Commit 184a8e7

Browse files
kcp-ci-botkcp-ci-bot
authored
Merge pull request #90 from embik/1.30-prep
✨ Update to Kubernetes 1.30.0
2 parents 5e70bdd + 2507f02 commit 184a8e7

File tree

168 files changed

+426
-821
lines changed

Some content is hidden

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

168 files changed

+426
-821
lines changed

‎.prow.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ presubmits:
77
preset-goproxy: "true"
88
spec:
99
containers:
10-
- image: ghcr.io/kcp-dev/infra/build:1.20.13-1
10+
- image: ghcr.io/kcp-dev/infra/build:1.22.2-1
1111
command:
1212
- make
1313
- verify-codegen
@@ -21,7 +21,7 @@ presubmits:
2121
preset-goproxy: "true"
2222
spec:
2323
containers:
24-
- image: ghcr.io/kcp-dev/infra/build:1.20.13-1
24+
- image: ghcr.io/kcp-dev/infra/build:1.22.2-1
2525
command:
2626
- make
2727
- lint
@@ -34,7 +34,7 @@ presubmits:
3434
preset-goproxy: "true"
3535
spec:
3636
containers:
37-
- image: ghcr.io/kcp-dev/infra/build:1.20.13-1
37+
- image: ghcr.io/kcp-dev/infra/build:1.22.2-1
3838
command:
3939
- make
4040
- test

‎Makefile

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,22 @@ TOOLS_DIR=hack/tools
2020
GOBIN_DIR := $(abspath $(TOOLS_DIR))
2121
TMPDIR := $(shell mktemp -d)
2222

23-
CONTROLLER_GEN_VER := v0.8.0
23+
CONTROLLER_GEN_VER := v0.15.0
2424
CONTROLLER_GEN_BIN := controller-gen
2525
CONTROLLER_GEN := $(GOBIN_DIR)/$(CONTROLLER_GEN_BIN)-$(CONTROLLER_GEN_VER)
2626
export CONTROLLER_GEN
2727

28-
GOLANGCI_LINT_VER := v1.54.2
28+
GOLANGCI_LINT_VER := v1.58.1
2929
GOLANGCI_LINT_BIN := golangci-lint
3030
GOLANGCI_LINT := $(GOBIN_DIR)/$(GOLANGCI_LINT_BIN)-$(GOLANGCI_LINT_VER)
3131

32-
KUBE_CLIENT_GEN_VER := v0.28.1
32+
KUBE_CLIENT_GEN_VER := v0.30.0
3333
KUBE_CLIENT_GEN_BIN := client-gen
34-
KUBE_LISTER_GEN_VER := v0.28.1
34+
KUBE_LISTER_GEN_VER := v0.30.0
3535
KUBE_LISTER_GEN_BIN := lister-gen
36-
KUBE_INFORMER_GEN_VER := v0.28.1
36+
KUBE_INFORMER_GEN_VER := v0.30.0
3737
KUBE_INFORMER_GEN_BIN := informer-gen
38-
KUBE_APPLYCONFIGURATION_GEN_VER := v0.28.1
38+
KUBE_APPLYCONFIGURATION_GEN_VER := v0.30.0
3939
KUBE_APPLYCONFIGURATION_GEN_BIN := applyconfiguration-gen
4040

4141
KUBE_CLIENT_GEN := $(GOBIN_DIR)/$(KUBE_CLIENT_GEN_BIN)-$(KUBE_CLIENT_GEN_VER)
@@ -47,7 +47,7 @@ export KUBE_INFORMER_GEN
4747
KUBE_APPLYCONFIGURATION_GEN := $(GOBIN_DIR)/$(KUBE_APPLYCONFIGURATION_GEN_BIN)-$(KUBE_APPLYCONFIGURATION_GEN_VER)
4848
export KUBE_APPLYCONFIGURATION_GEN
4949

50-
OPENSHIFT_GOIMPORTS_VER := c72f1dc2e3aacfa00aece3391d938c9bc734e791
50+
OPENSHIFT_GOIMPORTS_VER := c70783e636f2213cac683f6865d88c5edace3157
5151
OPENSHIFT_GOIMPORTS_BIN := openshift-goimports
5252
OPENSHIFT_GOIMPORTS := $(TOOLS_DIR)/$(OPENSHIFT_GOIMPORTS_BIN)-$(OPENSHIFT_GOIMPORTS_VER)
5353
export OPENSHIFT_GOIMPORTS # so hack scripts can use it

‎examples/go.mod

Lines changed: 31 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,55 +1,54 @@
11
module acme.corp
22

3-
go 1.19
3+
go 1.22.0
44

55
replace acme.corp/pkg => ./pkg
66

77
require (
8-
github.com/kcp-dev/apimachinery/v2 v2.0.0-alpha.0
9-
github.com/kcp-dev/client-go v0.0.0-20221215092857-c1e5154a9825
10-
github.com/kcp-dev/logicalcluster/v3 v3.0.0
11-
k8s.io/apimachinery v0.25.2
12-
k8s.io/client-go v0.25.2
13-
sigs.k8s.io/structured-merge-diff/v4 v4.2.3
8+
github.com/kcp-dev/apimachinery/v2 v2.0.0-alpha.0.0.20240510131959-2fa3992332d0
9+
github.com/kcp-dev/client-go v0.0.0-20230927101349-0416c830e3b1
10+
github.com/kcp-dev/logicalcluster/v3 v3.0.4
11+
k8s.io/apimachinery v0.30.0
12+
k8s.io/client-go v0.30.0
13+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1
1414
)
1515

1616
require (
17-
github.com/PuerkitoBio/purell v1.1.1 // indirect
18-
github.com/PuerkitoBio/urlesc v0.0.0-20170810143723-de5bf2ad4578 // indirect
1917
github.com/davecgh/go-spew v1.1.1 // indirect
20-
github.com/emicklei/go-restful/v3 v3.8.0 // indirect
21-
github.com/evanphx/json-patch v4.12.0+incompatible // indirect
22-
github.com/go-logr/logr v1.2.3 // indirect
23-
github.com/go-openapi/jsonpointer v0.19.5 // indirect
24-
github.com/go-openapi/jsonreference v0.19.5 // indirect
25-
github.com/go-openapi/swag v0.19.14 // indirect
18+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
19+
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
20+
github.com/go-logr/logr v1.4.1 // indirect
21+
github.com/go-openapi/jsonpointer v0.19.6 // indirect
22+
github.com/go-openapi/jsonreference v0.20.2 // indirect
23+
github.com/go-openapi/swag v0.22.3 // indirect
2624
github.com/gogo/protobuf v1.3.2 // indirect
27-
github.com/golang/protobuf v1.5.2 // indirect
28-
github.com/google/gnostic v0.5.7-v3refs // indirect
29-
github.com/google/go-cmp v0.5.8 // indirect
30-
github.com/google/gofuzz v1.1.0 // indirect
25+
github.com/golang/protobuf v1.5.4 // indirect
26+
github.com/google/gnostic-models v0.6.8 // indirect
27+
github.com/google/go-cmp v0.6.0 // indirect
28+
github.com/google/gofuzz v1.2.0 // indirect
29+
github.com/google/uuid v1.3.0 // indirect
3130
github.com/josharian/intern v1.0.0 // indirect
3231
github.com/json-iterator/go v1.1.12 // indirect
33-
github.com/mailru/easyjson v0.7.6 // indirect
32+
github.com/mailru/easyjson v0.7.7 // indirect
3433
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
3534
github.com/modern-go/reflect2 v1.0.2 // indirect
3635
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
3736
github.com/pkg/errors v0.9.1 // indirect
38-
golang.org/x/net v0.0.0-20220722155237-a158d28d115b // indirect
39-
golang.org/x/oauth2 v0.0.0-20211104180415-d3ed0bb246c8 // indirect
40-
golang.org/x/sys v0.0.0-20220722155257-8c9f86f7a55f // indirect
41-
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
42-
golang.org/x/text v0.3.7 // indirect
43-
golang.org/x/time v0.0.0-20220210224613-90d013bbcef8 // indirect
37+
golang.org/x/net v0.23.0 // indirect
38+
golang.org/x/oauth2 v0.10.0 // indirect
39+
golang.org/x/sys v0.18.0 // indirect
40+
golang.org/x/term v0.18.0 // indirect
41+
golang.org/x/text v0.14.0 // indirect
42+
golang.org/x/time v0.3.0 // indirect
4443
google.golang.org/appengine v1.6.7 // indirect
45-
google.golang.org/protobuf v1.28.0 // indirect
44+
google.golang.org/protobuf v1.33.0 // indirect
4645
gopkg.in/inf.v0 v0.9.1 // indirect
4746
gopkg.in/yaml.v2 v2.4.0 // indirect
4847
gopkg.in/yaml.v3 v3.0.1 // indirect
49-
k8s.io/api v0.25.2 // indirect
50-
k8s.io/klog/v2 v2.70.1 // indirect
51-
k8s.io/kube-openapi v0.0.0-20220803162953-67bda5d908f1 // indirect
52-
k8s.io/utils v0.0.0-20220728103510-ee6ede2d64ed // indirect
53-
sigs.k8s.io/json v0.0.0-20220713155537-f223a00ba0e2 // indirect
48+
k8s.io/api v0.30.0 // indirect
49+
k8s.io/klog/v2 v2.120.1 // indirect
50+
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
51+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
52+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
5453
sigs.k8s.io/yaml v1.3.0 // indirect
5554
)

0 commit comments

Comments
 (0)