Merge pull request #147 from alexconlin/patch-1

Remove empty fields from kustomize deployment
This commit is contained in:
Ahmed Waleed Malik
2020-07-17 14:07:01 +05:00
committed by GitHub
3 changed files with 10 additions and 11 deletions
@@ -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 }}
@@ -33,11 +33,9 @@ spec:
spec:
containers:
- env:
image: "stakater/reloader:v0.0.61"
- image: "stakater/reloader:v0.0.61"
imagePullPolicy: IfNotPresent
name: reloader-reloader
args:
securityContext:
runAsNonRoot: true
runAsUser: 65534
+1 -3
View File
@@ -100,11 +100,9 @@ spec:
spec:
containers:
- env:
image: "stakater/reloader:v0.0.61"
- image: "stakater/reloader:v0.0.61"
imagePullPolicy: IfNotPresent
name: reloader-reloader
args:
securityContext:
runAsNonRoot: true
runAsUser: 65534