Skip to content

Commit 4fdac3e

Browse files
committed
feat: make it possible to define fetchConfig per component
1 parent 2b4542a commit 4fdac3e

File tree

7 files changed

+24
-1
lines changed

7 files changed

+24
-1
lines changed

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,9 @@ spec:
4646
{{- if $addon.manifestPatches }}
4747
manifestPatches: {{ toYaml $addon.manifestPatches | nindent 4 }}
4848
{{- end }}
49+
{{- if $addon.fetchConfig }}
50+
fetchConfig: {{ toYaml $addon.fetchConfig | nindent 4 }}
51+
{{- end }}
4952
{{- if $addon.additionalManifests }}
5053
additionalManifests:
5154
name: {{ $addon.additionalManifests.name }}

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,9 @@ spec:
4040
{{- if $bootstrap.manifestPatches }}
4141
manifestPatches: {{ toYaml $bootstrap.manifestPatches | nindent 4 }}
4242
{{- end }}
43+
{{- if $bootstrap.fetchConfig }}
44+
fetchConfig: {{ toYaml $bootstrap.fetchConfig | nindent 4 }}
45+
{{- end }}
4346
{{- if $bootstrap.additionalManifests }}
4447
additionalManifests:
4548
name: {{ $bootstrap.additionalManifests.name }}

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,9 @@ spec:
5353
{{- if $controlPlane.manifestPatches }}
5454
manifestPatches: {{ toYaml $controlPlane.manifestPatches | nindent 4 }}
5555
{{- end }}
56+
{{- if $controlPlane.fetchConfig }}
57+
fetchConfig: {{ toYaml $controlPlane.fetchConfig | nindent 4 }}
58+
{{- end }}
5659
{{- if $controlPlane.additionalManifests }}
5760
additionalManifests:
5861
name: {{ $controlPlane.additionalManifests.name }}

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,9 @@ spec:
4949
{{- if $core.manifestPatches }}
5050
manifestPatches: {{ toYaml $core.manifestPatches | nindent 4 }}
5151
{{- end }}
52+
{{- if $core.fetchConfig }}
53+
fetchConfig: {{ toYaml $core.fetchConfig | nindent 4 }}
54+
{{- end }}
5255
{{- if $core.additionalManifests }}
5356
additionalManifests:
5457
name: {{ $core.additionalManifests.name }}

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,9 @@ spec:
6666
{{- if $infra.manifestPatches }}
6767
manifestPatches: {{- toYaml $infra.manifestPatches | nindent 4 }}
6868
{{- end }} {{/* if $infra.manifestPatches */}}
69+
{{- if $infra.fetchConfig }}
70+
fetchConfig: {{ toYaml $infra.fetchConfig | nindent 4 }}
71+
{{- end }}
6972
{{- if $infra.additionalManifests }}
7073
additionalManifests:
7174
name: {{ $infra.additionalManifests.name }}

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,9 @@ spec:
6363
{{- if $ipam.manifestPatches }}
6464
manifestPatches: {{ toYaml $ipam.manifestPatches | nindent 4 }}
6565
{{- end }}
66+
{{- if $ipam.fetchConfig }}
67+
fetchConfig: {{ toYaml $ipam.fetchConfig | nindent 4 }}
68+
{{- end }}
6669
{{- if $.Values.additionalDeployments }}
6770
additionalDeployments: {{ toYaml $.Values.additionalDeployments | nindent 4 }}
6871
{{- end }}

hack/charts/cluster-api-operator/values.schema.json

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,12 @@
11
{
2-
"$schema": "http://json-schema.org/draft-07/schema#",
2+
"$schema": "https://json-schema.org/draft/2020-12/schema#",
33
"type": "object",
44
"properties": {
5+
"fetchConfig": {
6+
"type": "object",
7+
"deprecated": true,
8+
"description": "This field is deprecated and will be removed in future versions. Prefer declaring fetchConfig under the individual providers instead."
9+
},
510
"core": {
611
"oneOf": [
712
{ "type": "object" },

0 commit comments

Comments
 (0)