From 10bed0a007023d0fcb2d84e3604ccfd89f1585a9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marcos=20Est=C3=A9vez=20Mart=C3=ADnez?= Date: Thu, 9 May 2019 22:36:48 +0200 Subject: [PATCH] [stable/kube-state-metrics] Allows deploying ServiceAccount without RBAC (#13495) Useful for imagePullSecrets Signed-off-by: Marcos Estevez --- stable/kube-state-metrics/Chart.yaml | 2 +- stable/kube-state-metrics/README.md | 4 ++-- stable/kube-state-metrics/templates/serviceaccount.yaml | 2 -- 3 files changed, 3 insertions(+), 5 deletions(-) diff --git a/stable/kube-state-metrics/Chart.yaml b/stable/kube-state-metrics/Chart.yaml index dbd522c371..d281f23072 100644 --- a/stable/kube-state-metrics/Chart.yaml +++ b/stable/kube-state-metrics/Chart.yaml @@ -5,7 +5,7 @@ keywords: - metric - monitoring - prometheus -version: 1.3.0 +version: 1.4.0 appVersion: 1.6.0 home: https://github.com/kubernetes/kube-state-metrics/ sources: diff --git a/stable/kube-state-metrics/README.md b/stable/kube-state-metrics/README.md index bcf1b4dacd..e48780adc3 100644 --- a/stable/kube-state-metrics/README.md +++ b/stable/kube-state-metrics/README.md @@ -22,7 +22,7 @@ $ helm install stable/kube-state-metrics | `hostNetwork` | Whether or not to use the host network | false | | `prometheusScrape` | Whether or not enable prom scrape | true | | `rbac.create` | If true, create & use RBAC resources | true | -| `serviceAccount.create` | If true, and rbac true, create & use serviceAccount | true | +| `serviceAccount.create` | If true, create & use serviceAccount | true | | `serviceAccount.name` | If not set & create is true, use template fullname | | | `serviceAccount.imagePullSecrets` | Specify image pull secrets field | `[]` | | `podSecurityPolicy.enabled` | If true, create & use PodSecurityPolicy resources | false | @@ -32,7 +32,7 @@ $ helm install stable/kube-state-metrics | `securityContext.runAsUser` | User ID for the container | `65534` | | `priorityClassName` | Name of Priority Class to assign pods | `nil` | | `nodeSelector` | Node labels for pod assignment | {} | -| `tolerations` | Tolerations for pod assignment | [] | +| `tolerations` | Tolerations for pod assignment | [] | | `podAnnotations` | Annotations to be added to the pod | {} | | `resources` | kube-state-metrics resource requests and limits | {} | | `collectors.certificatesigningrequests` | Enable the certificatesigningrequests collector. | true | diff --git a/stable/kube-state-metrics/templates/serviceaccount.yaml b/stable/kube-state-metrics/templates/serviceaccount.yaml index edac3b99ff..5459abb10a 100644 --- a/stable/kube-state-metrics/templates/serviceaccount.yaml +++ b/stable/kube-state-metrics/templates/serviceaccount.yaml @@ -1,4 +1,3 @@ -{{- if .Values.rbac.create -}} {{- if .Values.serviceAccount.create -}} apiVersion: v1 kind: ServiceAccount @@ -12,4 +11,3 @@ metadata: imagePullSecrets: {{ toYaml .Values.serviceAccount.imagePullSecrets | indent 2 }} {{- end -}} -{{- end -}}