Remove reliance on feature gates from CCMO for external cloud provider decision

Author: JoelSpeed

docs/dev/hacking-guide.md

@@ -130,33 +130,9 @@ OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE=quay.io/<your-repo>/release:<your-branc
 
 However, in order for the cluster to run the CCM from the start, you need to add an additional step to the installation.
 
-By specifying the `CustomNoUpgrade` feature gate in the cluster with `ExternalCloudProvider` you are enabling CCCMO logic for providers, which are currently in Technical Preview state.
-
 ```bash
 export OPENSHIFT_INSTALL_RELEASE_IMAGE_OVERRIDE=quay.io/<your-repo>/release:<your-branch> 
 
-# This step would stop after creation of ./manifests folder. All resources placed there will be created in the cluster
-# during bootstrap and would override the default state of the resource in the cluster.
-openshift-install create manifests
-
-cat <<EOF > manifests/manifest_feature_gate.yaml
-apiVersion: config.openshift.io/v1
-kind: FeatureGate
-metadata:
-  annotations:
-    include.release.openshift.io/self-managed-high-availability: "true"
-    include.release.openshift.io/single-node-developer: "true"
-    release.openshift.io/create-only: "true"
-  name: cluster
-spec:
-  customNoUpgrade:
-    enabled:
-    - ExternalCloudProvider
-    - CSIMigrationAWS
-    - CSIMigrationOpenStack
-  featureSet: CustomNoUpgrade
-EOF
-
 # Now you could create a cluster with your custom release image
 openshift-install create cluster
 ```

pkg/controllers/clusteroperator_controller.go

@@ -244,7 +244,7 @@ func (r *CloudOperatorReconciler) provisioningAllowed(ctx context.Context, infra
 	}
 
 	// Verify FeatureGate ExternalCloudProvider is enabled for operator to work in TP phase
-	external, err := cloudprovider.IsCloudProviderExternal(infra.Status.PlatformStatus, r.FeatureGateAccess)
+	external, err := cloudprovider.IsCloudProviderExternal(infra.Status.PlatformStatus)
 	if err != nil {
 		klog.Errorf("Could not determine external cloud provider state: %v", err)
 
@@ -254,7 +254,7 @@ func (r *CloudOperatorReconciler) provisioningAllowed(ctx context.Context, infra
 		}
 		return false, err
 	} else if !external {
-		klog.Infof("FeatureGate cluster is not specifying external cloud provider requirement. Skipping...")
+		klog.Infof("Platform does not require an external cloud provider. Skipping...")
 
 		if err := r.setStatusAvailable(ctx, conditionOverrides); err != nil {
 			klog.Errorf("Unable to sync cluster operator status: %s", err)

pkg/controllers/clusteroperator_controller_test.go

@@ -228,11 +228,6 @@ var _ = Describe("Component sync controller", func() {
 	var operands []client.Object
 	var watcher mockedWatcher
 
-	externalFeatureGateAccessor := featuregates.NewHardcodedFeatureGateAccess(
-		[]configv1.FeatureGateName{configv1.FeatureGateExternalCloudProvider},
-		nil,
-	)
-
 	kcmStatus := &operatorv1.KubeControllerManagerStatus{
 		StaticPodOperatorStatus: operatorv1.StaticPodOperatorStatus{
 			OperatorStatus: operatorv1.OperatorStatus{
@@ -363,7 +358,6 @@ var _ = Describe("Component sync controller", func() {
 
 	type testCase struct {
 		status            *configv1.InfrastructureStatus
-		featureGate       featuregates.FeatureGateAccess
 		kcmStatus         *operatorv1.KubeControllerManagerStatus
 		coStatus          *configv1.ClusterOperatorStatus
 		expectProvisioned bool
@@ -376,9 +370,7 @@ var _ = Describe("Component sync controller", func() {
 			infra.Status = *tc.status
 			Expect(cl.Status().Update(context.Background(), infra.DeepCopy())).To(Succeed())
 
-			if tc.featureGate != nil {
-				operatorController.FeatureGateAccess = tc.featureGate
-			}
+			operatorController.FeatureGateAccess = featuregates.NewHardcodedFeatureGateAccess(nil, nil)
 
 			if tc.kcmStatus != nil {
 				Expect(cl.Get(context.Background(), client.ObjectKeyFromObject(kcm), kcm)).To(Succeed())
@@ -400,7 +392,7 @@ var _ = Describe("Component sync controller", func() {
 
 			watchMap := watcher.getWatchedResources()
 
-			operatorConfig := getOperatorConfigForPlatform(tc.status.PlatformStatus, tc.featureGate)
+			operatorConfig := getOperatorConfigForPlatform(tc.status.PlatformStatus, operatorController.FeatureGateAccess)
 
 			clusterOperator, err := operatorController.getOrCreateClusterOperator(context.Background())
 			Expect(err).To(Succeed())
@@ -452,7 +444,6 @@ var _ = Describe("Component sync controller", func() {
 					Type: configv1.AWSPlatformType,
 				},
 			},
-			featureGate:       externalFeatureGateAccessor,
 			kcmStatus:         kcmStatus,
 			coStatus:          coStatus,
 			expectProvisioned: true,
@@ -466,7 +457,6 @@ var _ = Describe("Component sync controller", func() {
 					Type: configv1.OpenStackPlatformType,
 				},
 			},
-			featureGate:       externalFeatureGateAccessor,
 			kcmStatus:         kcmStatus,
 			coStatus:          coStatus,
 			expectProvisioned: true,
@@ -480,7 +470,6 @@ var _ = Describe("Component sync controller", func() {
 					Type: configv1.AWSPlatformType,
 				},
 			},
-			featureGate:       externalFeatureGateAccessor,
 			kcmStatus:         &operatorv1.KubeControllerManagerStatus{},
 			coStatus:          coStatus,
 			expectProvisioned: true,
@@ -494,24 +483,10 @@ var _ = Describe("Component sync controller", func() {
 					Type: configv1.KubevirtPlatformType,
 				},
 			},
-			featureGate:       externalFeatureGateAccessor,
 			kcmStatus:         kcmStatus,
 			coStatus:          coStatus,
 			expectProvisioned: false,
 		}),
-		Entry("Should provision resources for AWS if external FeatureGate is not present", testCase{
-			status: &configv1.InfrastructureStatus{
-				InfrastructureTopology: configv1.HighlyAvailableTopologyMode,
-				ControlPlaneTopology:   configv1.HighlyAvailableTopologyMode,
-				Platform:               configv1.AWSPlatformType,
-				PlatformStatus: &configv1.PlatformStatus{
-					Type: configv1.AWSPlatformType,
-				},
-			},
-			kcmStatus:         kcmStatus,
-			coStatus:          coStatus,
-			expectProvisioned: true,
-		}),
 		Entry("Should not provision resources for OpenStack if external FeatureGate is not present", testCase{
 			status: &configv1.InfrastructureStatus{
 				InfrastructureTopology: configv1.HighlyAvailableTopologyMode,
@@ -532,7 +507,6 @@ var _ = Describe("Component sync controller", func() {
 					Type: configv1.AWSPlatformType,
 				},
 			},
-			featureGate: externalFeatureGateAccessor,
 			kcmStatus: &operatorv1.KubeControllerManagerStatus{
 				StaticPodOperatorStatus: operatorv1.StaticPodOperatorStatus{
 					OperatorStatus: operatorv1.OperatorStatus{
@@ -558,7 +532,6 @@ var _ = Describe("Component sync controller", func() {
 					Type: configv1.AWSPlatformType,
 				},
 			},
-			featureGate: externalFeatureGateAccessor,
 			kcmStatus: &operatorv1.KubeControllerManagerStatus{
 				StaticPodOperatorStatus: operatorv1.StaticPodOperatorStatus{
 					OperatorStatus: operatorv1.OperatorStatus{
@@ -584,8 +557,7 @@ var _ = Describe("Component sync controller", func() {
 					Type: configv1.AWSPlatformType,
 				},
 			},
-			featureGate: externalFeatureGateAccessor,
-			kcmStatus:   kcmStatus,
+			kcmStatus: kcmStatus,
 			coStatus: &configv1.ClusterOperatorStatus{
 				Conditions: []configv1.ClusterOperatorStatusCondition{
 					{
@@ -622,8 +594,7 @@ var _ = Describe("Component sync controller", func() {
 					Type: configv1.AWSPlatformType,
 				},
 			},
-			featureGate: externalFeatureGateAccessor,
-			kcmStatus:   kcmStatus,
+			kcmStatus: kcmStatus,
 			coStatus: &configv1.ClusterOperatorStatus{
 				Conditions: []configv1.ClusterOperatorStatusCondition{
 					{