Skip to content

Commit 7abb2e7

Browse files
committed
drop tools.go in favor of go's native tool directive
Signed-off-by: Feruzjon Muyassarov <[email protected]>
1 parent 581c7a5 commit 7abb2e7

File tree

4 files changed

+5
-23
lines changed

4 files changed

+5
-23
lines changed

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ IMAGE_BUILD_CMD ?= docker build
88
IMAGE_BUILD_EXTRA_OPTS ?=
99
IMAGE_PUSH_CMD ?= docker push
1010
CONTAINER_RUN_CMD ?= docker run
11-
BUILDER_IMAGE ?= golang:1.24rc3-bookworm
11+
BUILDER_IMAGE ?= golang:1.24-bookworm
1212
BASE_IMAGE_FULL ?= debian:bookworm-slim
1313
BASE_IMAGE_MINIMAL ?= scratch
1414

Tiltfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
BASE_IMAGE_MINIMAL="gcr.io/distroless/base"
44
BASE_IMAGE_FULL="debian:bullseye-slim"
5-
BUILDER_IMAGE="golang:1.24rc3-bookworm"
5+
BUILDER_IMAGE="golang:1.24-bookworm"
66
HOSTMOUNT_PREFIX="/host-"
77
IMAGE_TAG_NAME = os.getenv('IMAGE_TAG_NAME', "master")
88
IMAGE_REGISTRY = os.getenv('IMAGE_REGISTRY', "gcr.io/k8s-staging-nfd")

go.mod

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,6 @@ require (
2828
k8s.io/apiextensions-apiserver v0.32.1
2929
k8s.io/apimachinery v0.32.1
3030
k8s.io/client-go v0.32.1
31-
k8s.io/code-generator v0.32.1
3231
k8s.io/component-base v0.32.1
3332
k8s.io/klog/v2 v2.130.1
3433
k8s.io/kubectl v0.32.1
@@ -153,6 +152,7 @@ require (
153152
howett.net/plist v1.0.0 // indirect
154153
k8s.io/apiserver v0.32.1 // indirect
155154
k8s.io/cloud-provider v0.32.1 // indirect
155+
k8s.io/code-generator v0.32.1 // indirect
156156
k8s.io/component-helpers v0.32.1 // indirect
157157
k8s.io/controller-manager v0.32.1 // indirect
158158
k8s.io/cri-api v0.32.1 // indirect
@@ -201,3 +201,5 @@ replace (
201201
k8s.io/sample-apiserver => k8s.io/sample-apiserver v0.32.1
202202
sigs.k8s.io/node-feature-discovery/api/nfd => ./api/nfd
203203
)
204+
205+
tool k8s.io/code-generator

hack/tools.go

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

0 commit comments

Comments
 (0)