Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: bundle should not start a new list entry #1212

Merged
merged 1 commit into from
Sep 20, 2023
Merged

fix: bundle should not start a new list entry #1212

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
6 changes: 3 additions & 3 deletions charts/eks/templates/init-configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ metadata:
heritage: "{{ .Release.Service }}"
{{- if .Values.globalAnnotations}}
annotations:
{{ toYaml .Values.globalAnnotations | indent 4 }}
{{ toYaml .Values.globalAnnotations | indent 4 }}
{{- end }}
data:
manifests: |-
Expand All @@ -36,7 +36,7 @@ data:
{{- end}}
{{- end }}
{{- if .bundle }}
- bundle: {{ .bundle }}
bundle: {{ .bundle }}
{{- end }}
{{- if or .chart .bundle }}
{{- if or .values .valuesTemplate }}
Expand All @@ -52,4 +52,4 @@ data:
{{- end }}
{{- end }}
{{- end }}
{{- end }}
{{- end }}
16 changes: 16 additions & 0 deletions charts/eks/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -389,6 +389,22 @@ init:
# this allows you to use helm values inside, e.g.: {{ .Release.Name }}
manifestsTemplate: ''
helm: []
# - bundle: <string> - base64-encoded .tar.gz file content (optional - overrides chart.repo)
# chart:
# name: <string> REQUIRED
# version: <string> REQUIRED
# repo: <string> (optional when bundle is used)
# username: <string> (if required for repo)
# password: <string> (if required for repo)
# insecure: boolean (if required for repo)
# release:
# releaseName: <string> REQUIRED
# releaseNamespace: <string> REQUIRED
# timeout: number
# values: |- string YAML object
# foo: bar
# valuesTemplate: |- string YAML object
# foo: {{ .Release.Name }}

# If enabled will deploy vcluster in an isolated mode with pod security
# standards, limit ranges and resource quotas
Expand Down
4 changes: 2 additions & 2 deletions charts/k0s/templates/init-configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ data:
{{- end}}
{{- end }}
{{- if .bundle }}
- bundle: {{ .bundle }}
bundle: {{ .bundle }}
{{- end }}
{{- if or .chart .bundle }}
{{- if or .values .valuesTemplate }}
Expand All @@ -52,4 +52,4 @@ data:
{{- end }}
{{- end }}
{{- end }}
{{- end }}
{{- end }}
16 changes: 16 additions & 0 deletions charts/k0s/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -412,6 +412,22 @@ init:
# this allows you to use helm values inside, e.g.: {{ .Release.Name }}
manifestsTemplate: ''
helm: []
# - bundle: <string> - base64-encoded .tar.gz file content (optional - overrides chart.repo)
# chart:
# name: <string> REQUIRED
# version: <string> REQUIRED
# repo: <string> (optional when bundle is used)
# username: <string> (if required for repo)
# password: <string> (if required for repo)
# insecure: boolean (if required for repo)
# release:
# releaseName: <string> REQUIRED
# releaseNamespace: <string> REQUIRED
# timeout: number
# values: |- string YAML object
# foo: bar
# valuesTemplate: |- string YAML object
# foo: {{ .Release.Name }}

multiNamespaceMode:
enabled: false
Expand Down
4 changes: 2 additions & 2 deletions charts/k3s/templates/init-configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ data:
{{- end}}
{{- end }}
{{- if .bundle }}
- bundle: {{ .bundle }}
bundle: {{ .bundle }}
{{- end }}
{{- if or .chart .bundle }}
{{- if or .values .valuesTemplate }}
Expand All @@ -52,4 +52,4 @@ data:
{{- end }}
{{- end }}
{{- end }}
{{- end }}
{{- end }}
16 changes: 16 additions & 0 deletions charts/k3s/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -432,6 +432,22 @@ init:
# this allows you to use helm values inside, e.g.: {{ .Release.Name }}
manifestsTemplate: ''
helm: []
# - bundle: <string> - base64-encoded .tar.gz file content (optional - overrides chart.repo)
# chart:
# name: <string> REQUIRED
# version: <string> REQUIRED
# repo: <string> (optional when bundle is used)
# username: <string> (if required for repo)
# password: <string> (if required for repo)
# insecure: boolean (if required for repo)
# release:
# releaseName: <string> REQUIRED
# releaseNamespace: <string> REQUIRED
# timeout: number
# values: |- string YAML object
# foo: bar
# valuesTemplate: |- string YAML object
# foo: {{ .Release.Name }}

multiNamespaceMode:
enabled: false
Expand Down
4 changes: 2 additions & 2 deletions charts/k8s/templates/init-configmap.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ data:
{{- end}}
{{- end }}
{{- if .bundle }}
- bundle: {{ .bundle }}
bundle: {{ .bundle }}
{{- end }}
{{- if or .chart .bundle }}
{{- if or .values .valuesTemplate }}
Expand All @@ -52,4 +52,4 @@ data:
{{- end }}
{{- end }}
{{- end }}
{{- end }}
{{- end }}
16 changes: 16 additions & 0 deletions charts/k8s/values.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -477,6 +477,22 @@ init:
# this allows you to use helm values inside, e.g.: {{ .Release.Name }}
manifestsTemplate: ''
helm: []
# - bundle: <string> - base64-encoded .tar.gz file content (optional - overrides chart.repo)
# chart:
# name: <string> REQUIRED
# version: <string> REQUIRED
# repo: <string> (optional when bundle is used)
# username: <string> (if required for repo)
# password: <string> (if required for repo)
# insecure: boolean (if required for repo)
# release:
# releaseName: <string> REQUIRED
# releaseNamespace: <string> REQUIRED
# timeout: number
# values: |- string YAML object
# foo: bar
# valuesTemplate: |- string YAML object
# foo: {{ .Release.Name }}

multiNamespaceMode:
enabled: false
Expand Down
3 changes: 3 additions & 0 deletions docs/pages/operator/init-manifests.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,9 @@ Next we can paste the bundle in our values file:
init:
helm:
- bundle: <base64_encoded_tar_bundle>
chart:
name: my-chart
version: <chart version>
values: |-
foo: bar
release:
Expand Down