[stable/kube-state-metrics] Allows deploying ServiceAccount without R…

…BAC (helm#13495) Useful for imagePullSecrets Signed-off-by: Marcos Estevez <marcos.stvz@gmail.com>
eyenx · May 28, 2019 · 22e3435 · 22e3435
1 parent bd03c63
commit 22e3435
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 5 deletions.
diff --git 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
@@ -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
@@ -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 -}}