Skip to content

Commit 2e49c98

Browse files
Revert "Temporarily lock register-gen to 0.31.5"
This reverts commit 7eeaf07. Signed-off-by: Juan-Luis de Sousa-Valadas Castaño <[email protected]>
1 parent caa25ee commit 2e49c98

File tree

5 files changed

+9
-13
lines changed

5 files changed

+9
-13
lines changed

Makefile

+1-5
Original file line numberDiff line numberDiff line change
@@ -146,14 +146,10 @@ $(controller_gen_targets): $(GO_ENV_REQUISITES) hack/tools/boilerplate.go.txt ha
146146
touch -- '$@'
147147

148148
# Run register-gen for each API group version.
149-
# Usually register-gen should should be:
150-
# k8s.io/code-generator/cmd/register-gen@v$(kubernetes_version:1.%=0.%)
151-
# However, due to https://github.com/kubernetes/kubernetes/issues/129290 in 1.32.1 we
152-
# need to hardcode it to 0.31.5 instead of the appropriate 0.32.3.
153149
register_gen_targets := $(foreach gv,$(api_group_versions),pkg/apis/$(gv)/zz_generated.register.go)
154150
codegen_targets += $(register_gen_targets)
155151
$(register_gen_targets): $(GO_ENV_REQUISITES) hack/tools/boilerplate.go.txt embedded-bins/Makefile.variables
156-
CGO_ENABLED=0 $(GO) run k8s.io/code-generator/cmd/register-gen@v0.31.5 \
152+
CGO_ENABLED=0 $(GO) run k8s.io/code-generator/cmd/register-gen@v$(kubernetes_version:1.%=0.%) \
157153
--go-header-file=hack/tools/boilerplate.go.txt \
158154
--output-file='_$(notdir $@).tmp' \
159155
'github.com/k0sproject/k0s/$(dir $@)' || { \

pkg/apis/autopilot/v1beta2/zz_generated.register.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/apis/etcd/v1beta1/zz_generated.register.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/apis/helm/v1beta1/zz_generated.register.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

pkg/apis/k0s/v1beta1/zz_generated.register.go

+2-2
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)