diff --git a/charts/eks/templates/init-configmap.yaml b/charts/eks/templates/init-configmap.yaml index 1b8cde11d..cc461ae6c 100644 --- a/charts/eks/templates/init-configmap.yaml +++ b/charts/eks/templates/init-configmap.yaml @@ -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: |- @@ -36,7 +36,7 @@ data: {{- end}} {{- end }} {{- if .bundle }} - - bundle: {{ .bundle }} + bundle: {{ .bundle }} {{- end }} {{- if or .chart .bundle }} {{- if or .values .valuesTemplate }} @@ -52,4 +52,4 @@ data: {{- end }} {{- end }} {{- end }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/charts/eks/values.yaml b/charts/eks/values.yaml index 04152d244..696676281 100644 --- a/charts/eks/values.yaml +++ b/charts/eks/values.yaml @@ -389,6 +389,22 @@ init: # this allows you to use helm values inside, e.g.: {{ .Release.Name }} manifestsTemplate: '' helm: [] + # - bundle: - base64-encoded .tar.gz file content (optional - overrides chart.repo) + # chart: + # name: REQUIRED + # version: REQUIRED + # repo: (optional when bundle is used) + # username: (if required for repo) + # password: (if required for repo) + # insecure: boolean (if required for repo) + # release: + # releaseName: REQUIRED + # releaseNamespace: 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 diff --git a/charts/k0s/templates/init-configmap.yaml b/charts/k0s/templates/init-configmap.yaml index cffff9005..34498fd14 100644 --- a/charts/k0s/templates/init-configmap.yaml +++ b/charts/k0s/templates/init-configmap.yaml @@ -36,7 +36,7 @@ data: {{- end}} {{- end }} {{- if .bundle }} - - bundle: {{ .bundle }} + bundle: {{ .bundle }} {{- end }} {{- if or .chart .bundle }} {{- if or .values .valuesTemplate }} @@ -52,4 +52,4 @@ data: {{- end }} {{- end }} {{- end }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/charts/k0s/values.yaml b/charts/k0s/values.yaml index 63ce97bfd..6b0282de8 100644 --- a/charts/k0s/values.yaml +++ b/charts/k0s/values.yaml @@ -412,6 +412,22 @@ init: # this allows you to use helm values inside, e.g.: {{ .Release.Name }} manifestsTemplate: '' helm: [] + # - bundle: - base64-encoded .tar.gz file content (optional - overrides chart.repo) + # chart: + # name: REQUIRED + # version: REQUIRED + # repo: (optional when bundle is used) + # username: (if required for repo) + # password: (if required for repo) + # insecure: boolean (if required for repo) + # release: + # releaseName: REQUIRED + # releaseNamespace: REQUIRED + # timeout: number + # values: |- string YAML object + # foo: bar + # valuesTemplate: |- string YAML object + # foo: {{ .Release.Name }} multiNamespaceMode: enabled: false diff --git a/charts/k3s/templates/init-configmap.yaml b/charts/k3s/templates/init-configmap.yaml index cffff9005..34498fd14 100644 --- a/charts/k3s/templates/init-configmap.yaml +++ b/charts/k3s/templates/init-configmap.yaml @@ -36,7 +36,7 @@ data: {{- end}} {{- end }} {{- if .bundle }} - - bundle: {{ .bundle }} + bundle: {{ .bundle }} {{- end }} {{- if or .chart .bundle }} {{- if or .values .valuesTemplate }} @@ -52,4 +52,4 @@ data: {{- end }} {{- end }} {{- end }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/charts/k3s/values.yaml b/charts/k3s/values.yaml index e23b93f32..5a42cfc73 100644 --- a/charts/k3s/values.yaml +++ b/charts/k3s/values.yaml @@ -432,6 +432,22 @@ init: # this allows you to use helm values inside, e.g.: {{ .Release.Name }} manifestsTemplate: '' helm: [] + # - bundle: - base64-encoded .tar.gz file content (optional - overrides chart.repo) + # chart: + # name: REQUIRED + # version: REQUIRED + # repo: (optional when bundle is used) + # username: (if required for repo) + # password: (if required for repo) + # insecure: boolean (if required for repo) + # release: + # releaseName: REQUIRED + # releaseNamespace: REQUIRED + # timeout: number + # values: |- string YAML object + # foo: bar + # valuesTemplate: |- string YAML object + # foo: {{ .Release.Name }} multiNamespaceMode: enabled: false diff --git a/charts/k8s/templates/init-configmap.yaml b/charts/k8s/templates/init-configmap.yaml index cffff9005..34498fd14 100644 --- a/charts/k8s/templates/init-configmap.yaml +++ b/charts/k8s/templates/init-configmap.yaml @@ -36,7 +36,7 @@ data: {{- end}} {{- end }} {{- if .bundle }} - - bundle: {{ .bundle }} + bundle: {{ .bundle }} {{- end }} {{- if or .chart .bundle }} {{- if or .values .valuesTemplate }} @@ -52,4 +52,4 @@ data: {{- end }} {{- end }} {{- end }} -{{- end }} \ No newline at end of file +{{- end }} diff --git a/charts/k8s/values.yaml b/charts/k8s/values.yaml index c5abf1959..abed374e9 100644 --- a/charts/k8s/values.yaml +++ b/charts/k8s/values.yaml @@ -477,6 +477,22 @@ init: # this allows you to use helm values inside, e.g.: {{ .Release.Name }} manifestsTemplate: '' helm: [] + # - bundle: - base64-encoded .tar.gz file content (optional - overrides chart.repo) + # chart: + # name: REQUIRED + # version: REQUIRED + # repo: (optional when bundle is used) + # username: (if required for repo) + # password: (if required for repo) + # insecure: boolean (if required for repo) + # release: + # releaseName: REQUIRED + # releaseNamespace: REQUIRED + # timeout: number + # values: |- string YAML object + # foo: bar + # valuesTemplate: |- string YAML object + # foo: {{ .Release.Name }} multiNamespaceMode: enabled: false diff --git a/docs/pages/operator/init-manifests.mdx b/docs/pages/operator/init-manifests.mdx index fceff1469..dff289ef8 100644 --- a/docs/pages/operator/init-manifests.mdx +++ b/docs/pages/operator/init-manifests.mdx @@ -78,6 +78,9 @@ Next we can paste the bundle in our values file: init: helm: - bundle: + chart: + name: my-chart + version: values: |- foo: bar release: