feat: make it possible to define fetchConfig per component

Author: rbjorklin

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

@@ -43,6 +43,9 @@ spec:
 {{- if $addon.manifestPatches }}
   manifestPatches: {{ toYaml $addon.manifestPatches | nindent 4 }}
 {{- end }}
+{{- if $addon.fetchConfig }}
+  fetchConfig: {{ toYaml $addon.fetchConfig | nindent 4 }}
+{{- end }}
 {{- if $addon.additionalManifests }}
   additionalManifests:
     name: {{ $addon.additionalManifests.name }}

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

@@ -45,6 +45,9 @@ spec:
 {{- if $bootstrap.manifestPatches }}
   manifestPatches: {{ toYaml $bootstrap.manifestPatches | nindent 4 }}
 {{- end }}
+{{- if $bootstrap.fetchConfig }}
+  fetchConfig: {{ toYaml $bootstrap.fetchConfig | nindent 4 }}
+{{- end }}
 {{- if $bootstrap.additionalManifests }}
   additionalManifests:
     name: {{ $bootstrap.additionalManifests.name }}

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

@@ -58,6 +58,9 @@ spec:
 {{- if $controlPlane.manifestPatches }}
   manifestPatches: {{ toYaml $controlPlane.manifestPatches | nindent 4 }}
 {{- end }}
+{{- if $controlPlane.fetchConfig }}
+  fetchConfig: {{ toYaml $controlPlane.fetchConfig | nindent 4 }}
+{{- end }}
 {{- if $controlPlane.additionalManifests }}
   additionalManifests:
     name: {{ $controlPlane.additionalManifests.name }}

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

@@ -54,6 +54,9 @@ spec:
 {{- if $core.manifestPatches }}
   manifestPatches: {{ toYaml $core.manifestPatches | nindent 4 }}
 {{- end }}
+{{- if $core.fetchConfig }}
+  fetchConfig: {{ toYaml $core.fetchConfig | nindent 4 }}
+{{- end }}
 {{- if $core.additionalManifests }}
   additionalManifests:
     name: {{ $core.additionalManifests.name }}

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

@@ -71,6 +71,9 @@ spec:
 {{- if $infra.manifestPatches }}
   manifestPatches: {{- toYaml $infra.manifestPatches | nindent 4 }}
 {{- end }} {{/* if $infra.manifestPatches */}}
+{{- if $infra.fetchConfig }}
+  fetchConfig: {{ toYaml $infra.fetchConfig | nindent 4 }}
+{{- end }}
 {{- if $infra.additionalManifests }}
   additionalManifests:
     name: {{ $infra.additionalManifests.name }}

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

@@ -68,6 +68,9 @@ spec:
 {{- if $ipam.manifestPatches }}
   manifestPatches: {{ toYaml $ipam.manifestPatches | nindent 4 }}
 {{- end }}
+{{- if $ipam.fetchConfig }}
+  fetchConfig: {{ toYaml $ipam.fetchConfig | nindent 4 }}
+{{- end }}
 {{- if $.Values.additionalDeployments }}
   additionalDeployments: {{ toYaml $.Values.additionalDeployments | nindent 4 }}
 {{- end }}

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

@@ -2,150 +2,51 @@
   "$schema": "https://json-schema.org/draft/2020-12/schema#",
   "type": "object",
   "properties": {
-    "logLevel": {
-      "type": "integer",
-      "default": 2
+    "fetchConfig": {
+      "type": "object",
+      "deprecated": true,
+      "description": "This field is deprecated and will be removed in future versions. Prefer declaring fetchConfig under the individual providers instead."
     },
-    "replicaCount": {
-      "type": "integer",
-      "default": 1
+    "core": {
+      "oneOf": [
+        { "type": "object" },
+        { "type": "null" }
+      ]
     },
-    "leaderElection": {
+    "bootstrap": {
       "type": "object",
-      "properties": {
-        "enabled": {
-          "type": "boolean",
-          "default": true
-        },
-        "leaseDuration": {
-          "type": "string"
-        },
-        "renewDeadline": {
-          "type": "string"
-        },
-        "retryPeriod": {
-          "type": "string"
-        }
-      }
+      "oneOf": [
+        { "type": "object" },
+        { "type": "null" }
+      ]
     },
-    "image": {
+    "controlPlane": {
       "type": "object",
-      "properties": {
-        "manager": {
-          "type": "object",
-          "properties": {
-            "repository": {
-              "type": "string"
-            },
-            "tag": {
-              "type": "string"
-            },
-            "pullPolicy": {
-              "type": "string",
-              "enum": ["Always", "IfNotPresent", "Never"]
-            },
-            "registry": {
-              "type": "string"
-            },
-            "digest": {
-              "type": "string"
-            }
-          }
-        }
-      }
+      "oneOf": [
+        { "type": "object" },
+        { "type": "null" }
+      ]
     },
-    "env": {
+    "infrastructure": {
       "type": "object",
-      "properties": {
-        "manager": {
-          "type": "array"
-        }
-      }
-    },
-    "diagnosticsAddress": {
-      "type": "string",
-      "default": ":8443"
-    },
-    "healthAddr": {
-      "type": "string",
-      "default": ":9440"
-    },
-    "profilerAddress": {
-      "type": "string",
-      "default": ":6060"
-    },
-    "contentionProfiling": {
-      "type": "boolean",
-      "default": false
-    },
-    "insecureDiagnostics": {
-      "type": "boolean",
-      "default": false
+      "oneOf": [
+        { "type": "object" },
+        { "type": "null" }
+      ]
     },
-    "watchConfigSecret": {
-      "type": "boolean",
-      "default": false
-    },
-    "imagePullSecrets": {
-      "type": "object"
-    },
-    "resources": {
+    "addon": {
       "type": "object",
-      "properties": {
-        "manager": {
-          "type": "object"
-        }
-      }
-    },
-    "containerSecurityContext": {
-      "type": "object"
-    },
-    "affinity": {
-      "type": "object"
-    },
-    "tolerations": {
-      "type": "array"
+      "oneOf": [
+        { "type": "object" },
+        { "type": "null" }
+      ]
     },
-    "volumes": {
-      "type": "array"
-    },
-    "volumeMounts": {
+    "ipam": {
       "type": "object",
-      "properties": {
-        "manager": {
-          "type": "array"
-        }
-      }
-    },
-    "deploymentLabels": {
-      "type": "object"
-    },
-    "deploymentAnnotations": {
-      "type": "object"
-    },
-    "podLabels": {
-      "type": "object"
-    },
-    "podAnnotations": {
-      "type": "object"
-    },
-    "securityContext": {
-      "type": "object"
-    },
-    "strategy": {
-      "type": "object"
-    },
-    "nodeSelector": {
-      "type": "object"
-    },
-    "topologySpreadConstraints": {
-      "type": "array"
-    },
-    "podDnsPolicy": {
-      "type": "string"
-    },
-    "podDnsConfig": {
-      "type": "object"
+      "oneOf": [
+        { "type": "object" },
+        { "type": "null" }
+      ]
     }
   }
 }