Skip to content

Commit 4e52119

Browse files
apps wc: dont get capi metrics in wc
1 parent 735157c commit 4e52119

File tree

2 files changed

+2
-42
lines changed

2 files changed

+2
-42
lines changed

helmfile.d/stacks/monitoring-prometheus.yaml.gotmpl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ templates:
1414
needs:
1515
- monitoring/networkpolicy
1616
- monitoring/podsecuritypolicy
17-
{{- if .Values | get "clusterApi.enabled" false }}
17+
{{- if and (.Values | get "ck8sManagementCluster.enabled" false) (.Values | get "clusterApi.enabled" false) }}
1818
- monitoring/kube-state-metrics-extra-resource-metrics
1919
{{- end }}
2020
values:
@@ -90,6 +90,7 @@ templates:
9090

9191
kube-state-metrics-extra-resources:
9292
inherit: [ template: prometheus ]
93+
condition: ck8sManagementCluster.enabled
9394
installed: {{ .Values | get "clusterApi.enabled" "false" }}
9495
chart: charts/kube-state-metrics-extra-resource-metrics
9596
version: 0.1.0

helmfile.d/values/kube-prometheus-stack-wc.yaml.gotmpl

Lines changed: 0 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -22,47 +22,6 @@ prometheusOperator:
2222

2323
kube-state-metrics:
2424
resources: {{- toYaml .Values.kubeStateMetrics.resources | nindent 4 }}
25-
{{- if .Values.clusterApi.enabled }}
26-
rbac:
27-
extraRules:
28-
- apiGroups:
29-
- apiextensions.k8s.io
30-
resources:
31-
- customresourcedefinitions
32-
verbs:
33-
- list
34-
- watch
35-
- apiGroups:
36-
- cluster.x-k8s.io
37-
resources:
38-
- clusters
39-
- machinedeployments
40-
- machinesets
41-
- machines
42-
- machinehealthchecks
43-
- machinepools
44-
verbs:
45-
- get
46-
- list
47-
- watch
48-
- apiGroups:
49-
- controlplane.cluster.x-k8s.io
50-
resources:
51-
- kubeadmcontrolplanes
52-
verbs:
53-
- get
54-
- list
55-
- watch
56-
volumeMounts:
57-
- mountPath: /etc/config
58-
name: kube-state-metrics-clusterapi-volume
59-
volumes:
60-
- configMap:
61-
name: kube-state-metrics-clusterapi
62-
name: kube-state-metrics-clusterapi-volume
63-
extraArgs:
64-
- "--custom-resource-state-config-file=/etc/config/clusterapi-metrics.yaml"
65-
{{- end }}
6625

6726
metricLabelsAllowlist:
6827
- nodes=[topology.kubernetes.io/zone,elastisys.io/node-group,node.kubernetes.io/instance-type]

0 commit comments

Comments
 (0)