From 1ad7a8fa76eb92cf50805608959318da768eca71 Mon Sep 17 00:00:00 2001 From: faizanahmad055 Date: Thu, 26 Jul 2018 17:36:33 +0500 Subject: [PATCH] Update deployment and rbac to watch globally --- .../chart/reloader/templates/deployment.yaml | 2 + .../chart/reloader/templates/rbac.yaml | 53 ++++++++++++++++++- .../kubernetes/chart/reloader/values.yaml | 3 +- .../templates/chart/values.yaml.tmpl | 3 +- 4 files changed, 58 insertions(+), 3 deletions(-) diff --git a/deployments/kubernetes/chart/reloader/templates/deployment.yaml b/deployments/kubernetes/chart/reloader/templates/deployment.yaml index 0b562a65..fd746d70 100644 --- a/deployments/kubernetes/chart/reloader/templates/deployment.yaml +++ b/deployments/kubernetes/chart/reloader/templates/deployment.yaml @@ -18,10 +18,12 @@ spec: spec: containers: - env: + {{- if eq .Values.reloader.watchGlobally false }} - name: KUBERNETES_NAMESPACE valueFrom: fieldRef: fieldPath: metadata.namespace + {{- end }} image: "{{ .Values.reloader.image.name }}:{{ .Values.reloader.image.tag }}" imagePullPolicy: {{ .Values.reloader.image.pullPolicy }} name: {{ template "reloader-name" . }} diff --git a/deployments/kubernetes/chart/reloader/templates/rbac.yaml b/deployments/kubernetes/chart/reloader/templates/rbac.yaml index cc0b0d3e..6b0c25a4 100644 --- a/deployments/kubernetes/chart/reloader/templates/rbac.yaml +++ b/deployments/kubernetes/chart/reloader/templates/rbac.yaml @@ -6,6 +6,56 @@ metadata: {{ include "reloader-labels.chart" . | indent 4 }} name: {{ template "reloader-name" . }} --- +{{- if .Values.reloader.watchGlobally }} +apiVersion: rbac.authorization.k8s.io/v1beta1 +kind: ClusterRole +metadata: + labels: +{{ include "reloader-labels.stakater" . | indent 4 }} +{{ include "reloader-labels.chart" . | indent 4 }} + name: {{ template "reloader-name" . }}-role + namespace: {{ .Release.Namespace }} +rules: + - apiGroups: + - "" + resources: + - secrets + - configmaps + verbs: + - list + - get + - watch + - apiGroups: + - "" + - "extensions" + - "apps" + resources: + - deployments + - daemonsets + - statefulsets + verbs: + - list + - get + - update + - patch +--- +apiVersion: rbac.authorization.k8s.io/v1beta1 +kind: ClusterRoleBinding +metadata: + labels: +{{ include "reloader-labels.stakater" . | indent 4 }} +{{ include "reloader-labels.chart" . | indent 4 }} + name: {{ template "reloader-name" . }}-role-binding + namespace: {{ .Release.Namespace }} +roleRef: + apiGroup: rbac.authorization.k8s.io + kind: ClusterRole + name: {{ template "reloader-name" . }}-role +subjects: + - kind: ServiceAccount + name: {{ template "reloader-name" . }} + namespace: {{ .Release.Namespace }} +{{- else }} apiVersion: rbac.authorization.k8s.io/v1beta1 kind: Role metadata: @@ -53,4 +103,5 @@ roleRef: subjects: - kind: ServiceAccount name: {{ template "reloader-name" . }} - namespace: {{ .Release.Namespace }} \ No newline at end of file + namespace: {{ .Release.Namespace }} +{{- end }} \ No newline at end of file diff --git a/deployments/kubernetes/chart/reloader/values.yaml b/deployments/kubernetes/chart/reloader/values.yaml index 1182fd33..6e15c9ab 100644 --- a/deployments/kubernetes/chart/reloader/values.yaml +++ b/deployments/kubernetes/chart/reloader/values.yaml @@ -11,4 +11,5 @@ reloader: image: name: stakater/reloader tag: "0.0.2" - pullPolicy: IfNotPresent \ No newline at end of file + pullPolicy: IfNotPresent + watchGlobally: false diff --git a/deployments/kubernetes/templates/chart/values.yaml.tmpl b/deployments/kubernetes/templates/chart/values.yaml.tmpl index 8d6a0c57..13e5e09b 100644 --- a/deployments/kubernetes/templates/chart/values.yaml.tmpl +++ b/deployments/kubernetes/templates/chart/values.yaml.tmpl @@ -11,4 +11,5 @@ reloader: image: name: {{ getenv "DOCKER_IMAGE" }} tag: "{{ getenv "VERSION" }}" - pullPolicy: IfNotPresent \ No newline at end of file + pullPolicy: IfNotPresent + watchGlobally: false \ No newline at end of file