Merge pull request #735 from afarbos/af/NoFeatureGateCPDefault

🐛 avoid empty manager field in ControlPlaneProvider when no controlPlane and no features gates provided

Author: k8s-ci-robot

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

@@ -45,8 +45,8 @@ spec:
   version: {{ $coreVersion }}
 {{- end }}
 {{- if $.Values.manager }}
-  manager:
 {{- if and $.Values.manager.featureGates $.Values.manager.featureGates.core }}
+  manager:
     featureGates:
     {{- range $key, $value := $.Values.manager.featureGates.core }}
       {{ $key }}: {{ $value }}

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

@@ -54,8 +54,8 @@ metadata:
 {{- with .Values.configSecret }}
 spec:
 {{- if $.Values.manager }}
-  manager:
 {{- if and $.Values.manager.featureGates $.Values.manager.featureGates.kubeadm }}
+  manager:
     featureGates:
     {{- range $key, $value := $.Values.manager.featureGates.kubeadm }}
       {{ $key }}: {{ $value }}

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

@@ -47,8 +47,8 @@ spec:
   version: {{ $infrastructureVersion }}
 {{- end }}
 {{- if $.Values.manager }}
-  manager:
 {{- if and (kindIs "map" $.Values.manager.featureGates) (hasKey $.Values.manager.featureGates $infrastructureName) }}
+  manager:
 {{- range $key, $value := $.Values.manager.featureGates }}
   {{- if eq $key $infrastructureName }}
     featureGates:

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

@@ -47,8 +47,8 @@ spec:
   version: {{ $ipamVersion }}
 {{- end }}
 {{- if $.Values.manager }}
-  manager:
 {{- if and (kindIs "map" $.Values.manager.featureGates) (hasKey $.Values.manager.featureGates $ipamName) }}
+  manager:
 {{- range $key, $value := $.Values.manager.featureGates }}
   {{- if eq $key $ipamName }}
     featureGates:

test/e2e/resources/all-providers-manager-defined-no-feature-gates.yaml

@@ -95,7 +95,6 @@ metadata:
     "helm.sh/hook-weight": "2"
     "argocd.argoproj.io/sync-wave": "2"
 spec:
-  manager:
   configSecret:
     name: test-secret-name
     namespace: test-secret-namespace
@@ -111,7 +110,6 @@ metadata:
     "helm.sh/hook-weight": "2"
     "argocd.argoproj.io/sync-wave": "2"
 spec:
-  manager:
   configSecret:
     name: test-secret-name
     namespace: test-secret-namespace
@@ -127,7 +125,6 @@ metadata:
     "helm.sh/hook-weight": "2"
     "argocd.argoproj.io/sync-wave": "2"
 spec:
-  manager:
   configSecret:
     name: test-secret-name
     namespace: test-secret-namespace
@@ -143,7 +140,6 @@ metadata:
     "helm.sh/hook-weight": "2"
     "argocd.argoproj.io/sync-wave": "2"
 spec:
-  manager:
   configSecret:
     name: test-secret-name
     namespace: test-secret-namespace

test/e2e/resources/feature-gates.yaml

@@ -95,7 +95,6 @@ metadata:
     "helm.sh/hook-weight": "2"
     "argocd.argoproj.io/sync-wave": "2"
 spec:
-  manager:
   configSecret:
     name: aws-variables
     namespace: default
@@ -131,7 +130,6 @@ metadata:
     "helm.sh/hook-weight": "2"
     "argocd.argoproj.io/sync-wave": "2"
 spec:
-  manager:
   configSecret:
     name: aws-variables
     namespace: default

test/e2e/resources/kubeadm-manager-defined.yaml

@@ -103,7 +103,6 @@ metadata:
     "helm.sh/hook-weight": "2"
     "argocd.argoproj.io/sync-wave": "2"
 spec:
-  manager:
 ---
 # Source: cluster-api-operator/templates/ipam.yaml
 apiVersion: operator.cluster.x-k8s.io/v1alpha2
@@ -116,7 +115,6 @@ metadata:
     "helm.sh/hook-weight": "2"
     "argocd.argoproj.io/sync-wave": "2"
 spec:
-  manager:
 ---
 # Source: cluster-api-operator/templates/infra.yaml
 apiVersion: operator.cluster.x-k8s.io/v1alpha2
@@ -128,5 +126,4 @@ metadata:
     "helm.sh/hook": "post-install,post-upgrade"
     "helm.sh/hook-weight": "2"
     "argocd.argoproj.io/sync-wave": "2"
-spec:
-  manager:
+spec:

test/e2e/resources/manager-defined-missing-other-infra-spec.yaml

@@ -115,7 +115,6 @@ metadata:
     "helm.sh/hook-weight": "2"
     "argocd.argoproj.io/sync-wave": "2"
 spec:
-  manager:
 ---
 # Source: cluster-api-operator/templates/infra.yaml
 apiVersion: operator.cluster.x-k8s.io/v1alpha2
@@ -127,5 +126,4 @@ metadata:
     "helm.sh/hook": "post-install,post-upgrade"
     "helm.sh/hook-weight": "2"
     "argocd.argoproj.io/sync-wave": "2"
-spec:
-  manager:
+spec: