[stable/prometheus-adapter] conditionally register external metrics A…

…PI (helm#13716) (helm#14389) * [stable/prometheus-adapter] conditionally register external metrics API (helm#13716) The prometheus-adapter will NOT serve external metrics API if `externalRules` section is not specified. See this code: https://github.com/DirectXMan12/k8s-prometheus-adapter/blob/v0.5.0/cmd/adapter/adapter.go#L177 In that case, we cannot bindly register the external metrics API. Otherwise, we might see issues described in helm#13716. This patch fixed the issue by conditionally register the external metrics API. Fixes helm#13716 Signed-off-by: Jie Yu <[email protected]> * [stable/prometheus-adapter] bump chart version to 1.0.3 Bump the chart version to 1.0.3 due to the fix of helm#13716. Signed-off-by: Jie Yu <[email protected]> * [stable/prometheus-adapter] use 'and' to combine template directives To address the review comments. Signed-off-by: Jie Yu <[email protected]> * [stable/prometheus-adapter] add ci test values To improve the test coverage. Signed-off-by: Jie Yu <[email protected]>
madifaya · Jun 2, 2019 · 87c90e6 · 87c90e6
1 parent fd7ace6
commit 87c90e6
Show file tree

Hide file tree

Showing 6 changed files with 14 additions and 4 deletions.
diff --git a/stable/prometheus-adapter/Chart.yaml b/stable/prometheus-adapter/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 name: prometheus-adapter
-version: 1.0.2
+version: 1.0.3
 appVersion: v0.5.0
 description: A Helm chart for k8s prometheus adapter
 home: https://github.com/DirectXMan12/k8s-prometheus-adapter

diff --git a/stable/prometheus-adapter/ci/default-values.yaml b/stable/prometheus-adapter/ci/default-values.yaml
diff --git a/stable/prometheus-adapter/ci/external-rules-values.yaml b/stable/prometheus-adapter/ci/external-rules-values.yaml
@@ -0,0 +1,9 @@
+rules:
+  external:
+  - seriesQuery: '{__name__=~"^some_metric_count$"}'
+    resources:
+      template: <<.Resource>>
+    name:
+      matches: ""
+      as: "my_custom_metric"
+    metricsQuery: sum(<<.Series>>{<<.LabelMatchers>>}) by (<<.GroupBy>>)
diff --git a/stable/prometheus-adapter/templates/external-metrics-apiservice.yaml b/stable/prometheus-adapter/templates/external-metrics-apiservice.yaml
@@ -1,3 +1,4 @@
+{{- if .Values.rules.external }}
 apiVersion: apiregistration.k8s.io/v1beta1
 kind: APIService
 metadata:
@@ -19,3 +20,4 @@ spec:
   insecureSkipTLSVerify: {{ if .Values.tls.enable }}false{{ else }}true{{ end }}
   groupPriorityMinimum: 100
   versionPriority: 100
+{{- end -}}
diff --git a/stable/prometheus-adapter/templates/external-metrics-cluster-role.yaml b/stable/prometheus-adapter/templates/external-metrics-cluster-role.yaml
@@ -1,4 +1,4 @@
-{{- if .Values.rbac.create -}}
+{{- if and .Values.rbac.create .Values.rules.external -}}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRole
 metadata:

diff --git a/stable/prometheus-adapter/templates/hpa-external-metrics-cluster-role-binding.yaml b/stable/prometheus-adapter/templates/hpa-external-metrics-cluster-role-binding.yaml
@@ -1,5 +1,4 @@
-
-{{- if .Values.rbac.create -}}
+{{- if and .Values.rbac.create .Values.rules.external -}}
 apiVersion: rbac.authorization.k8s.io/v1
 kind: ClusterRoleBinding
 metadata: