[release-1.10] 🌱 metrics: use v1beta2 for condition metrics and add metrics for dockercluster devcluster dockermachine devmachine extensionconfig ipaddressclaim and crs (#12041)

* metrics: replace v1beta1 by v1beta2 conditions and add metrics for dockercluster devcluster dockermachine devmachine extensionconfig ipaddressclaim and crs

* drop generate-metrics-config from verify

* grafana: adjust dashboards

---------

Co-authored-by: Christian Schlotter <[email protected]>

Author: k8s-infra-cherrypick-robot

Makefile

@@ -272,7 +272,7 @@ ALL_GENERATE_MODULES = core kubeadm-bootstrap kubeadm-control-plane docker-infra
 
 .PHONY: generate
 generate: ## Run all generate-manifests-*, generate-go-deepcopy-*, generate-go-conversions-* and generate-go-openapi targets
-	$(MAKE) generate-modules generate-manifests generate-go-deepcopy generate-go-conversions generate-go-openapi generate-metrics-config
+	$(MAKE) generate-modules generate-manifests generate-go-deepcopy generate-go-conversions generate-go-openapi
 
 .PHONY: generate-manifests
 generate-manifests: $(addprefix generate-manifests-,$(ALL_GENERATE_MODULES)) ## Run all generate-manifests-* targets
@@ -619,17 +619,8 @@ generate-e2e-templates-main: $(KUSTOMIZE)
 
 .PHONY: generate-metrics-config
 generate-metrics-config: ## Generate ./config/metrics/crd-metrics-config.yaml
-	OUTPUT_FILE="./config/metrics/crd-metrics-config.yaml"; \
-	METRIC_TEMPLATES_DIR="./config/metrics/templates"; \
-	echo "# This file was auto-generated via: make generate-metrics-config" > "$${OUTPUT_FILE}"; \
-	cat "$${METRIC_TEMPLATES_DIR}/header.yaml" >> "$${OUTPUT_FILE}"; \
-	for resource in clusterclass cluster kubeadmcontrolplane kubeadmconfig machine machinedeployment machinehealthcheck machineset machinepool; do \
-		cat "$${METRIC_TEMPLATES_DIR}/$${resource}.yaml"; \
-		sed 's/$${RESOURCE}/'$${resource}'/g' "$${METRIC_TEMPLATES_DIR}/common_metrics.yaml"; \
-		if [[ "$${resource}" != "cluster" ]]; then \
-			cat "$${METRIC_TEMPLATES_DIR}/owner_metric.yaml"; \
-		fi \
-	done >> "$${OUTPUT_FILE}"; \
+	@echo "Use PR state from 'https://github.com/kubernetes-sigs/cluster-api/pull/9347'"; \
+	exit 1
 
 .PHONY: generate-diagrams
 generate-diagrams: ## Generate diagrams for *.plantuml files

config/metrics/crd-clusterrole.yaml

@@ -6,16 +6,32 @@ metadata:
   labels:
     kube-state-metrics/aggregate-to-manager: "true"
 rules:
+- apiGroups:
+  - addons.cluster.x-k8s.io
+  resources:
+  - clusterresourcesets
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - bootstrap.cluster.x-k8s.io
+  resources:
+  - kubeadmconfigs
+  verbs:
+  - get
+  - list
+  - watch
 - apiGroups:
   - cluster.x-k8s.io
   resources:
   - clusterclasses
   - clusters
   - machinedeployments
+  - machinehealthchecks
   - machinepools
-  - machinesets
   - machines
-  - machinehealthchecks
+  - machinesets
   verbs:
   - get
   - list
@@ -29,9 +45,28 @@ rules:
   - list
   - watch
 - apiGroups:
-  - bootstrap.cluster.x-k8s.io
+  - infrastructure.cluster.x-k8s.io
   resources:
-  - kubeadmconfigs
+  - devclusters
+  - devmachines
+  - dockerclusters
+  - dockermachines
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - ipam.cluster.x-k8s.io
+  resources:
+  - ipaddressclaims
+  verbs:
+  - get
+  - list
+  - watch
+- apiGroups:
+  - runtime.cluster.x-k8s.io
+  resources:
+  - extensionconfigs
   verbs:
   - get
   - list