github/deprecated-helm-charts
1
0
Fork 0
mirror of https://github.com/helm/charts.git synced 2026-08-23 22:37:45 +00:00
Code Issues Packages Projects Releases Wiki Activity

[stable/prometheus-operator] Allow deploying ServiceAccount without RBAC (#13493)

Browse Source 
Useful for imagePullSecrets

Signed-off-by: Marcos Estevez <marcos.stvz@gmail.com>
This commit is contained in:
Marcos Estévez Martínez
2019-05-21 01:22:42 -07:00
committed by Kubernetes Prow Robot
parent b7668351e7
commit feb59f17dc
5 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
stable/prometheus-operator/Chart.yaml
+1 -1
View File
@@ -9,7 +9,7 @@ name: prometheus-operator
sources:
- https://github.com/coreos/prometheus-operator
- https://coreos.com/operators/prometheus
version: 5.7.0
version: 5.8.0
appVersion: 0.29.0
home: https://github.com/coreos/prometheus-operator
keywords:
stable/prometheus-operator/templates/_helpers.tpl
+3 -3
View File
@@ -56,7 +56,7 @@ heritage: {{ .Release.Service | quote }}
{{/* Create the name of prometheus-operator service account to use */}}
{{- define "prometheus-operator.operator.serviceAccountName" -}}
{{- if and .Values.global.rbac.create .Values.prometheusOperator.serviceAccount.create -}}
{{- if .Values.prometheusOperator.serviceAccount.create -}}
{{ default (include "prometheus-operator.operator.fullname" .) .Values.prometheusOperator.serviceAccount.name }}
{{- else -}}
{{ default "default" .Values.prometheusOperator.serviceAccount.name }}
@@ -65,7 +65,7 @@ heritage: {{ .Release.Service | quote }}
{{/* Create the name of prometheus service account to use */}}
{{- define "prometheus-operator.prometheus.serviceAccountName" -}}
{{- if and .Values.global.rbac.create .Values.prometheus.serviceAccount.create -}}
{{- if .Values.prometheus.serviceAccount.create -}}
{{ default (include "prometheus-operator.prometheus.fullname" .) .Values.prometheus.serviceAccount.name }}
{{- else -}}
{{ default "default" .Values.prometheus.serviceAccount.name }}
@@ -74,7 +74,7 @@ heritage: {{ .Release.Service | quote }}
{{/* Create the name of alertmanager service account to use */}}
{{- define "prometheus-operator.alertmanager.serviceAccountName" -}}
{{- if and .Values.global.rbac.create .Values.alertmanager.serviceAccount.create -}}
{{- if .Values.alertmanager.serviceAccount.create -}}
{{ default (include "prometheus-operator.alertmanager.fullname" .) .Values.alertmanager.serviceAccount.name }}
{{- else -}}
{{ default "default" .Values.alertmanager.serviceAccount.name }}
stable/prometheus-operator/templates/alertmanager/serviceaccount.yaml
+1 -1
View File
@@ -1,4 +1,4 @@
{{- if and .Values.alertmanager.enabled .Values.global.rbac.create .Values.alertmanager.serviceAccount.create }}
{{- if and .Values.alertmanager.enabled .Values.alertmanager.serviceAccount.create }}
apiVersion: v1
kind: ServiceAccount
metadata:
stable/prometheus-operator/templates/prometheus-operator/serviceaccount.yaml
+1 -1
View File
@@ -1,4 +1,4 @@
{{- if and .Values.prometheusOperator.enabled .Values.global.rbac.create .Values.prometheusOperator.serviceAccount.create }}
{{- if and .Values.prometheusOperator.enabled .Values.prometheusOperator.serviceAccount.create }}
apiVersion: v1
kind: ServiceAccount
metadata:
stable/prometheus-operator/templates/prometheus/serviceaccount.yaml
+1 -1
View File
@@ -1,4 +1,4 @@
{{- if and .Values.prometheus.enabled .Values.global.rbac.create .Values.prometheus.serviceAccount.create }}
{{- if and .Values.prometheus.enabled .Values.prometheus.serviceAccount.create }}
apiVersion: v1
kind: ServiceAccount
metadata: