Skip to content

Commit f38c94d

Browse files
authored
Merge pull request #3406 from xrstf/update-to-codegen-v3
Update to code-generator v3
2 parents f47fff2 + 08d127b commit f38c94d

File tree

224 files changed

+4996
-6318
lines changed

Some content is hidden

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

224 files changed

+4996
-6318
lines changed

.golangci.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@ linters-settings:
9292
- prefix(github.com/kcp-dev/kcp)
9393
- blank
9494
- dot
95-
skip-generated: true
95+
skip-generated: false
9696
gosec:
9797
excludes:
9898
- G307 # Deferring unsafe method "Close" on type "\*os.File"

Makefile

Lines changed: 5 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -67,11 +67,6 @@ LOGCHECK_BIN := logcheck
6767
LOGCHECK := $(TOOLS_GOBIN_DIR)/$(LOGCHECK_BIN)-$(LOGCHECK_VER)
6868
export LOGCHECK # so hack scripts can use it
6969

70-
CODE_GENERATOR_VER := 572c29375f0e63c13b31c70931914c420a0a9d59
71-
CODE_GENERATOR_BIN := code-generator
72-
CODE_GENERATOR := $(TOOLS_GOBIN_DIR)/$(CODE_GENERATOR_BIN)-$(CODE_GENERATOR_VER)
73-
export CODE_GENERATOR # so hack scripts can use it
74-
7570
KCP_APIGEN_BIN := apigen
7671
KCP_APIGEN_GEN := $(TOOLS_DIR)/$(KCP_APIGEN_BIN)
7772
export KCP_APIGEN_GEN # so hack scripts can use it
@@ -141,9 +136,6 @@ $(HTTEST):
141136
$(LOGCHECK):
142137
GOBIN=$(TOOLS_GOBIN_DIR) $(GO_INSTALL) sigs.k8s.io/logtools/logcheck $(LOGCHECK_BIN) $(LOGCHECK_VER)
143138

144-
$(CODE_GENERATOR):
145-
GOBIN=$(TOOLS_GOBIN_DIR) $(GO_INSTALL) github.com/kcp-dev/code-generator/v2 $(CODE_GENERATOR_BIN) $(CODE_GENERATOR_VER)
146-
147139
$(KCP_APIGEN_GEN):
148140
pushd . && cd sdk && GOBIN=$(TOOLS_GOBIN_DIR) go install ./cmd/apigen && popd
149141

@@ -190,7 +182,7 @@ vendor: ## Vendor the dependencies
190182
go mod vendor
191183
.PHONY: vendor
192184

193-
tools: $(GOLANGCI_LINT) $(HTTEST) $(CONTROLLER_GEN) $(KCP_APIGEN_GEN) $(YAML_PATCH) $(GOTESTSUM) $(CODE_GENERATOR) ## Install tools
185+
tools: $(GOLANGCI_LINT) $(HTTEST) $(CONTROLLER_GEN) $(KCP_APIGEN_GEN) $(YAML_PATCH) $(GOTESTSUM) ## Install tools
194186
.PHONY: tools
195187

196188
$(CONTROLLER_GEN):
@@ -206,7 +198,7 @@ crds: $(CONTROLLER_GEN) $(YAML_PATCH) ## Generate crds
206198
./hack/update-codegen-crds.sh
207199
.PHONY: crds
208200

209-
codegen: $(KCP_APIGEN_GEN) $(CODE_GENERATOR) crds ## Generate all
201+
codegen: $(KCP_APIGEN_GEN) crds ## Generate all
210202
go mod download
211203
./hack/update-codegen-clients.sh
212204
$(MAKE) imports
@@ -234,11 +226,11 @@ verify-codegen: ## Verify codegen
234226
.PHONY: imports
235227
imports: WHAT ?=
236228
imports: $(GOLANGCI_LINT) verify-go-versions
237-
@if [ -n "$(WHAT)" ]; then \
238-
$(GOLANGCI_LINT) run --enable-only=gci --fix --fast $(WHAT); \
229+
if [ -n "$(WHAT)" ]; then \
230+
$(GOLANGCI_LINT) run --enable-only=gci --fix --exclude-generated disable $(WHAT); \
239231
else \
240232
for MOD in . $$(git ls-files '**/go.mod' | sed 's,/go.mod,,'); do \
241-
(cd $$MOD; $(GOLANGCI_LINT) run --enable-only=gci --fix --fast); \
233+
(set -x; cd $$MOD; $(GOLANGCI_LINT) run --enable-only=gci --fix --exclude-generated disable); \
242234
done; \
243235
fi
244236

cli/go.mod

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ go 1.23.0
44

55
require (
66
github.com/google/go-cmp v0.7.0
7-
github.com/kcp-dev/client-go v0.0.0-20250425130236-70c5eb2b671e
7+
github.com/kcp-dev/client-go v0.0.0-20250512170835-5457a0f4bd98
88
github.com/kcp-dev/kcp/sdk v0.0.0-00010101000000-000000000000
99
github.com/kcp-dev/logicalcluster/v3 v3.0.5
1010
github.com/spf13/cobra v1.9.1
@@ -25,7 +25,6 @@ require (
2525
github.com/blang/semver/v4 v4.0.0 // indirect
2626
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc // indirect
2727
github.com/emicklei/go-restful/v3 v3.12.1 // indirect
28-
github.com/evanphx/json-patch v5.6.0+incompatible // indirect
2928
github.com/fxamacker/cbor/v2 v2.7.0 // indirect
3029
github.com/go-errors/errors v1.4.2 // indirect
3130
github.com/go-logr/logr v1.4.2 // indirect
@@ -43,7 +42,7 @@ require (
4342
github.com/inconshreveable/mousetrap v1.1.0 // indirect
4443
github.com/josharian/intern v1.0.0 // indirect
4544
github.com/json-iterator/go v1.1.12 // indirect
46-
github.com/kcp-dev/apimachinery/v2 v2.0.1-0.20250425065633-635c2a0fbaba // indirect
45+
github.com/kcp-dev/apimachinery/v2 v2.0.1-0.20250512171935-ebb573a40077 // indirect
4746
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
4847
github.com/mailru/easyjson v0.9.0 // indirect
4948
github.com/mattn/go-runewidth v0.0.12 // indirect
@@ -68,17 +67,17 @@ require (
6867
golang.org/x/text v0.24.0 // indirect
6968
golang.org/x/time v0.11.0 // indirect
7069
golang.org/x/tools v0.32.0 // indirect
71-
google.golang.org/protobuf v1.36.1 // indirect
70+
google.golang.org/protobuf v1.36.2 // indirect
7271
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
7372
gopkg.in/inf.v0 v0.9.1 // indirect
7473
gopkg.in/yaml.v3 v3.0.1 // indirect
7574
k8s.io/api v0.32.3 // indirect
76-
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
77-
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
78-
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
75+
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect
76+
k8s.io/utils v0.0.0-20241210054802-24370beab758 // indirect
77+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
7978
sigs.k8s.io/kustomize/api v0.18.0 // indirect
8079
sigs.k8s.io/kustomize/kyaml v0.18.1 // indirect
81-
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
80+
sigs.k8s.io/structured-merge-diff/v4 v4.5.0 // indirect
8281
sigs.k8s.io/yaml v1.4.0 // indirect
8382
)
8483

cli/go.sum

Lines changed: 20 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc h1:U9qPSI2PIWSS1
2323
github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
2424
github.com/emicklei/go-restful/v3 v3.12.1 h1:PJMDIM/ak7btuL8Ex0iYET9hxM3CI2sjZtzpL63nKAU=
2525
github.com/emicklei/go-restful/v3 v3.12.1/go.mod h1:6n3XBCmQQb25CM2LCACGz8ukIrRry+4bhvbpWn3mrbc=
26-
github.com/evanphx/json-patch v5.6.0+incompatible h1:jBYDEEiFBPxA0v50tFdvOzQQTCvpL6mnFh5mB2/l16U=
27-
github.com/evanphx/json-patch v5.6.0+incompatible/go.mod h1:50XU6AFN0ol/bzJsmQLiYLvXMP4fmwYFNcr97nuDLSk=
2826
github.com/fxamacker/cbor/v2 v2.7.0 h1:iM5WgngdRBanHcxugY4JySA0nk1wZorNOpTgCMedv5E=
2927
github.com/fxamacker/cbor/v2 v2.7.0/go.mod h1:pxXPTn3joSm21Gbwsv0w9OSA2y1HFR9qXEeXQVeNoDQ=
3028
github.com/go-errors/errors v1.4.2 h1:J6MZopCL4uSllY1OfXM374weqZFFItUbrImctkmUxIA=
@@ -69,10 +67,10 @@ github.com/josharian/intern v1.0.0 h1:vlS4z54oSdjm0bgjRigI+G1HpF+tI+9rE5LLzOg8Hm
6967
github.com/josharian/intern v1.0.0/go.mod h1:5DoeVV0s6jJacbCEi61lwdGj/aVlrQvzHFFd8Hwg//Y=
7068
github.com/json-iterator/go v1.1.12 h1:PV8peI4a0ysnczrg+LtxykD8LfKY9ML6u2jnxaEnrnM=
7169
github.com/json-iterator/go v1.1.12/go.mod h1:e30LSqwooZae/UwlEbR2852Gd8hjQvJoHmT4TnhNGBo=
72-
github.com/kcp-dev/apimachinery/v2 v2.0.1-0.20250425065633-635c2a0fbaba h1:Ar/8wsCQWrZgRiBF2B5xCqCXEA/oiiuDI0yEsUtrxRs=
73-
github.com/kcp-dev/apimachinery/v2 v2.0.1-0.20250425065633-635c2a0fbaba/go.mod h1:pYqnaSG3NlF/pVwfnYCAdGvrA7FpALFmd5S9X4XXf1Q=
74-
github.com/kcp-dev/client-go v0.0.0-20250425130236-70c5eb2b671e h1:xag3ZYuqw0gJsC8SEuotrI/5rhdNuAmNrRtIDh0bWfw=
75-
github.com/kcp-dev/client-go v0.0.0-20250425130236-70c5eb2b671e/go.mod h1:79pmlxmvE/hohqD/qvhKaaoXmNDF/uhKnnAO6Vf5hZk=
70+
github.com/kcp-dev/apimachinery/v2 v2.0.1-0.20250512171935-ebb573a40077 h1:lDi9nZ75ypmRJwDFXUN70Cdu8+HxAjPU1kcnn+l4MvI=
71+
github.com/kcp-dev/apimachinery/v2 v2.0.1-0.20250512171935-ebb573a40077/go.mod h1:jnMZxVnCuKlkIXc4J1Qtmy1Lyo171CDF/RQhNAo0tvA=
72+
github.com/kcp-dev/client-go v0.0.0-20250512170835-5457a0f4bd98 h1:A1Hc2zVGd9LRSQqlGGqfzin+4skWJVcsNXw2+MjU6z4=
73+
github.com/kcp-dev/client-go v0.0.0-20250512170835-5457a0f4bd98/go.mod h1:79pmlxmvE/hohqD/qvhKaaoXmNDF/uhKnnAO6Vf5hZk=
7674
github.com/kcp-dev/logicalcluster/v3 v3.0.5 h1:JbYakokb+5Uinz09oTXomSUJVQsqfxEvU4RyHUYxHOU=
7775
github.com/kcp-dev/logicalcluster/v3 v3.0.5/go.mod h1:EWBUBxdr49fUB1cLMO4nOdBWmYifLbP1LfoL20KkXYY=
7876
github.com/kisielk/errcheck v1.5.0/go.mod h1:pFxgyoBC7bSaBwPgfKdkLd5X25qrDl4LWUI2bnpBCr8=
@@ -117,8 +115,8 @@ github.com/prometheus/client_golang v1.20.5 h1:cxppBPuYhUnsO6yo/aoRol4L7q7UFfdm+
117115
github.com/prometheus/client_golang v1.20.5/go.mod h1:PIEt8X02hGcP8JWbeHyeZ53Y/jReSnHgO035n//V5WE=
118116
github.com/prometheus/client_model v0.6.1 h1:ZKSh/rekM+n3CeS952MLRAdFwIKqeY8b62p8ais2e9E=
119117
github.com/prometheus/client_model v0.6.1/go.mod h1:OrxVMOVHjw3lKMa8+x6HeMGkHMQyHDk9E3jmP2AmGiY=
120-
github.com/prometheus/common v0.60.1 h1:FUas6GcOw66yB/73KC+BOZoFJmbo/1pojoILArPAaSc=
121-
github.com/prometheus/common v0.60.1/go.mod h1:h0LYf1R1deLSKtD4Vdg8gy4RuOvENW2J/h19V5NADQw=
118+
github.com/prometheus/common v0.61.0 h1:3gv/GThfX0cV2lpO7gkTUwZru38mxevy90Bj8YFSRQQ=
119+
github.com/prometheus/common v0.61.0/go.mod h1:zr29OCN/2BsJRaFwG8QOBr41D6kkchKbpeNH7pAjb/s=
122120
github.com/prometheus/procfs v0.15.1 h1:YagwOFzUgYfKKHX6Dr+sHT7km/hxC76UB0learggepc=
123121
github.com/prometheus/procfs v0.15.1/go.mod h1:fB45yRUv8NstnjriLhBQLuOUt+WW4BsoGhij/e3PBqk=
124122
github.com/rivo/uniseg v0.1.0/go.mod h1:J6wj4VEh+S6ZtnVlnTBMWIodfgj8LQOQFoIToxlJtxc=
@@ -199,12 +197,12 @@ golang.org/x/xerrors v0.0.0-20191011141410-1b5146add898/go.mod h1:I/5z698sn9Ka8T
199197
golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
200198
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8TeJc9MKroUUfqBBauWjQqLJ2OPfmY0=
201199
google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80 h1:KAeGQVN3M9nD0/bQXnr/ClcEMJ968gUXJQ9pwfSynuQ=
202-
google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28 h1:M0KvPgPmDZHPlbRbaNU1APr28TvwvvdUPlSv7PUvy8g=
203-
google.golang.org/genproto/googleapis/api v0.0.0-20241104194629-dd2ea8efbc28/go.mod h1:dguCy7UOdZhTvLzDyt15+rOrawrpM4q7DD9dQ1P11P4=
204-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28 h1:XVhgTWWV3kGQlwJHR3upFWZeTsei6Oks1apkZSeonIE=
205-
google.golang.org/genproto/googleapis/rpc v0.0.0-20241104194629-dd2ea8efbc28/go.mod h1:GX3210XPVPUjJbTUbvwI8f2IpZDMZuPJWDzDuebbviI=
206-
google.golang.org/protobuf v1.36.1 h1:yBPeRvTftaleIgM3PZ/WBIZ7XM/eEYAaEyCwvyjq/gk=
207-
google.golang.org/protobuf v1.36.1/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
200+
google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422 h1:GVIKPyP/kLIyVOgOnTwFOrvQaQUzOzGMCxgFUOEmm24=
201+
google.golang.org/genproto/googleapis/api v0.0.0-20250106144421-5f5ef82da422/go.mod h1:b6h1vNKhxaSoEI+5jc3PJUCustfli/mRab7295pY7rw=
202+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250106144421-5f5ef82da422 h1:3UsHvIr4Wc2aW4brOaSCmcxh9ksica6fHEr8P1XhkYw=
203+
google.golang.org/genproto/googleapis/rpc v0.0.0-20250106144421-5f5ef82da422/go.mod h1:3ENsm/5D1mzDyhpzeRi1NR784I0BcofWBoSc5QqqMK4=
204+
google.golang.org/protobuf v1.36.2 h1:R8FeyR1/eLmkutZOM5CWghmo5itiG9z0ktFlTVLuTmU=
205+
google.golang.org/protobuf v1.36.2/go.mod h1:9fA7Ob0pmnwhb644+1+CVWFRbNajQ6iRojtC/QF5bRE=
208206
gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
209207
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
210208
gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
@@ -231,17 +229,17 @@ k8s.io/component-base v0.32.3 h1:98WJvvMs3QZ2LYHBzvltFSeJjEx7t5+8s71P7M74u8k=
231229
k8s.io/component-base v0.32.3/go.mod h1:LWi9cR+yPAv7cu2X9rZanTiFKB2kHA+JjmhkKjCZRpI=
232230
k8s.io/klog/v2 v2.130.1 h1:n9Xl7H1Xvksem4KFG4PYbdQCQxqc/tTUyrgXaOhHSzk=
233231
k8s.io/klog/v2 v2.130.1/go.mod h1:3Jpz1GvMt720eyJH1ckRHK1EDfpxISzJ7I9OYgaDtPE=
234-
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f h1:GA7//TjRY9yWGy1poLzYYJJ4JRdzg3+O6e8I+e+8T5Y=
235-
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f/go.mod h1:R/HEjbvWI0qdfb8viZUeVZm0X6IZnxAydC7YU42CMw4=
236-
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 h1:M3sRQVHv7vB20Xc2ybTt7ODCeFj6JSWYFzOFnYeS6Ro=
237-
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
238-
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 h1:/Rv+M11QRah1itp8VhT6HoVx1Ray9eB4DBr+K+/sCJ8=
239-
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3/go.mod h1:18nIHnGi6636UCz6m8i4DhaJ65T6EruyzmoQqI2BVDo=
232+
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 h1:hcha5B1kVACrLujCKLbr8XWMxCxzQx42DY8QKYJrDLg=
233+
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7/go.mod h1:GewRfANuJ70iYzvn+i4lezLDAFzvjxZYK1gn1lWcfas=
234+
k8s.io/utils v0.0.0-20241210054802-24370beab758 h1:sdbE21q2nlQtFh65saZY+rRM6x6aJJI8IUa1AmH/qa0=
235+
k8s.io/utils v0.0.0-20241210054802-24370beab758/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
236+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 h1:gBQPwqORJ8d8/YNZWEjoZs7npUVDpVXUUOFfW6CgAqE=
237+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8/go.mod h1:mdzfpAEoE6DHQEN0uh9ZbOCuHbLK5wOm7dK4ctXE9Tg=
240238
sigs.k8s.io/kustomize/api v0.18.0 h1:hTzp67k+3NEVInwz5BHyzc9rGxIauoXferXyjv5lWPo=
241239
sigs.k8s.io/kustomize/api v0.18.0/go.mod h1:f8isXnX+8b+SGLHQ6yO4JG1rdkZlvhaCf/uZbLVMb0U=
242240
sigs.k8s.io/kustomize/kyaml v0.18.1 h1:WvBo56Wzw3fjS+7vBjN6TeivvpbW9GmRaWZ9CIVmt4E=
243241
sigs.k8s.io/kustomize/kyaml v0.18.1/go.mod h1:C3L2BFVU1jgcddNBE1TxuVLgS46TjObMwW5FT9FcjYo=
244-
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 h1:MdmvkGuXi/8io6ixD5wud3vOLwc1rj0aNqRlpuvjmwA=
245-
sigs.k8s.io/structured-merge-diff/v4 v4.4.2/go.mod h1:N8f93tFZh9U6vpxwRArLiikrE5/2tiu1w1AGfACIGE4=
242+
sigs.k8s.io/structured-merge-diff/v4 v4.5.0 h1:nbCitCK2hfnhyiKo6uf2HxUPTCodY6Qaf85SbDIaMBk=
243+
sigs.k8s.io/structured-merge-diff/v4 v4.5.0/go.mod h1:N8f93tFZh9U6vpxwRArLiikrE5/2tiu1w1AGfACIGE4=
246244
sigs.k8s.io/yaml v1.4.0 h1:Mk1wCc2gy/F0THH0TAp1QYyJNzRm2KCLy3o5ASXVI5E=
247245
sigs.k8s.io/yaml v1.4.0/go.mod h1:Ejl7/uTz7PSA4eKMyQCUTnhZYNmLIl+5c2lQPGR2BPY=

docs/content/contributing/rebasing-kubernetes.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ onto v1.31.0
7777
4. Run `go mod tidy`.
7878
5. Update the kcp code-generator tooling version in the `Makefile`:
7979
1. Look up the latest commit from the main branch in https://github.com/kcp-dev/code-generator.
80-
2. Adjust `CODE_GENERATOR_VER` to match accordingly.
80+
2. Adjust `go.mod` accordingly.
8181
3. Manually review the code that is upstream from `third_party` and make the same/similar edits to anything that
8282
changed upstream.
8383
4. Run `make codegen`. You'll probably want to commit these changes as a standalone commit.

docs/generators/cli-doc/go.mod

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ require (
3838
github.com/inconshreveable/mousetrap v1.1.0 // indirect
3939
github.com/josharian/intern v1.0.0 // indirect
4040
github.com/json-iterator/go v1.1.12 // indirect
41-
github.com/kcp-dev/apimachinery/v2 v2.0.1-0.20250425065633-635c2a0fbaba // indirect
41+
github.com/kcp-dev/apimachinery/v2 v2.0.1-0.20250512171935-ebb573a40077 // indirect
4242
github.com/kcp-dev/kcp/sdk v0.0.0-00010101000000-000000000000 // indirect
4343
github.com/kcp-dev/logicalcluster/v3 v3.0.5 // indirect
4444
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de // indirect
@@ -64,7 +64,7 @@ require (
6464
golang.org/x/term v0.31.0 // indirect
6565
golang.org/x/text v0.24.0 // indirect
6666
golang.org/x/time v0.11.0 // indirect
67-
google.golang.org/protobuf v1.36.1 // indirect
67+
google.golang.org/protobuf v1.36.2 // indirect
6868
gopkg.in/evanphx/json-patch.v4 v4.12.0 // indirect
6969
gopkg.in/inf.v0 v0.9.1 // indirect
7070
gopkg.in/yaml.v3 v3.0.1 // indirect
@@ -75,11 +75,11 @@ require (
7575
k8s.io/client-go v0.32.3 // indirect
7676
k8s.io/component-base v0.32.3 // indirect
7777
k8s.io/klog/v2 v2.130.1 // indirect
78-
k8s.io/kube-openapi v0.0.0-20241105132330-32ad38e42d3f // indirect
79-
k8s.io/utils v0.0.0-20241104100929-3ea5e8cea738 // indirect
80-
sigs.k8s.io/json v0.0.0-20241010143419-9aa6b5e7a4b3 // indirect
78+
k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect
79+
k8s.io/utils v0.0.0-20241210054802-24370beab758 // indirect
80+
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
8181
sigs.k8s.io/kustomize/api v0.18.0 // indirect
8282
sigs.k8s.io/kustomize/kyaml v0.18.1 // indirect
83-
sigs.k8s.io/structured-merge-diff/v4 v4.4.2 // indirect
83+
sigs.k8s.io/structured-merge-diff/v4 v4.5.0 // indirect
8484
sigs.k8s.io/yaml v1.4.0 // indirect
8585
)

0 commit comments

Comments
 (0)