From db79c653346d07f96ae490bfab0fabc87de3f054 Mon Sep 17 00:00:00 2001 From: Alex Conlin Date: Tue, 7 Jul 2020 22:52:53 +0100 Subject: [PATCH 1/3] Remove empty fields from kustomize deployment Fixes #115 --- deployments/kubernetes/reloader.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/deployments/kubernetes/reloader.yaml b/deployments/kubernetes/reloader.yaml index 65528f12..c7ad1373 100644 --- a/deployments/kubernetes/reloader.yaml +++ b/deployments/kubernetes/reloader.yaml @@ -100,11 +100,9 @@ spec: spec: containers: - - env: - image: "stakater/reloader:v0.0.60" + - image: "stakater/reloader:v0.0.60" imagePullPolicy: IfNotPresent name: reloader-reloader - args: serviceAccountName: reloader-reloader --- From 4800af8e285c69fe23d54daf3cf36135b6e8be21 Mon Sep 17 00:00:00 2001 From: Alex Conlin Date: Wed, 8 Jul 2020 11:22:43 +0100 Subject: [PATCH 2/3] Remove empty fields from deployment manifest --- deployments/kubernetes/manifests/deployment.yaml | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/deployments/kubernetes/manifests/deployment.yaml b/deployments/kubernetes/manifests/deployment.yaml index 4de0cc09..6ddc1bba 100644 --- a/deployments/kubernetes/manifests/deployment.yaml +++ b/deployments/kubernetes/manifests/deployment.yaml @@ -33,10 +33,8 @@ spec: spec: containers: - - env: - image: "stakater/reloader:v0.0.60" + - image: "stakater/reloader:v0.0.60" imagePullPolicy: IfNotPresent name: reloader-reloader - args: serviceAccountName: reloader-reloader From 8d77121c3bc78046a0cd0cc7ea211bb75b253420 Mon Sep 17 00:00:00 2001 From: Alex Conlin-Oakley Date: Wed, 15 Jul 2020 17:41:39 +0100 Subject: [PATCH 3/3] only include env and args in container when needed --- .../chart/reloader/templates/deployment.yaml | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/deployments/kubernetes/chart/reloader/templates/deployment.yaml b/deployments/kubernetes/chart/reloader/templates/deployment.yaml index e56c9783..98832a62 100644 --- a/deployments/kubernetes/chart/reloader/templates/deployment.yaml +++ b/deployments/kubernetes/chart/reloader/templates/deployment.yaml @@ -52,7 +52,11 @@ spec: {{ toYaml .Values.reloader.deployment.tolerations | indent 8 }} {{- end }} containers: - - env: + - image: "{{ .Values.reloader.deployment.image.name }}:{{ .Values.reloader.deployment.image.tag }}" + imagePullPolicy: {{ .Values.reloader.deployment.image.pullPolicy }} + name: {{ template "reloader-fullname" . }} + {{- if or (.Values.reloader.deployment.env.open) (.Values.reloader.deployment.env.secret) (.Values.reloader.deployment.env.field) }} + env: {{- range $name, $value := .Values.reloader.deployment.env.open }} {{- if not (empty $value) }} - name: {{ $name | quote }} @@ -83,14 +87,13 @@ spec: fieldRef: fieldPath: metadata.namespace {{- end }} - image: "{{ .Values.reloader.deployment.image.name }}:{{ .Values.reloader.deployment.image.tag }}" - imagePullPolicy: {{ .Values.reloader.deployment.image.pullPolicy }} - name: {{ template "reloader-fullname" . }} + {{- end }} {{- if eq .Values.reloader.readOnlyRootFileSystem true }} volumeMounts: - mountPath: /tmp/ name: tmp-volume {{- end }} + {{- if or (.Values.reloader.logFormat) (.Values.reloader.ignoreSecrets) (eq .Values.reloader.ignoreConfigMaps true) (.Values.reloader.custom_annotations) }} args: {{- if .Values.reloader.logFormat }} - "--log-format={{ .Values.reloader.logFormat }}" @@ -116,7 +119,7 @@ spec: - "{{ .Values.reloader.custom_annotations.auto }}" {{- end }} {{- end }} - + {{- end }} {{- if .Values.reloader.deployment.resources }} resources: {{ toYaml .Values.reloader.deployment.resources | indent 10 }}