feat(Common): properly setup extra-args support (#1708)
This commit is contained in:
parent
d10221485a
commit
9ee0dfe403
|
@ -15,4 +15,4 @@ maintainers:
|
|||
name: common
|
||||
sources: null
|
||||
type: library
|
||||
version: 8.12.1
|
||||
version: 8.12.2
|
||||
|
|
|
@ -11,14 +11,23 @@
|
|||
{{ toYaml . | nindent 4 }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- with .Values.args }}
|
||||
{{- if or ( .Values.extraArgs ) ( .Values.args ) }}
|
||||
args:
|
||||
{{- with .Values.args }}
|
||||
{{- if kindIs "string" . }}
|
||||
- {{ . }}
|
||||
{{- else }}
|
||||
{{ toYaml . | nindent 4 }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- with .Values.extraArgs }}
|
||||
{{- if kindIs "string" . }}
|
||||
- {{ . }}
|
||||
{{- else }}
|
||||
{{ toYaml . | nindent 4 }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
{{- end }}
|
||||
tty: {{ .Values.tty }}
|
||||
stdin: {{ .Values.stdin }}
|
||||
{{- with .Values.securityContext }}
|
||||
|
|
|
@ -125,9 +125,14 @@ imageSelector: "image"
|
|||
|
||||
# -- Override the command(s) for the default container
|
||||
command: []
|
||||
|
||||
# -- Override the args for the default container
|
||||
args: []
|
||||
|
||||
# -- Add args in addition to the arguments set by default.
|
||||
# Primarily for the SCALE GUI
|
||||
extraArgs: []
|
||||
|
||||
# -- Set the primary portal for TrueNAS SCALE
|
||||
portal:
|
||||
# -- enable generation of the portal configmap
|
||||
|
|
|
@ -11,19 +11,10 @@
|
|||
type: list
|
||||
default: []
|
||||
items:
|
||||
- variable: argItem
|
||||
label: "Arg"
|
||||
- variable: arg
|
||||
label: "arg"
|
||||
schema:
|
||||
type: dict
|
||||
attrs:
|
||||
- variable: name
|
||||
label: "Name"
|
||||
schema:
|
||||
type: string
|
||||
- variable: value
|
||||
label: "Value"
|
||||
schema:
|
||||
type: string
|
||||
type: string
|
||||
- variable: labelsList
|
||||
label: "Controller Labels"
|
||||
schema:
|
||||
|
|
Loading…
Reference in New Issue