Skip to content

Commit 6e85629

Browse files
committed
Run code gen via Go 1.24 go tool
Signed-off-by: Mikkel Oscar Lyderik Larsen <mikkel.larsen@zalando.de>
1 parent b5b77c5 commit 6e85629

File tree

4 files changed

+17
-29
lines changed

4 files changed

+17
-29
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ $(GENERATED): go.mod $(CRD_TYPE_SOURCE)
3131
./hack/update-codegen.sh
3232

3333
$(GENERATED_CRDS): $(GENERATED) $(CRD_SOURCES)
34-
go run sigs.k8s.io/controller-tools/cmd/controller-gen crd:crdVersions=v1 paths=./pkg/apis/... output:crd:dir=docs
34+
go tool controller-gen crd:crdVersions=v1 paths=./pkg/apis/... output:crd:dir=docs
3535
go run hack/crd/trim.go < docs/zalando.org_elasticsearchdatasets.yaml > docs/zalando.org_elasticsearchdatasets_trimmed.yaml
3636
go run hack/crd/trim.go < docs/zalando.org_elasticsearchmetricsets.yaml > docs/zalando.org_elasticsearchmetricsets_trimmed.yaml
3737
mv docs/zalando.org_elasticsearchdatasets_trimmed.yaml docs/zalando.org_elasticsearchdatasets.yaml

go.mod

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,9 +11,7 @@ require (
1111
k8s.io/api v0.34.0
1212
k8s.io/apimachinery v0.34.0
1313
k8s.io/client-go v0.34.0
14-
k8s.io/code-generator v0.34.0
1514
k8s.io/metrics v0.33.5
16-
sigs.k8s.io/controller-tools v0.19.0
1715
sigs.k8s.io/yaml v1.6.0
1816
)
1917

@@ -69,15 +67,27 @@ require (
6967
gopkg.in/yaml.v2 v2.4.0 // indirect
7068
gopkg.in/yaml.v3 v3.0.1 // indirect
7169
k8s.io/apiextensions-apiserver v0.34.0 // indirect
70+
k8s.io/code-generator v0.34.0 // indirect
7271
k8s.io/gengo/v2 v2.0.0-20250604051438-85fd79dbfd9f // indirect
7372
k8s.io/klog/v2 v2.130.1 // indirect
7473
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b // indirect
7574
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397 // indirect
75+
sigs.k8s.io/controller-tools v0.19.0 // indirect
7676
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
7777
sigs.k8s.io/randfill v1.0.0 // indirect
7878
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
7979
)
8080

8181
replace k8s.io/klog => github.com/mikkeloscar/knolog v0.0.0-20190326191552-80742771eb6b
8282

83+
tool (
84+
k8s.io/code-generator
85+
k8s.io/code-generator/cmd/client-gen
86+
k8s.io/code-generator/cmd/deepcopy-gen
87+
k8s.io/code-generator/cmd/informer-gen
88+
k8s.io/code-generator/cmd/lister-gen
89+
k8s.io/kube-openapi/cmd/openapi-gen
90+
sigs.k8s.io/controller-tools/cmd/controller-gen
91+
)
92+
8393
go 1.25.1

hack/tools.go

Lines changed: 0 additions & 22 deletions
This file was deleted.

hack/update-codegen.sh

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,14 +31,14 @@ APIS_PKG="${GOPKG}/pkg/apis"
3131
GROUPS_WITH_VERSIONS="${CUSTOM_RESOURCE_NAME}:${CUSTOM_RESOURCE_VERSION}"
3232

3333
echo "Generating deepcopy funcs"
34-
go run k8s.io/code-generator/cmd/deepcopy-gen \
34+
go tool deepcopy-gen \
3535
--output-file zz_generated.deepcopy.go \
3636
--bounding-dirs "${APIS_PKG}" \
3737
--go-header-file "${SCRIPT_ROOT}/hack/boilerplate.go.txt" \
3838
"${APIS_PKG}/${CUSTOM_RESOURCE_NAME}/${CUSTOM_RESOURCE_VERSION}"
3939

4040
echo "Generating clientset for ${GROUPS_WITH_VERSIONS} at ${OUTPUT_PKG}/${CLIENTSET_PKG_NAME:-clientset}"
41-
go run k8s.io/code-generator/cmd/client-gen \
41+
go tool client-gen \
4242
--clientset-name versioned \
4343
--input-base "" \
4444
--input "${APIS_PKG}/${CUSTOM_RESOURCE_NAME}/${CUSTOM_RESOURCE_VERSION}" \
@@ -47,14 +47,14 @@ go run k8s.io/code-generator/cmd/client-gen \
4747
--output-dir "${OUTPUT_DIR}/clientset"
4848

4949
echo "Generating listers for ${GROUPS_WITH_VERSIONS} at ${OUTPUT_PKG}/listers"
50-
go run k8s.io/code-generator/cmd/lister-gen \
50+
go tool lister-gen \
5151
--output-pkg "${OUTPUT_PKG}/listers" \
5252
--go-header-file "${SCRIPT_ROOT}/hack/boilerplate.go.txt" \
5353
--output-dir "${OUTPUT_DIR}/listers" \
5454
"${APIS_PKG}/${CUSTOM_RESOURCE_NAME}/${CUSTOM_RESOURCE_VERSION}"
5555

5656
echo "Generating informers for ${GROUPS_WITH_VERSIONS} at ${OUTPUT_PKG}/informers"
57-
go run k8s.io/code-generator/cmd/informer-gen \
57+
go tool informer-gen \
5858
--versioned-clientset-package "${OUTPUT_PKG}/${CLIENTSET_PKG_NAME:-clientset}/${CLIENTSET_NAME_VERSIONED:-versioned}" \
5959
--listers-package "${OUTPUT_PKG}/listers" \
6060
--output-pkg "${OUTPUT_PKG}/informers" \

0 commit comments

Comments
 (0)