Skip to content

Commit cd963f0

Browse files
kcp-ci-botkcp-ci-bot
authored
Merge pull request #92 from mjudeikis/1.31.0-prep
✨ k/k 1.31.0 rebase
2 parents b529ed3 + b352bc4 commit cd963f0

File tree

172 files changed

+2079
-2665
lines changed

Some content is hidden

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

172 files changed

+2079
-2665
lines changed

‎.gitignore‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,3 +20,11 @@ vendor/
2020

2121
hack/tools
2222

23+
examples/bin/applyconfiguration-gen
24+
examples/bin/client-gen
25+
examples/bin/conversion-gen
26+
examples/bin/deepcopy-gen
27+
examples/bin/defaulter-gen
28+
examples/bin/informer-gen
29+
examples/bin/lister-gen
30+
examples/bin/openapi-gen

‎Makefile‎

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

23-
CONTROLLER_GEN_VER := v0.15.0
23+
CONTROLLER_GEN_VER := v0.16.1
2424
CONTROLLER_GEN_BIN := controller-gen
2525
CONTROLLER_GEN := $(GOBIN_DIR)/$(CONTROLLER_GEN_BIN)-$(CONTROLLER_GEN_VER)
2626
export CONTROLLER_GEN
@@ -29,13 +29,13 @@ 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.30.0
32+
KUBE_CLIENT_GEN_VER := v0.31.0
3333
KUBE_CLIENT_GEN_BIN := client-gen
34-
KUBE_LISTER_GEN_VER := v0.30.0
34+
KUBE_LISTER_GEN_VER := v0.31.0
3535
KUBE_LISTER_GEN_BIN := lister-gen
36-
KUBE_INFORMER_GEN_VER := v0.30.0
36+
KUBE_INFORMER_GEN_VER := v0.31.0
3737
KUBE_INFORMER_GEN_BIN := informer-gen
38-
KUBE_APPLYCONFIGURATION_GEN_VER := v0.30.0
38+
KUBE_APPLYCONFIGURATION_GEN_VER := v0.31.0
3939
KUBE_APPLYCONFIGURATION_GEN_BIN := applyconfiguration-gen
4040

4141
KUBE_CLIENT_GEN := $(GOBIN_DIR)/$(KUBE_CLIENT_GEN_BIN)-$(KUBE_CLIENT_GEN_VER)

‎examples/go.mod‎

Lines changed: 19 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,47 +8,49 @@ require (
88
github.com/kcp-dev/apimachinery/v2 v2.0.0-alpha.0.0.20240510131959-2fa3992332d0
99
github.com/kcp-dev/client-go v0.0.0-20230927101349-0416c830e3b1
1010
github.com/kcp-dev/logicalcluster/v3 v3.0.4
11-
k8s.io/apimachinery v0.30.0
12-
k8s.io/client-go v0.30.0
11+
k8s.io/apimachinery v0.31.0
12+
k8s.io/client-go v0.31.0
1313
sigs.k8s.io/structured-merge-diff/v4 v4.4.1
1414
)
1515

1616
require (
17-
github.com/davecgh/go-spew v1.1.1 // indirect
17+
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
1818
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
1919
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
20-
github.com/go-logr/logr v1.4.1 // indirect
20+
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
21+
github.com/go-logr/logr v1.4.2 // indirect
2122
github.com/go-openapi/jsonpointer v0.19.6 // indirect
2223
github.com/go-openapi/jsonreference v0.20.2 // indirect
23-
github.com/go-openapi/swag v0.22.3 // indirect
24+
github.com/go-openapi/swag v0.22.4 // indirect
2425
github.com/gogo/protobuf v1.3.2 // indirect
2526
github.com/golang/protobuf v1.5.4 // indirect
2627
github.com/google/gnostic-models v0.6.8 // indirect
2728
github.com/google/go-cmp v0.6.0 // indirect
2829
github.com/google/gofuzz v1.2.0 // indirect
29-
github.com/google/uuid v1.3.0 // indirect
30+
github.com/google/uuid v1.6.0 // indirect
3031
github.com/josharian/intern v1.0.0 // indirect
3132
github.com/json-iterator/go v1.1.12 // indirect
3233
github.com/mailru/easyjson v0.7.7 // indirect
3334
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
3435
github.com/modern-go/reflect2 v1.0.2 // indirect
3536
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
3637
github.com/pkg/errors v0.9.1 // 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
38+
github.com/x448/float16 v0.8.4 // indirect
39+
golang.org/x/net v0.26.0 // indirect
40+
golang.org/x/oauth2 v0.21.0 // indirect
41+
golang.org/x/sys v0.21.0 // indirect
42+
golang.org/x/term v0.21.0 // indirect
43+
golang.org/x/text v0.16.0 // indirect
4244
golang.org/x/time v0.3.0 // indirect
43-
google.golang.org/appengine v1.6.7 // indirect
44-
google.golang.org/protobuf v1.33.0 // indirect
45+
google.golang.org/protobuf v1.34.2 // indirect
46+
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
4547
gopkg.in/inf.v0 v0.9.1 // indirect
4648
gopkg.in/yaml.v2 v2.4.0 // indirect
4749
gopkg.in/yaml.v3 v3.0.1 // indirect
48-
k8s.io/api v0.30.0 // indirect
49-
k8s.io/klog/v2 v2.120.1 // indirect
50+
k8s.io/api v0.31.0 // indirect
51+
k8s.io/klog/v2 v2.130.1 // indirect
5052
k8s.io/kube-openapi v0.0.0-20240228011516-70dd3763d340 // indirect
51-
k8s.io/utils v0.0.0-20230726121419-3b25d923346b // indirect
53+
k8s.io/utils v0.0.0-20240711033017-18e509b52bc8 // indirect
5254
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
53-
sigs.k8s.io/yaml v1.3.0 // indirect
55+
sigs.k8s.io/yaml v1.4.0 // indirect
5456
)

‎examples/go.sum‎

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

‎examples/pkg/apis/example/v1beta1/types.go‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@ package v1beta1
1919
import metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
2020

2121
// +genclient
22-
// +genclient:skipVerbs=list,watch
2322
// TestType is a top-level type. A client is created for it.
2423
// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
2524
type TestType struct {

‎examples/pkg/generated/applyconfigurations/example/v1/clustertesttype.go‎

Lines changed: 9 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/pkg/generated/applyconfigurations/example/v1/clustertesttypestatus.go‎

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/pkg/generated/applyconfigurations/example/v1/testtype.go‎

Lines changed: 9 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/pkg/generated/applyconfigurations/example/v1/withoutverbtype.go‎

Lines changed: 9 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎examples/pkg/generated/applyconfigurations/example/v1alpha1/clustertesttype.go‎

Lines changed: 9 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)