Skip to content

Commit adba881

Browse files
authored
Merge pull request #839 from zalando-incubator/go-tool-1.24
Run code gen via Go 1.24 go tool
2 parents ef298ca + 0a6f403 commit adba881

File tree

4 files changed

+18
-31
lines changed

4 files changed

+18
-31
lines changed

Makefile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,12 +34,12 @@ $(GENERATED): go.mod $(CRD_TYPE_SOURCE) $(OPENAPI)
3434
./hack/update-codegen.sh
3535

3636
$(GENERATED_CRDS): $(GENERATED) $(CRD_SOURCES)
37-
go run sigs.k8s.io/controller-tools/cmd/controller-gen crd:crdVersions=v1 paths=./pkg/apis/... output:crd:dir=docs
37+
go tool controller-gen crd:crdVersions=v1 paths=./pkg/apis/... output:crd:dir=docs
3838
mv docs/zalando.org_clusterscalingschedules.yaml docs/cluster_scaling_schedules_crd.yaml
3939
mv docs/zalando.org_scalingschedules.yaml docs/scaling_schedules_crd.yaml
4040

4141
$(OPENAPI): go.mod
42-
go run k8s.io/kube-openapi/cmd/openapi-gen \
42+
go tool openapi-gen \
4343
--go-header-file hack/boilerplate.go.txt \
4444
--logtostderr \
4545
--output-dir pkg/api/generated/openapi \

go.mod

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,13 +21,11 @@ require (
2121
k8s.io/apimachinery v0.34.1
2222
k8s.io/apiserver v0.34.1
2323
k8s.io/client-go v0.34.1
24-
k8s.io/code-generator v0.34.1
2524
k8s.io/component-base v0.34.1
2625
k8s.io/klog v1.0.0
2726
k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b
2827
k8s.io/metrics v0.33.5
2928
k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
30-
sigs.k8s.io/controller-tools v0.19.0
3129
sigs.k8s.io/custom-metrics-apiserver v1.33.0
3230
)
3331

@@ -194,14 +192,26 @@ require (
194192
gopkg.in/yaml.v2 v2.4.0 // indirect
195193
gopkg.in/yaml.v3 v3.0.1 // indirect
196194
k8s.io/apiextensions-apiserver v0.34.0 // indirect
195+
k8s.io/code-generator v0.34.1 // indirect
197196
k8s.io/gengo/v2 v2.0.0-20250604051438-85fd79dbfd9f // indirect
198197
k8s.io/klog/v2 v2.130.1 // indirect
199198
k8s.io/kms v0.34.1 // indirect
200199
sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2 // indirect
200+
sigs.k8s.io/controller-tools v0.19.0 // indirect
201201
sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8 // indirect
202202
sigs.k8s.io/randfill v1.0.0 // indirect
203203
sigs.k8s.io/structured-merge-diff/v6 v6.3.0 // indirect
204204
sigs.k8s.io/yaml v1.6.0 // indirect
205205
)
206206

207+
tool (
208+
k8s.io/code-generator
209+
k8s.io/code-generator/cmd/client-gen
210+
k8s.io/code-generator/cmd/deepcopy-gen
211+
k8s.io/code-generator/cmd/informer-gen
212+
k8s.io/code-generator/cmd/lister-gen
213+
k8s.io/kube-openapi/cmd/openapi-gen
214+
sigs.k8s.io/controller-tools/cmd/controller-gen
215+
)
216+
207217
go 1.24.2

hack/tools.go

Lines changed: 0 additions & 23 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)