Skip to content

Commit

Permalink
Option to not to use rbac in helm deployment (apache#3082)
Browse files Browse the repository at this point in the history
* option to not to use rbac

* default value to match previous settings
  • Loading branch information
Yifan Zhang authored and merlimat committed Nov 30, 2018
1 parent e235233 commit 0871a28
Show file tree
Hide file tree
Showing 4 changed files with 8 additions and 0 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,9 @@ spec:
tolerations:
{{ toYaml .Values.prometheus.tolerations | indent 8 }}
{{- end }}
{{- if .Values.prometheus_rbac }}
serviceAccount: "{{ template "pulsar.fullname" . }}-{{ .Values.prometheus.component }}"
{{- end }}
terminationGracePeriodSeconds: {{ .Values.prometheus.gracePeriod }}
containers:
- name: "{{ template "pulsar.fullname" . }}-{{ .Values.prometheus.component }}"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@
#

{{- if .Values.extra.monitoring }}
{{- if .Values.prometheus_rbac }}
apiVersion: rbac.authorization.k8s.io/v1beta1
kind: ClusterRole
metadata:
Expand Down Expand Up @@ -55,3 +56,4 @@ subjects:
name: "{{ template "pulsar.fullname" . }}-{{ .Values.prometheus.component }}"
namespace: {{ .Values.namespace }}
{{- end }}
{{- end }}
2 changes: 2 additions & 0 deletions deployment/kubernetes/helm/pulsar/values-mini.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ persistence: no
## will be deployed with emptyDir
prometheus_persistence: no

prometheus_rbac: yes

## which extra components to deploy
extra:
# Pulsar proxy
Expand Down
2 changes: 2 additions & 0 deletions deployment/kubernetes/helm/pulsar/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,8 @@ persistence: no
## will be deployed with emptyDir
prometheus_persistence: yes

prometheus_rbac: yes

## which extra components to deploy
extra:
# Pulsar proxy
Expand Down

0 comments on commit 0871a28

Please sign in to comment.