Fix nested format

This commit is contained in:
Waqar Ahmed 2020-09-29 01:01:27 +05:00
parent ae90a73a52
commit caccef7af1
3 changed files with 17 additions and 18 deletions

View File

@ -6,21 +6,21 @@
type: dict
required: true
attrs:
- variable: image.repository
- variable: repository
description: "Docker image repository"
label: "Image repository"
group: "Container Images"
schema:
type: string
required: true
- variable: image.tag
- variable: tag
description: "Tag to use for specified image"
label: "Image Tag"
group: "Container Images"
schema:
type: string
default: "latest"
- variable: image.pull_policy
- variable: pull_policy
description: "Docker Image Pull Policy"
label: "Image Pull Policy"
group: "Container Images"
@ -33,7 +33,7 @@
- "Never"
# Configurable CMD / Entrypoint / Environment Variables
- variable: container_entrypoint
- variable: container_command
description: "Commands to execute inside container overriding image CMD default"
label: "Container CMD"
group: "Container Entrypoint"
@ -45,7 +45,7 @@
label: "Command"
schema:
type: string
- variable: container.args
- variable: container_args
description: "Specify arguments for container command"
label: "Container Args"
group: "Container Entrypoint"
@ -57,7 +57,7 @@
label: "Arg"
schema:
type: string
- variable: container.environment_variables
- variable: container_environment_variables
description: "Container Environment Variables"
label: "Container Environment Variables"
group: "Container Entrypoint"

View File

@ -18,22 +18,22 @@ spec:
securityContext:
{{- toYaml .Values.securityContext | nindent 12 }}
image: "{{ .Values.image.repository }}:{{ .Values.image.tag | default "latest" }}"
imagePullPolicy: {{ .Values.image.pullPolicy }}
{{- if .Values.container_entrypoint.command }}
imagePullPolicy: {{ .Values.image.pull_policy }}
{{- if .Values.container_command }}
command:
{{- range .Values.container_entrypoint.command }}
{{- range .Values.container_command }}
- {{ . | quote}}
{{- end }}
{{- end }}
{{- if .Values.container_entrypoint.args }}
{{- if .Values.container_args }}
args:
{{- range .Values.container_entrypoint.args }}
{{- range .Values.container_args }}
- {{ . | quote}}
{{- end }}
{{- end }}
{{- if .Values.container_entrypoint.environment_variables }}
{{- if .Values.container_environment_variables }}
env:
{{- range .Values.container_entrypoint.environment_variables }}
{{- range .Values.container_environment_variables }}
- name: {{ .name | quote }}
value: {{ .value | quote }}
{{- end }}

View File

@ -2,12 +2,11 @@
image:
repository: debian
pullPolicy: IfNotPresent
pull_policy: IfNotPresent
# Overrides the image tag whose default is the chart appVersion.
tag: "testing"
# Container CMD / entrypoint
container_entrypoint:
command: []
args: []
environment_variables: []
container_command: []
container_args: []
container_environment_variables: []