Skip to content

Commit

Permalink
Bump to Go 1.21
Browse files Browse the repository at this point in the history
Signed-off-by: Carlos Eduardo Arango Gutierrez <eduardoa@nvidia.com>
  • Loading branch information
ArangoGutierrez authored and cruizen committed Mar 12, 2024
1 parent ec1f5d8 commit 5f47f2d
Show file tree
Hide file tree
Showing 3 changed files with 38 additions and 6 deletions.
6 changes: 1 addition & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ IMAGE_BUILD_CMD ?= docker build
IMAGE_BUILD_EXTRA_OPTS ?=
IMAGE_PUSH_CMD ?= docker push
CONTAINER_RUN_CMD ?= docker run
BUILDER_IMAGE ?= golang:1.20-bullseye
BUILDER_IMAGE ?= golang:1.21-bullseye
BASE_IMAGE_FULL ?= debian:bullseye-slim
BASE_IMAGE_MINIMAL ?= scratch

Expand Down Expand Up @@ -104,15 +104,13 @@ image-all: ensure-buildx yamls
$(IMAGE_BUILDX_CMD) $(IMAGE_BUILD_ARGS) $(IMAGE_BUILD_ARGS_FULL)
$(IMAGE_BUILDX_CMD) $(IMAGE_BUILD_ARGS) $(IMAGE_BUILD_ARGS_MINIMAL)


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


yamls:
@./hack/kustomize.sh $(K8S_NAMESPACE) $(IMAGE_REPO) $(IMAGE_TAG_NAME)

Expand Down Expand Up @@ -142,8 +140,6 @@ templates:
@rm nfd-worker.conf.tmp
@rm nfd-topology-updater.conf.tmp



.generator.image.stamp: Dockerfile_generator
$(IMAGE_BUILD_CMD) \
--build-arg BUILDER_IMAGE=$(BUILDER_IMAGE) \
Expand Down
2 changes: 1 addition & 1 deletion go.mod
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module sigs.k8s.io/node-feature-discovery

go 1.20
go 1.21

require (
github.com/fsnotify/fsnotify v1.6.0
Expand Down
Loading

0 comments on commit 5f47f2d

Please sign in to comment.