From 63ca8f76e2e07ae1bc1dd59074c96d3d86316ae5 Mon Sep 17 00:00:00 2001 From: Alex Williams Date: Sun, 17 May 2020 16:49:35 +0100 Subject: [PATCH] [kube2iam] - add labels to ServiceMonitor (#21605) Signed-off-by: Alex Williams --- stable/kube2iam/Chart.yaml | 2 +- stable/kube2iam/README.md | 1 + stable/kube2iam/templates/servicemonitor.yaml | 3 +++ stable/kube2iam/values.yaml | 2 ++ 4 files changed, 7 insertions(+), 1 deletion(-) diff --git a/stable/kube2iam/Chart.yaml b/stable/kube2iam/Chart.yaml index 95d6320fc9..ce7c8a7a56 100644 --- a/stable/kube2iam/Chart.yaml +++ b/stable/kube2iam/Chart.yaml @@ -1,6 +1,6 @@ apiVersion: v1 name: kube2iam -version: 2.4.0 +version: 2.5.0 appVersion: 0.10.9 description: Provide IAM credentials to pods based on annotations. keywords: diff --git a/stable/kube2iam/README.md b/stable/kube2iam/README.md index ab11156bce..2d41f5f269 100644 --- a/stable/kube2iam/README.md +++ b/stable/kube2iam/README.md @@ -61,6 +61,7 @@ Parameter | Description | Default `prometheus.serviceMonitor.enabled` | If true, create a Prometheus Operator ServiceMonitor resource | `false` `prometheus.serviceMonitor.interval` | Interval at which the metrics endpoint is scraped | `10s` `prometheus.serviceMonitor.namespace` | An alternative namespace in which to install the ServiceMonitor | `""` +`prometheus.serviceMonitor.labels` | Labels to add to the ServiceMonitor | `{}` `rbac.create` | If true, create & use RBAC resources | `false` `rbac.serviceAccountName` | existing ServiceAccount to use (ignored if rbac.create=true) | `default` `resources` | pod resource requests & limits | `{}` diff --git a/stable/kube2iam/templates/servicemonitor.yaml b/stable/kube2iam/templates/servicemonitor.yaml index e7d93f5fa5..0f7492641e 100644 --- a/stable/kube2iam/templates/servicemonitor.yaml +++ b/stable/kube2iam/templates/servicemonitor.yaml @@ -11,6 +11,9 @@ metadata: helm.sh/chart: {{ template "kube2iam.chart" . }} app.kubernetes.io/instance: {{ .Release.Name }} app.kubernetes.io/managed-by: {{ .Release.Service }} + {{- if .Values.prometheus.serviceMonitor.labels }} + {{- toYaml .Values.prometheus.serviceMonitor.labels | nindent 4 }} + {{- end }} spec: selector: matchLabels: diff --git a/stable/kube2iam/values.yaml b/stable/kube2iam/values.yaml index 7f817d0550..1655d86b9c 100644 --- a/stable/kube2iam/values.yaml +++ b/stable/kube2iam/values.yaml @@ -32,6 +32,8 @@ prometheus: interval: 10s # Alternative namespace to install the ServiceMonitor in namespace: "" + # Labels to add to the service monitor + labels: {} image: repository: jtblin/kube2iam