@@ -39,7 +39,7 @@ export GO111MODULE=on
39
39
#
40
40
# Kubebuilder.
41
41
#
42
- export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.28.0
42
+ export KUBEBUILDER_ENVTEST_KUBERNETES_VERSION ?= 1.27.1
43
43
export KUBEBUILDER_CONTROLPLANE_START_TIMEOUT ?= 60s
44
44
export KUBEBUILDER_CONTROLPLANE_STOP_TIMEOUT ?= 60s
45
45
@@ -64,6 +64,7 @@ CAPD_DIR := $(TEST_DIR)/infrastructure/docker
64
64
CAPIM_DIR := $(TEST_DIR ) /infrastructure/inmemory
65
65
TEST_EXTENSION_DIR := $(TEST_DIR ) /extension
66
66
GO_INSTALL := ./scripts/go_install.sh
67
+ GO_TOOLS_BUILD := ./hack/go-tools-build.sh
67
68
OBSERVABILITY_DIR := hack/observability
68
69
69
70
export PATH := $(abspath $(TOOLS_BIN_DIR ) ) :$(PATH )
@@ -169,6 +170,12 @@ GOVULNCHECK_VER := v1.0.0
169
170
GOVULNCHECK := $(abspath $(TOOLS_BIN_DIR ) /$(GOVULNCHECK_BIN ) -$(GOVULNCHECK_VER ) )
170
171
GOVULNCHECK_PKG := golang.org/x/vuln/cmd/govulncheck
171
172
173
+ METRIC_GEN_VER := v2.9.2
174
+ METRIC_GEN_BIN := metric-gen
175
+ METRIC_GEN := $(abspath $(TOOLS_BIN_DIR ) /$(METRIC_GEN_BIN ) -$(METRIC_GEN_VER ) )
176
+ METRIC_GEN_PKG := k8s.io/kube-state-metrics/exp/metric-gen/v2
177
+ 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 )
178
+
172
179
CONVERSION_VERIFIER_BIN := conversion-verifier
173
180
CONVERSION_VERIFIER := $(abspath $(TOOLS_BIN_DIR ) /$(CONVERSION_VERIFIER_BIN ) )
174
181
@@ -556,8 +563,9 @@ generate-e2e-templates-main: $(KUSTOMIZE)
556
563
$(KUSTOMIZE) build $(INMEMORY_TEMPLATES)/main/cluster-template --load-restrictor LoadRestrictionsNone > $(INMEMORY_TEMPLATES)/main/cluster-template.yaml
557
564
558
565
.PHONY : generate-metrics-config
559
- generate-metrics-config : $(ENVSUBST_BIN ) # # Generate ./hack/observability/kube-state-metrics/crd-config.yaml
560
- OUTPUT_FILE=" ${OBSERVABILITY_DIR} /kube-state-metrics/crd-config.yaml" ; \
566
+ generate-metrics-config : $(METRIC_GEN ) # # Generate ./hack/observability/kube-state-metrics/crd-config.yaml
567
+ $(METRIC_GEN ) ./apis/... > " ${OBSERVABILITY_DIR} /kube-state-metrics/crd-config.yaml"
568
+
561
569
METRICS_DIR="${OBSERVABILITY_DIR}/kube-state-metrics/metrics"; \
562
570
echo "# This file was auto-generated via: make generate-metrics-config" > "$${OUTPUT_FILE}"; \
563
571
cat "$${METRICS_DIR}/header.yaml" >> "$${OUTPUT_FILE}"; \
@@ -1292,6 +1300,9 @@ $(GOLANGCI_LINT_BIN): $(GOLANGCI_LINT) ## Build a local copy of golangci-lint.
1292
1300
.PHONY : $(GOVULNCHECK_BIN )
1293
1301
$(GOVULNCHECK_BIN ) : $(GOVULNCHECK ) # # Build a local copy of govulncheck.
1294
1302
1303
+ .PHONY : $(METRIC_GEN_BIN )
1304
+ $(METRIC_GEN_BIN ) : $(METRIC_GEN ) # # Build a local copy of metric-gen.
1305
+
1295
1306
$(CONTROLLER_GEN ) : # Build controller-gen from tools folder.
1296
1307
GOBIN=$(TOOLS_BIN_DIR ) $(GO_INSTALL ) $(CONTROLLER_GEN_PKG ) $(CONTROLLER_GEN_BIN ) $(CONTROLLER_GEN_VER )
1297
1308
@@ -1346,6 +1357,9 @@ $(GOLANGCI_LINT): # Build golangci-lint from tools folder.
1346
1357
$(GOVULNCHECK ) : # Build govulncheck.
1347
1358
GOBIN=$(TOOLS_BIN_DIR ) $(GO_INSTALL ) $(GOVULNCHECK_PKG ) $(GOVULNCHECK_BIN ) $(GOVULNCHECK_VER )
1348
1359
1360
+ $(METRIC_GEN ) : # Build metric-gen.
1361
+ GOBIN=$(TOOLS_BIN_DIR ) GOMOD_REPLACE=" $( METRIC_GEN_MOD_REPLACE) " $(GO_TOOLS_BUILD ) $(METRIC_GEN_PKG ) $(METRIC_GEN_BIN ) $(METRIC_GEN_VER )
1362
+
1349
1363
# # --------------------------------------
1350
1364
# # Helpers
1351
1365
# # --------------------------------------
0 commit comments