Merge branch 'master' into feat/skip-nodes

Author: marquiz

Dockerfile_generator

@@ -5,18 +5,7 @@ FROM ${BUILDER_IMAGE} as builder
 RUN --mount=type=cache,target=/go/pkg/mod/ \
     go install github.com/vektra/mockery/[email protected] && \
     go install sigs.k8s.io/controller-tools/cmd/[email protected] && \
-    go install golang.org/x/tools/cmd/[email protected] && \
-    go install github.com/golang/protobuf/[email protected]
-
-RUN apt-get update && apt-get install unzip
-
-RUN curl -LO https://github.com/protocolbuffers/protobuf/releases/download/v25.3/protoc-25.3-linux-x86_64.zip && \
-    unzip protoc-25.3-linux-x86_64.zip -d /usr/local && \
-    rm protoc-25.3-linux-x86_64.zip && \
-    chmod a+x /usr/local/bin/protoc && \
-    find /usr/local -type d | xargs chmod 755 && \
-    find /usr/local -type f | xargs chmod a+r
-
+    go install golang.org/x/tools/cmd/[email protected]
 
 # Expect to be working with nfd
 WORKDIR /go/node-feature-discovery

Makefile

@@ -90,7 +90,7 @@ IMAGE_BUILD_ARGS_MINIMAL = --target minimal \
 
 all: image
 
-BUILD_BINARIES := nfd-master nfd-worker nfd-topology-updater nfd-gc kubectl-nfd
+BUILD_BINARIES := nfd-master nfd-worker nfd-topology-updater nfd-gc kubectl-nfd nfd
 
 build-%:
 	$(GO_CMD) build -v -o bin/ $(BUILD_FLAGS) ./cmd/$*