Merge pull request #146 from enj/enj/i/removed_state

Make it clear that we do not support the removed state

Author: openshift-merge-robot

pkg/operator2/operator.go

@@ -248,7 +248,6 @@ func (c *authOperator) Key() (metav1.Object, error) {
 func (c *authOperator) Sync(obj metav1.Object) error {
 	operatorConfig := obj.(*operatorv1.Authentication)
 
-	// TODO bump and use IsOperatorManaged
 	if operatorConfig.Spec.ManagementState != operatorv1.Managed {
 		return nil // TODO do something better for all states
 	}

pkg/operator2/starter.go

@@ -158,8 +158,9 @@ func RunOperator(ctx *controllercmd.ControllerContext) error {
 
 	configOverridesController := unsupportedconfigoverridescontroller.NewUnsupportedConfigOverridesController(operatorClient, ctx.EventRecorder)
 	logLevelController := loglevel.NewClusterOperatorLoggingController(operatorClient, ctx.EventRecorder)
-	// TODO remove this controller once we support Unmanaged and Removed
+	// TODO remove this controller once we support Removed
 	managementStateController := management.NewOperatorManagementStateController(clusterOperatorName, operatorClient, ctx.EventRecorder)
+	management.SetOperatorNotRemovable()
 	// TODO move to config observers
 	// configobserver.NewConfigObserver(...)