Merge pull request #936 from openshift-cherrypick-robot/cherry-pick-9…

…34-to-release-4.14

[release-4.14] Featuregate config rendering fix

assets/kube-apiserver/featuregate.yaml

@@ -6,10 +6,10 @@ metadata:
   featureSet: CustomNoUpgrade
   customNoUpgrade:
 {{ if .ExtraFeatureGatesEnabled }}{{ printf "%s\n" "    enabled:" }}
-{{- range $featureGateEnabled := .ExtraFeatureGatesEnabled }}{{ printf "%s %s" "    -" $featureGateEnabled }}{{ end }}
-{{ end -}}
+{{- range $featureGateEnabled := .ExtraFeatureGatesEnabled }}{{ printf "%s %s\n" "    -" $featureGateEnabled }}{{- end -}}
+{{- end -}}
 {{ if .ExtraFeatureGatesDisabled }}{{ printf "%s\n" "    disabled:" }}
-{{- range $featureGateDisabled := .ExtraFeatureGatesDisabled }}{{ printf "%s %s" "    -" $featureGateDisabled }}{{ end }}
-{{ end -}}
+{{- range $featureGateDisabled := .ExtraFeatureGatesDisabled }}{{ printf "%s %s\n" "    -" $featureGateDisabled }}{{- end -}}
+{{- end -}}
 {{ else }}spec: {}
-{{ end -}}
+{{- end -}}

cluster.yaml.example

@@ -151,9 +151,9 @@ kmsAPIKey: abcdefghijklmnopqrstuvwxyz
 kpInfo: '{"example":"foobar"}'
 kpRegion: us-south
 restartDate: "2022-01-07T13:58:11Z"
-extraFeatureGates: [RotateKubeletServerCertificate=true,RetroactiveDefaultStorageClass=false]
+extraFeatureGates: [RotateKubeletServerCertificate=true]
 extraFeatureGatesEnabled: [RotateKubeletServerCertificate]
-extraFeatureGatesDisabled: [RetroactiveDefaultStorageClass]
+extraFeatureGatesDisabled: []
 apiServerAuditEnabled: true
 controlPlaneOperatorImage: registry.ng.bluemix.net/armada-master/ocp-control-plane-operator:v4.9.0-20211201
 apiserverLivenessProbe: