[prometheus-adapter] allow customize clusterrole resources (prometheu…

…s-community#3944) Allow end user to change cluster role resources in external and custom metrics Signed-off-by: Mao-Hsiang Lien <6195019+titanlien@users.noreply.github.com>
giffgaff · Mar 20, 2024 · 977b50b · 977b50b
1 parent bbb10b7
commit 977b50b
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 4 deletions.
diff --git a/charts/prometheus-adapter/Chart.yaml b/charts/prometheus-adapter/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: prometheus-adapter
-version: 4.7.1
+version: 4.8.0
 appVersion: v0.11.1
 description: A Helm chart for k8s prometheus adapter
 home: https://github.com/kubernetes-sigs/prometheus-adapter

diff --git a/charts/prometheus-adapter/templates/custom-metrics-cluster-role.yaml b/charts/prometheus-adapter/templates/custom-metrics-cluster-role.yaml
@@ -12,6 +12,6 @@ metadata:
 rules:
 - apiGroups:
   - custom.metrics.k8s.io
-  resources: ["*"]
+  resources: {{ toYaml .Values.rbac.customMetrics.resources | nindent 2 }}
   verbs: ["*"]
 {{- end -}}
diff --git a/charts/prometheus-adapter/templates/external-metrics-cluster-role.yaml b/charts/prometheus-adapter/templates/external-metrics-cluster-role.yaml
@@ -12,8 +12,7 @@ metadata:
 rules:
 - apiGroups:
   - "external.metrics.k8s.io"
-  resources:
-  - "*"
+  resources: {{ toYaml .Values.rbac.externalMetrics.resources | nindent 2 }}
   verbs:
   - list
   - get

diff --git a/charts/prometheus-adapter/values.yaml b/charts/prometheus-adapter/values.yaml
@@ -58,6 +58,10 @@ securityContext:
 rbac:
   # Specifies whether RBAC resources should be created
   create: true
+  externalMetrics:
+    resources: ["*"]
+  customMetrics:
+    resources: ["*"]
 
 psp:
   # Specifies whether PSP resources should be created