Skip to content

Commit 160c910

Browse files
authored
Merge pull request #1390 from ArangoGutierrez/devel/g121
Bump to Go 1.21
2 parents 7c0913e + 73d624d commit 160c910

File tree

3 files changed

+38
-6
lines changed

3 files changed

+38
-6
lines changed

Makefile

Lines changed: 1 addition & 5 deletions
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.20-bullseye
11+
BUILDER_IMAGE ?= golang:1.21-bookworm
1212
BASE_IMAGE_FULL ?= debian:bullseye-slim
1313
BASE_IMAGE_MINIMAL ?= scratch
1414

@@ -104,15 +104,13 @@ image-all: ensure-buildx yamls
104104
$(IMAGE_BUILDX_CMD) $(IMAGE_BUILD_ARGS) $(IMAGE_BUILD_ARGS_FULL)
105105
$(IMAGE_BUILDX_CMD) $(IMAGE_BUILD_ARGS) $(IMAGE_BUILD_ARGS_MINIMAL)
106106

107-
108107
# clean NFD labels on all nodes
109108
# devel only
110109
deploy-prune:
111110
kubectl apply -k deployment/overlays/prune/
112111
kubectl wait --for=condition=complete job -l app=nfd -n node-feature-discovery
113112
kubectl delete -k deployment/overlays/prune/
114113

115-
116114
yamls:
117115
@./hack/kustomize.sh $(K8S_NAMESPACE) $(IMAGE_REPO) $(IMAGE_TAG_NAME)
118116

@@ -142,8 +140,6 @@ templates:
142140
@rm nfd-worker.conf.tmp
143141
@rm nfd-topology-updater.conf.tmp
144142

145-
146-
147143
.generator.image.stamp: Dockerfile_generator
148144
$(IMAGE_BUILD_CMD) \
149145
--build-arg BUILDER_IMAGE=$(BUILDER_IMAGE) \

go.mod

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
module sigs.k8s.io/node-feature-discovery
22

3-
go 1.20
3+
go 1.21
44

55
require (
66
github.com/fsnotify/fsnotify v1.6.0

0 commit comments

Comments
 (0)