Option to not to use rbac in helm deployment (#3082)

* option to not to use rbac

* default value to match previous settings
This commit is contained in:
Yifan Zhang 2018-11-30 07:39:47 +03:00 committed by Matteo Merli
parent 4cd61bfca8
commit 53ce119519
4 changed files with 8 additions and 0 deletions

View File

@ -55,7 +55,9 @@ spec:
tolerations: tolerations:
{{ toYaml .Values.prometheus.tolerations | indent 8 }} {{ toYaml .Values.prometheus.tolerations | indent 8 }}
{{- end }} {{- end }}
{{- if .Values.prometheus_rbac }}
serviceAccount: "{{ template "pulsar.fullname" . }}-{{ .Values.prometheus.component }}" serviceAccount: "{{ template "pulsar.fullname" . }}-{{ .Values.prometheus.component }}"
{{- end }}
terminationGracePeriodSeconds: {{ .Values.prometheus.gracePeriod }} terminationGracePeriodSeconds: {{ .Values.prometheus.gracePeriod }}
containers: containers:
- name: "{{ template "pulsar.fullname" . }}-{{ .Values.prometheus.component }}" - name: "{{ template "pulsar.fullname" . }}-{{ .Values.prometheus.component }}"

View File

@ -18,6 +18,7 @@
# #
{{- if .Values.extra.monitoring }} {{- if .Values.extra.monitoring }}
{{- if .Values.prometheus_rbac }}
apiVersion: rbac.authorization.k8s.io/v1beta1 apiVersion: rbac.authorization.k8s.io/v1beta1
kind: ClusterRole kind: ClusterRole
metadata: metadata:
@ -55,3 +56,4 @@ subjects:
name: "{{ template "pulsar.fullname" . }}-{{ .Values.prometheus.component }}" name: "{{ template "pulsar.fullname" . }}-{{ .Values.prometheus.component }}"
namespace: {{ .Values.namespace }} namespace: {{ .Values.namespace }}
{{- end }} {{- end }}
{{- end }}

View File

@ -31,6 +31,8 @@ persistence: no
## will be deployed with emptyDir ## will be deployed with emptyDir
prometheus_persistence: no prometheus_persistence: no
prometheus_rbac: yes
## which extra components to deploy ## which extra components to deploy
extra: extra:
# Pulsar proxy # Pulsar proxy

View File

@ -31,6 +31,8 @@ persistence: no
## will be deployed with emptyDir ## will be deployed with emptyDir
prometheus_persistence: yes prometheus_persistence: yes
prometheus_rbac: yes
## which extra components to deploy ## which extra components to deploy
extra: extra:
# Pulsar proxy # Pulsar proxy