Add featureGates condition to bootstrap and control-plane providers

Signed-off-by: Gabriel Almeida <[email protected]>

Author: gcezaralmeida

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

@@ -44,6 +44,15 @@ spec:
 {{- if $bootstrapVersion }}
   version: {{ $bootstrapVersion }}
 {{- end }}
+{{- if $.Values.manager }}
+  manager:
+{{- if and $.Values.manager.featureGates $.Values.manager.featureGates.bootstrap }}
+    featureGates:
+    {{- range $key, $value := $.Values.manager.featureGates.bootstrap }}
+      {{ $key }}: {{ $value }}
+    {{- end }}
+{{- end }}
+{{- end }}
 {{- if $.Values.configSecret.name }}
   configSecret:
     name: {{ $.Values.configSecret.name }}

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

@@ -46,15 +46,11 @@ spec:
 {{- end }}
 {{- if $.Values.manager }}
   manager:
-{{- if hasKey $.Values.manager.featureGates $controlPlaneName }}
-{{- range $key, $value := $.Values.manager.featureGates }}
-  {{- if eq $key $controlPlaneName }}
+{{- if and $.Values.manager.featureGates $.Values.manager.featureGates.controlPlane }}
     featureGates:
-    {{- range $k, $v := $value }}
-      {{ $k }}: {{ $v }}
+    {{- range $key, $value := $.Values.manager.featureGates.controlPlane }}
+      {{ $key }}: {{ $value }}
     {{- end }}
-  {{- end }}
-{{- end }}
 {{- end }}
 {{- end }}
 {{- if $.Values.configSecret.name }}