Do code generation non-containerized

Also clean-up hack/update_codegen.sh script a bit.

Author: marquiz

Dockerfile_generator

@@ -151,20 +151,8 @@ 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) \
-	    -t nfd-generator \
-	    -f Dockerfile_generator .
-
-generate: .generator.image.stamp
-	$(CONTAINER_RUN_CMD) --rm \
-	    -v "`pwd`:/go/node-feature-discovery" \
-	    -v "`go env GOCACHE`:/.cache" \
-	    -v "`go env GOMODCACHE`:/go/pkg/mod" \
-	    --user=`id -u`:`id -g`\
-	    nfd-generator \
-	    ./hack/update_codegen.sh
+generate:
+	hack/update_codegen.sh
 
 gofmt:
 	@$(GO_FMT) -w -l $$(find . -name '*.go')

Makefile

@@ -18,36 +18,19 @@ set -o errexit
 set -o nounset
 set -o pipefail
 
-TMP_VENDOR_DIR=gen-vendor
-
-function cleanup() {
-  echo "Cleaning up..."
-  rm -rf ${TMP_VENDOR_DIR}
-  # We need to clean up the go.mod file since code-generator adds temporary library to the go.mod file.
-  "${GO_CMD}" mod tidy
-}
-
-# Temporal work around until https://github.com/kubernetes/kubernetes/pull/125051 is merged
-# and added to a release.
-find api/generated/ -name 'nodefeature*' | xargs rm
-
-trap cleanup EXIT
 GO_CMD=${1:-go}
 NFD_ROOT=$(realpath $(dirname ${BASH_SOURCE[0]})/..)
 
-"${GO_CMD}" mod vendor
-
 # Go generate
 "${GO_CMD}" generate ./cmd/... ./pkg/... ./source/...
 
 # Generate CRDs
-controller-gen object crd output:crd:stdout paths=./api/... > deployment/base/nfd-crds/nfd-api-crds.yaml
+go tool controller-gen object crd output:crd:stdout paths=./api/... > deployment/base/nfd-crds/nfd-api-crds.yaml
 mkdir -p deployment/helm/node-feature-discovery/crds
 cp deployment/base/nfd-crds/nfd-api-crds.yaml deployment/helm/node-feature-discovery/crds
 
 # Generate clientset and informers
-mv vendor ${TMP_VENDOR_DIR}
-CODEGEN_PKG=${CODEGEN_PKG:-$(ls -d -1 ./${TMP_VENDOR_DIR}/k8s.io/code-generator 2>/dev/null || echo ../code-generator)}
+CODEGEN_PKG=$(go list -m -f '{{.Dir}}' k8s.io/code-generator)
 
 cd $(dirname ${BASH_SOURCE[0]})/..
 
@@ -58,10 +41,6 @@ kube::codegen::gen_helpers \
   ${NFD_ROOT}/api/nfd \
   --boilerplate ${NFD_ROOT}/hack/boilerplate.go.txt
 
-# HACK: manually patching the auto-generated code as code-generator cannot
-# properly handle deepcopy of MatchExpressionSet.
-sed s'/out = new(map\[string\]\*MatchExpression)/out = new(MatchExpressionSet)/' -i api/nfd/v1alpha1/zz_generated.deepcopy.go
-
 # Switch to work in the api worktree
 pushd "${NFD_ROOT}/api/nfd" > /dev/null
 

hack/update_codegen.sh

@@ -16,7 +16,7 @@ limitations under the License.
 
 package compat
 
-//go:generate mockery --name=ArtifactClient --inpackage
+//go:generate go tool mockery --name=ArtifactClient --inpackage
 
 import (
 	"context"

pkg/client-nfd/compat/artifact-client/client.go

@@ -16,7 +16,7 @@ limitations under the License.
 
 package podres
 
-//go:generate mockery --srcpkg=k8s.io/kubelet/pkg/apis/podresources/v1 --name PodResourcesListerClient
+//go:generate go tool mockery --srcpkg=k8s.io/kubelet/pkg/apis/podresources/v1 --name PodResourcesListerClient
 
 import (
 	"fmt"

pkg/podres/client.go

@@ -16,7 +16,7 @@ limitations under the License.
 
 package source
 
-//go:generate mockery --name=LabelSource --inpackage
+//go:generate go tool mockery --name=LabelSource --inpackage
 
 import (
 	"fmt"