From 0ddfe8406dbe7c29ed9bdd24b6b5bcf35b6e9cdc Mon Sep 17 00:00:00 2001 From: irti Date: Tue, 13 Aug 2019 17:58:53 +0500 Subject: [PATCH 1/4] [fix-issue-79] fix for default value issue for service account --- deployments/kubernetes/chart/reloader/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deployments/kubernetes/chart/reloader/values.yaml b/deployments/kubernetes/chart/reloader/values.yaml index 54198e19..22ae5024 100644 --- a/deployments/kubernetes/chart/reloader/values.yaml +++ b/deployments/kubernetes/chart/reloader/values.yaml @@ -73,7 +73,7 @@ reloader: labels: {} # The name of the ServiceAccount to use. # If not set and create is true, a name is generated using the fullname template - name: reloader + name: null # Optional flags to pass to the Reloader entrypoint # Example: # custom_annotations: From 83a711885c5a9d7daab47d923cffd1aab6df22f3 Mon Sep 17 00:00:00 2001 From: irti Date: Tue, 13 Aug 2019 18:14:51 +0500 Subject: [PATCH 2/4] [fix-issue-79] add nodeSelector, affinity and tolerations in deployment manifest --- deployments/kubernetes/manifests/deployment.yaml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/deployments/kubernetes/manifests/deployment.yaml b/deployments/kubernetes/manifests/deployment.yaml index 06cdb18f..7719fa6c 100644 --- a/deployments/kubernetes/manifests/deployment.yaml +++ b/deployments/kubernetes/manifests/deployment.yaml @@ -32,6 +32,9 @@ spec: version: v0.0.38 spec: + nodeSelector: + affinity: + tolerations: containers: - env: image: "stakater/reloader:v0.0.38" From d599340549e6d064d9e0dc8dae1d7b4053f04fee Mon Sep 17 00:00:00 2001 From: irti Date: Tue, 20 Aug 2019 10:28:35 +0500 Subject: [PATCH 3/4] [fix-issue-79] remove reloader-name template and replace it with reloader-fullname --- .../kubernetes/chart/reloader/templates/_helpers.tpl | 5 +---- .../kubernetes/chart/reloader/templates/clusterrole.yaml | 2 +- .../chart/reloader/templates/clusterrolebinding.yaml | 4 ++-- .../kubernetes/chart/reloader/templates/deployment.yaml | 6 +++--- deployments/kubernetes/chart/reloader/templates/role.yaml | 2 +- .../kubernetes/chart/reloader/templates/rolebinding.yaml | 4 ++-- 6 files changed, 10 insertions(+), 13 deletions(-) diff --git a/deployments/kubernetes/chart/reloader/templates/_helpers.tpl b/deployments/kubernetes/chart/reloader/templates/_helpers.tpl index 09593e5d..a2d2ef19 100644 --- a/deployments/kubernetes/chart/reloader/templates/_helpers.tpl +++ b/deployments/kubernetes/chart/reloader/templates/_helpers.tpl @@ -2,9 +2,6 @@ {{/* Expand the name of the chart. */}} -{{- define "reloader-name" -}} -{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" | lower -}} -{{- end -}} {{/* Create a default fully qualified app name. @@ -16,7 +13,7 @@ We truncate at 63 chars because some Kubernetes name fields are limited to this {{- end -}} {{- define "reloader-labels.chart" -}} -app: {{ template "reloader-name" . }} +app: {{ template "reloader-fullname" . }} chart: "{{ .Chart.Name }}-{{ .Chart.Version }}" release: {{ .Release.Name | quote }} heritage: {{ .Release.Service | quote }} diff --git a/deployments/kubernetes/chart/reloader/templates/clusterrole.yaml b/deployments/kubernetes/chart/reloader/templates/clusterrole.yaml index b622bee1..8d51ef40 100644 --- a/deployments/kubernetes/chart/reloader/templates/clusterrole.yaml +++ b/deployments/kubernetes/chart/reloader/templates/clusterrole.yaml @@ -10,7 +10,7 @@ metadata: {{- if .Values.reloader.matchLabels }} {{ toYaml .Values.reloader.matchLabels | indent 4 }} {{- end }} - name: {{ template "reloader-name" . }}-role + name: {{ template "reloader-fullname" . }}-role namespace: {{ .Release.Namespace }} rules: - apiGroups: diff --git a/deployments/kubernetes/chart/reloader/templates/clusterrolebinding.yaml b/deployments/kubernetes/chart/reloader/templates/clusterrolebinding.yaml index aebd6734..28c9d4b9 100644 --- a/deployments/kubernetes/chart/reloader/templates/clusterrolebinding.yaml +++ b/deployments/kubernetes/chart/reloader/templates/clusterrolebinding.yaml @@ -10,12 +10,12 @@ metadata: {{- if .Values.reloader.matchLabels }} {{ toYaml .Values.reloader.matchLabels | indent 4 }} {{- end }} - name: {{ template "reloader-name" . }}-role-binding + name: {{ template "reloader-fullname" . }}-role-binding namespace: {{ .Release.Namespace }} roleRef: apiGroup: rbac.authorization.k8s.io kind: ClusterRole - name: {{ template "reloader-name" . }}-role + name: {{ template "reloader-fullname" . }}-role subjects: - kind: ServiceAccount name: {{ template "reloader-serviceAccountName" . }} diff --git a/deployments/kubernetes/chart/reloader/templates/deployment.yaml b/deployments/kubernetes/chart/reloader/templates/deployment.yaml index a72a2f77..2beb581f 100644 --- a/deployments/kubernetes/chart/reloader/templates/deployment.yaml +++ b/deployments/kubernetes/chart/reloader/templates/deployment.yaml @@ -13,13 +13,13 @@ metadata: {{- if .Values.reloader.matchLabels }} {{ toYaml .Values.reloader.matchLabels | indent 4 }} {{- end }} - name: {{ template "reloader-name" . }} + name: {{ template "reloader-fullname" . }} spec: replicas: 1 revisionHistoryLimit: 2 selector: matchLabels: - app: {{ template "reloader-name" . }} + app: {{ template "reloader-fullname" . }} release: {{ .Release.Name | quote }} {{- if .Values.reloader.matchLabels }} {{ toYaml .Values.reloader.matchLabels | indent 6 }} @@ -81,7 +81,7 @@ spec: {{- end }} image: "{{ .Values.reloader.deployment.image.name }}:{{ .Values.reloader.deployment.image.tag }}" imagePullPolicy: {{ .Values.reloader.deployment.image.pullPolicy }} - name: {{ template "reloader-name" . }} + name: {{ template "reloader-fullname" . }} {{- if eq .Values.reloader.readOnlyRootFileSystem true }} volumeMounts: - mountPath: /tmp/ diff --git a/deployments/kubernetes/chart/reloader/templates/role.yaml b/deployments/kubernetes/chart/reloader/templates/role.yaml index dd4507c0..8b616592 100644 --- a/deployments/kubernetes/chart/reloader/templates/role.yaml +++ b/deployments/kubernetes/chart/reloader/templates/role.yaml @@ -10,7 +10,7 @@ metadata: {{- if .Values.reloader.matchLabels }} {{ toYaml .Values.reloader.matchLabels | indent 4 }} {{- end }} - name: {{ template "reloader-name" . }}-role + name: {{ template "reloader-fullname" . }}-role namespace: {{ .Release.Namespace }} rules: - apiGroups: diff --git a/deployments/kubernetes/chart/reloader/templates/rolebinding.yaml b/deployments/kubernetes/chart/reloader/templates/rolebinding.yaml index 31b37792..94fb1f83 100644 --- a/deployments/kubernetes/chart/reloader/templates/rolebinding.yaml +++ b/deployments/kubernetes/chart/reloader/templates/rolebinding.yaml @@ -10,12 +10,12 @@ metadata: {{- if .Values.reloader.matchLabels }} {{ toYaml .Values.reloader.matchLabels | indent 4 }} {{- end }} - name: {{ template "reloader-name" . }}-role-binding + name: {{ template "reloader-fullname" . }}-role-binding namespace: {{ .Release.Namespace }} roleRef: apiGroup: rbac.authorization.k8s.io kind: Role - name: {{ template "reloader-name" . }}-role + name: {{ template "reloader-fullname" . }}-role subjects: - kind: ServiceAccount name: {{ template "reloader-serviceAccountName" . }} From 0bf2fc66cc3ad192e62a06095ae63abfc50748f7 Mon Sep 17 00:00:00 2001 From: irti Date: Tue, 20 Aug 2019 14:20:40 +0500 Subject: [PATCH 4/4] [fix-issue-79] add reloader-name template in _helpers.tpl --- deployments/kubernetes/chart/reloader/templates/_helpers.tpl | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/deployments/kubernetes/chart/reloader/templates/_helpers.tpl b/deployments/kubernetes/chart/reloader/templates/_helpers.tpl index a2d2ef19..15ca27ef 100644 --- a/deployments/kubernetes/chart/reloader/templates/_helpers.tpl +++ b/deployments/kubernetes/chart/reloader/templates/_helpers.tpl @@ -3,6 +3,10 @@ Expand the name of the chart. */}} +{{- define "reloader-name" -}} +{{- default .Chart.Name .Values.nameOverride | trunc 63 | trimSuffix "-" | lower -}} +{{- end -}} + {{/* Create a default fully qualified app name. We truncate at 63 chars because some Kubernetes name fields are limited to this (by the DNS naming spec).