make foo

Author: chrischdi

Makefile

@@ -161,6 +161,12 @@ GOVULNCHECK_VER := v1.0.0
 GOVULNCHECK := $(abspath $(TOOLS_BIN_DIR)/$(GOVULNCHECK_BIN)-$(GOVULNCHECK_VER))
 GOVULNCHECK_PKG := golang.org/x/vuln/cmd/govulncheck
 
+METRIC_GEN_VER := v2.9.2
+METRIC_GEN_BIN := metric-gen
+METRIC_GEN := $(abspath $(TOOLS_BIN_DIR)/$(METRIC_GEN_BIN)-$(METRIC_GEN_VER))
+METRIC_GEN_PKG := k8s.io/kube-state-metrics/exp/metric-gen/v2
+METRIC_GEN_MOD_REPLACE := $(METRIC_GEN_PKG)=github.com/chrischdi/kube-state-metrics/exp/metric-gen/v2@$(METRIC_GEN_VER) k8s.io/kube-state-metrics/v2=k8s.io/kube-state-metrics/v2@$(METRIC_GEN_VER)
+
 GOVC_VER := $(shell cat go.mod | grep "github.com/vmware/govmomi" | awk '{print $$NF}')
 GOVC_BIN := govc
 GOVC := $(abspath $(TOOLS_BIN_DIR)/$(GOVC_BIN)-$(GOVC_VER))
@@ -182,6 +188,8 @@ RELEASE_NOTES_VER := $(CAPI_HACK_TOOLS_VER)
 RELEASE_NOTES_BIN := release-notes
 RELEASE_NOTES := $(abspath $(TOOLS_BIN_DIR)/$(RELEASE_NOTES_BIN)-$(RELEASE_NOTES_VER))
 RELEASE_NOTES_PKG := sigs.k8s.io/cluster-api/hack/tools/release
+# let go resolve the tools version via the CAPI version.
+RELEASE_NOTES_MOD_REQUIRE := sigs.k8s.io/cluster-api/hack/tools@$(RELEASE_NOTES_VER)
 
 # Define Docker related variables. Releases should modify and double check these vars.
 REGISTRY ?= gcr.io/$(shell gcloud config get-value project)
@@ -235,7 +243,7 @@ help:  # Display this help
 
 .PHONY: generate
 generate: ## Run all generate targets
-	$(MAKE) generate-modules generate-manifests generate-go-deepcopy generate-go-conversions generate-flavors
+	$(MAKE) generate-modules generate-manifests generate-go-deepcopy generate-go-conversions generate-flavors generate-metrics-config
 
 .PHONY: generate-manifests
 generate-manifests: $(CONTROLLER_GEN) ## Generate manifests e.g. CRD, RBAC etc.
@@ -313,6 +321,9 @@ generate-e2e-templates-main: $(KUSTOMIZE) ## Generate test templates for the mai
 	# for DHCP overrides
 	"$(KUSTOMIZE)" --load-restrictor LoadRestrictionsNone build $(E2E_TEMPLATE_DIR)/main/dhcp-overrides > $(E2E_TEMPLATE_DIR)/main/cluster-template-dhcp-overrides.yaml
 
+.PHONY: generate-metrics-config
+generate-metrics-config: $(METRIC_GEN) ## Generate ./crd-metrics-config.yaml
+	$(METRIC_GEN) ./apis/... > crd-metrics-config.yaml
 
 ## --------------------------------------
 ## Lint / Verify
@@ -400,7 +411,6 @@ verify-flavors: $(FLAVOR_DIR) generate-flavors ## Verify generated flavors
 		echo "flavor files in templates directory are out of date"; exit 1; \
 	fi
 
-
 ## --------------------------------------
 ## Build
 ## --------------------------------------
@@ -598,7 +608,6 @@ e2e-flavors-main: $(RELEASE_DIR)
 	mkdir -p $(RELEASE_DIR)/main
 	$(MAKE) generate-flavors FLAVOR_DIR=$(RELEASE_DIR)/main
 
-
 .PHONY: generate-flavors
 generate-flavors: $(FLAVOR_DIR)
 	go run ./packaging/flavorgen --output-dir $(FLAVOR_DIR)
@@ -755,13 +764,15 @@ $(GOLANGCI_LINT_BIN): $(GOLANGCI_LINT) ## Build a local copy of golangci-lint.
 .PHONY: $(GOVULNCHECK_BIN)
 $(GOVULNCHECK_BIN): $(GOVULNCHECK) ## Build a local copy of govulncheck.
 
+.PHONY: $(METRIC_GEN_BIN)
+$(METRIC_GEN_BIN): $(METRIC_GEN) ## Build a local copy of metric-gen.
+
 .PHONY: $(GOVC_BIN)
 $(GOVC_BIN): $(GOVC) ## Build a local copy of govc.
 
 .PHONY: $(KIND_BIN)
 $(KIND_BIN): $(KIND) ## Build a local copy of kind.
 
-
 .PHONY: $(RELEASE_NOTES_BIN)
 $(RELEASE_NOTES_BIN): $(RELEASE_NOTES) ## Build a local copy of release-notes.
 
@@ -807,15 +818,17 @@ $(GOLANGCI_LINT): # Build golangci-lint.
 $(GOVULNCHECK): # Build govulncheck.
 	GOBIN=$(TOOLS_BIN_DIR) $(GO_INSTALL) $(GOVULNCHECK_PKG) $(GOVULNCHECK_BIN) $(GOVULNCHECK_VER)
 
+$(METRIC_GEN): # Build metric-gen.
+	GOBIN=$(TOOLS_BIN_DIR) GOMOD_REPLACE="$(METRIC_GEN_MOD_REPLACE)" $(GO_TOOLS_BUILD) $(METRIC_GEN_PKG) $(METRIC_GEN_BIN) $(METRIC_GEN_VER)
+
 $(GOVC): # Build GOVC.
 	CGO_ENABLED=0 GOBIN=$(TOOLS_BIN_DIR) $(GO_INSTALL) $(GOVC_PKG) $(GOVC_BIN) $(GOVC_VER)
 
 $(KIND): # Build kind.
 	GOBIN=$(TOOLS_BIN_DIR) $(GO_INSTALL) $(KIND_PKG) $(KIND_BIN) $(KIND_VER)
 
-
 $(RELEASE_NOTES): # Build release-notes.
-	GOBIN=$(TOOLS_BIN_DIR) $(GO_TOOLS_BUILD) $(RELEASE_NOTES_PKG) $(RELEASE_NOTES_BIN) $(RELEASE_NOTES_VER)
+	GOBIN=$(TOOLS_BIN_DIR) GOMOD_REQUIRE="$(RELEASE_NOTES_MOD_REQUIRE)" $(GO_TOOLS_BUILD) $(RELEASE_NOTES_PKG) $(RELEASE_NOTES_BIN) $(RELEASE_NOTES_VER)
 
 ## --------------------------------------
 ## Helpers

hack/go-tools-build.sh

@@ -37,7 +37,8 @@ if [ -z "${GOBIN}" ]; then
   exit 1
 fi
 
-CAPI_HACK_TOOLS="sigs.k8s.io/cluster-api/hack/tools"
+GOMOD_REPLACE=${GOMOD_REPLACE:=}
+GOMOD_REQUIRE=${GOMOD_REQUIRE:=}
 
 rm -f "${GOBIN}/${2}"* || true
 
@@ -52,8 +53,13 @@ cd "${TMP_MODULE_DIR}"
 
 # Initialize a go module and place a tools.go file for building the binary.
 go mod init "tools"
-# Set require for "sigs.k8s.io/cluster-api" to let go resolve the tools version via the CAPI version.
-go mod edit -require "${CAPI_HACK_TOOLS}@${3}"
+
+for PARAM in ${GOMOD_REPLACE}; do
+  eval go mod edit -replace ${PARAM}
+done
+for PARAM in ${GOMOD_REQUIRE}; do
+  eval go mod edit -require ${PARAM}
+done
 
 # Create go file which imports the required package and resolve dependencies.
 cat << EOF > tools.go