feat: extend template to support mapping 'additionalManifests' in values.yaml

Author: rbjorklin

hack/charts/cluster-api-operator/templates/addon.yaml

@@ -38,5 +38,22 @@ spec:
 {{- if $addon.manifestPatches }}
   manifestPatches: {{ toYaml $addon.manifestPatches | nindent 4 }}
 {{- end }}
+{{- if $addon.additionalManifests }}
+  additionalManifests:
+    name: {{ $addon.additionalManifests.name }}
+    {{- if $addon.additionalManifests.namespace }}
+    namespace: {{ $addon.additionalManifests.namespace }}
+    {{- end }} {{/* if $addon.additionalManifests.namespace */}}
+{{- end }}
+{{- if $addon.additionalManifests }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ $addon.additionalManifests.name }}
+  namespace: {{ default $addonNamespace $addon.additionalManifests.namespace }}
+data:
+  manifests: {{- toYaml $addon.additionalManifests.manifests | nindent 4 }}
+{{- end }}
 {{- end }} {{/* range $addon := .Values.addon */}}
 {{- end }} {{/* if .Values.addon */}}

hack/charts/cluster-api-operator/templates/bootstrap.yaml

@@ -37,5 +37,22 @@ spec:
 {{- if $bootstrap.manifestPatches }}
   manifestPatches: {{ toYaml $bootstrap.manifestPatches | nindent 4 }}
 {{- end }}
+{{- if $bootstrap.additionalManifests }}
+  additionalManifests:
+    name: {{ $bootstrap.additionalManifests.name }}
+    {{- if $bootstrap.additionalManifests.namespace }}
+    namespace: {{ $bootstrap.additionalManifests.namespace }}
+    {{- end }} {{/* if $bootstrap.additionalManifests.namespace */}}
+{{- end }}
+{{- if $bootstrap.additionalManifests }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ $bootstrap.additionalManifests.name }}
+  namespace: {{ default $bootstrapNamespace $bootstrap.additionalManifests.namespace }}
+data:
+  manifests: {{- toYaml $bootstrap.additionalManifests.manifests | nindent 4 }}
+{{- end }}
 {{- end }} {{/* range $bootstrap := .Values.bootstrap */}}
 {{- end }} {{/* if .Values.bootstrap */}}

hack/charts/cluster-api-operator/templates/control-plane.yaml

@@ -50,5 +50,22 @@ spec:
 {{- if $controlPlane.manifestPatches }}
   manifestPatches: {{ toYaml $controlPlane.manifestPatches | nindent 4 }}
 {{- end }}
+{{- if $controlPlane.additionalManifests }}
+  additionalManifests:
+    name: {{ $controlPlane.additionalManifests.name }}
+    {{- if $controlPlane.additionalManifests.namespace }}
+    namespace: {{ $controlPlane.additionalManifests.namespace }}
+    {{- end }} {{/* if $controlPlane.additionalManifests.namespace */}}
+{{- end }}
+{{- if $controlPlane.additionalManifests }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ $controlPlane.additionalManifests.name }}
+  namespace: {{ default $controlPlaneNamespace $controlPlane.additionalManifests.namespace }}
+data:
+  manifests: {{- toYaml $controlPlane.additionalManifests.manifests | nindent 4 }}
+{{- end }}
 {{- end }} {{/* range $controlPlane := .Values.controlPlane */}}
 {{- end }} {{/* if .Values.controlPlane */}}

hack/charts/cluster-api-operator/templates/core.yaml

@@ -46,4 +46,21 @@ spec:
 {{- if .Values.core.manifestPatches }}
   manifestPatches: {{ toYaml .Values.core.manifestPatches | nindent 4 }}
 {{- end }}
+{{- if .Values.core.additionalManifests }}
+  additionalManifests:
+    name: {{ .Values.core.additionalManifests.name }}
+    {{- if .Values.core.additionalManifests.namespace }}
+    namespace: {{ .Values.core.additionalManifests.namespace }}
+    {{- end }} {{/* if .Values.core.additionalManifests.namespace */}}
+{{- end }}
+{{- if .Values.core.additionalManifests }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ .Values.core.additionalManifests.name }}
+  namespace: {{ default .Values.coreNamespace .Values.core.additionalManifests.namespace }}
+data:
+  manifests: {{- toYaml .Values.core.additionalManifests.manifests | nindent 4 }}
+{{- end }}
 {{- end }} {{/* if .Values.core */}}

hack/charts/cluster-api-operator/templates/infra.yaml

@@ -65,5 +65,22 @@ spec:
 {{- if $infra.manifestPatches }}
   manifestPatches: {{- toYaml $infra.manifestPatches | nindent 4 }}
 {{- end }} {{/* if $infra.manifestPatches */}}
+{{- if $infra.additionalManifests }}
+  additionalManifests:
+    name: {{ $infra.additionalManifests.name }}
+    {{- if $infra.additionalManifests.namespace }}
+    namespace: {{ $infra.additionalManifests.namespace }}
+    {{- end }} {{/* if $infra.additionalManifests.namespace */}}
+{{- end }} {{/* if $infra.additionalManifests */}}
+{{- if $infra.additionalManifests }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ $infra.additionalManifests.name }}
+  namespace: {{ default $infrastructureNamespace $infra.additionalManifests.namespace }}
+data:
+  manifests: {{- toYaml $infra.additionalManifests.manifests | nindent 4 }}
+{{- end }}
 {{- end }} {{/* range $infra := .Values.infrastructure */}}
 {{- end }} {{/* if .Values.infrastructure */}}

hack/charts/cluster-api-operator/templates/ipam.yaml

@@ -55,5 +55,22 @@ spec:
 {{- if $.Values.additionalDeployments }}
   additionalDeployments: {{ toYaml $.Values.additionalDeployments | nindent 4 }}
 {{- end }}
+{{- if $ipam.additionalManifests }}
+  additionalManifests:
+    name: {{ $ipam.additionalManifests.name }}
+    {{- if $ipam.additionalManifests.namespace }}
+    namespace: {{ $ipam.additionalManifests.namespace }}
+    {{- end }} {{/* if $ipam.additionalManifests.namespace */}}
+{{- end }}
+{{- if $ipam.additionalManifests }}
+---
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: {{ $ipam.additionalManifests.name }}
+  namespace: {{ default $ipamNamespace $ipam.additionalManifests.namespace }}
+data:
+  manifests: {{- toYaml $ipam.additionalManifests.manifests | nindent 4 }}
+{{- end }}
 {{- end }} {{/* range $ipam := .Values.ipam */}}
 {{- end }} {{/* if .Values.ipam */}}