Skip to content

Commit 03cb3b4

Browse files
authored
🌱 metrics: use v1beta2 for condition metrics and add metrics for dockercluster devcluster dockermachine devmachine extensionconfig ipaddressclaim and crs (#12006)
* 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
1 parent 56759ad commit 03cb3b4

File tree

4 files changed

+1653
-962
lines changed

4 files changed

+1653
-962
lines changed

Diff for: Makefile

+3-12
Original file line numberDiff line numberDiff line change
@@ -272,7 +272,7 @@ ALL_GENERATE_MODULES = core kubeadm-bootstrap kubeadm-control-plane docker-infra
272272

273273
.PHONY: generate
274274
generate: ## Run all generate-manifests-*, generate-go-deepcopy-*, generate-go-conversions-* and generate-go-openapi targets
275-
$(MAKE) generate-modules generate-manifests generate-go-deepcopy generate-go-conversions generate-go-openapi generate-metrics-config
275+
$(MAKE) generate-modules generate-manifests generate-go-deepcopy generate-go-conversions generate-go-openapi
276276

277277
.PHONY: generate-manifests
278278
generate-manifests: $(addprefix generate-manifests-,$(ALL_GENERATE_MODULES)) ## Run all generate-manifests-* targets
@@ -619,17 +619,8 @@ generate-e2e-templates-main: $(KUSTOMIZE)
619619

620620
.PHONY: generate-metrics-config
621621
generate-metrics-config: ## Generate ./config/metrics/crd-metrics-config.yaml
622-
OUTPUT_FILE="./config/metrics/crd-metrics-config.yaml"; \
623-
METRIC_TEMPLATES_DIR="./config/metrics/templates"; \
624-
echo "# This file was auto-generated via: make generate-metrics-config" > "$${OUTPUT_FILE}"; \
625-
cat "$${METRIC_TEMPLATES_DIR}/header.yaml" >> "$${OUTPUT_FILE}"; \
626-
for resource in clusterclass cluster kubeadmcontrolplane kubeadmconfig machine machinedeployment machinehealthcheck machineset machinepool; do \
627-
cat "$${METRIC_TEMPLATES_DIR}/$${resource}.yaml"; \
628-
sed 's/$${RESOURCE}/'$${resource}'/g' "$${METRIC_TEMPLATES_DIR}/common_metrics.yaml"; \
629-
if [[ "$${resource}" != "cluster" ]]; then \
630-
cat "$${METRIC_TEMPLATES_DIR}/owner_metric.yaml"; \
631-
fi \
632-
done >> "$${OUTPUT_FILE}"; \
622+
@echo "Use PR state from 'https://github.com/kubernetes-sigs/cluster-api/pull/9347'"; \
623+
exit 1
633624

634625
.PHONY: generate-diagrams
635626
generate-diagrams: ## Generate diagrams for *.plantuml files

Diff for: config/metrics/crd-clusterrole.yaml

+39-4
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,32 @@ metadata:
66
labels:
77
kube-state-metrics/aggregate-to-manager: "true"
88
rules:
9+
- apiGroups:
10+
- addons.cluster.x-k8s.io
11+
resources:
12+
- clusterresourcesets
13+
verbs:
14+
- get
15+
- list
16+
- watch
17+
- apiGroups:
18+
- bootstrap.cluster.x-k8s.io
19+
resources:
20+
- kubeadmconfigs
21+
verbs:
22+
- get
23+
- list
24+
- watch
925
- apiGroups:
1026
- cluster.x-k8s.io
1127
resources:
1228
- clusterclasses
1329
- clusters
1430
- machinedeployments
31+
- machinehealthchecks
1532
- machinepools
16-
- machinesets
1733
- machines
18-
- machinehealthchecks
34+
- machinesets
1935
verbs:
2036
- get
2137
- list
@@ -29,9 +45,28 @@ rules:
2945
- list
3046
- watch
3147
- apiGroups:
32-
- bootstrap.cluster.x-k8s.io
48+
- infrastructure.cluster.x-k8s.io
3349
resources:
34-
- kubeadmconfigs
50+
- devclusters
51+
- devmachines
52+
- dockerclusters
53+
- dockermachines
54+
verbs:
55+
- get
56+
- list
57+
- watch
58+
- apiGroups:
59+
- ipam.cluster.x-k8s.io
60+
resources:
61+
- ipaddressclaims
62+
verbs:
63+
- get
64+
- list
65+
- watch
66+
- apiGroups:
67+
- runtime.cluster.x-k8s.io
68+
resources:
69+
- extensionconfigs
3570
verbs:
3671
- get
3772
- list

0 commit comments

Comments
 (0)