Do not execute CVOConfiguration logic in HyperShift

HyperShift will not create the ClusterVersionOperator CRD and CR.
Thus, the relevant logic does not have to be running. Later, in HyperShift, we will
configure the CVO to be configured via a configuration file instead.

Author: DavidHurta

cmd/start.go

@@ -39,7 +39,7 @@ func init() {
 	cmd.PersistentFlags().StringVar(&opts.PromQLTarget.KubeSvc.Name, "metrics-service", opts.PromQLTarget.KubeSvc.Name, "The name of the remote PromQL query service. Must be specified when --use-dns-for-services is disabled.")
 	cmd.PersistentFlags().BoolVar(&opts.PromQLTarget.UseDNS, "use-dns-for-services", opts.PromQLTarget.UseDNS, "Configures the CVO to use DNS for resolution of services in the cluster.")
 	cmd.PersistentFlags().StringVar(&opts.PrometheusURLString, "metrics-url", opts.PrometheusURLString, "The URL used to access the remote PromQL query service.")
-	cmd.PersistentFlags().BoolVar(&opts.InjectClusterIdIntoPromQL, "hypershift", opts.InjectClusterIdIntoPromQL, "This options indicates whether the CVO is running inside a hosted control plane.")
+	cmd.PersistentFlags().BoolVar(&opts.HyperShift, "hypershift", opts.HyperShift, "This options indicates whether the CVO is running inside a hosted control plane.")
 	cmd.PersistentFlags().StringVar(&opts.UpdateService, "update-service", opts.UpdateService, "The preferred update service.  If set, this option overrides any upstream value configured in ClusterVersion spec.")
 	cmd.PersistentFlags().StringSliceVar(&opts.AlwaysEnableCapabilities, "always-enable-capabilities", opts.AlwaysEnableCapabilities, "List of the cluster capabilities which will always be implicitly enabled.")
 	rootCmd.AddCommand(cmd)

pkg/cvo/cvo.go

@@ -146,6 +146,9 @@ type Operator struct {
 	// conditionRegistry is used to evaluate whether a particular condition is risky or not.
 	conditionRegistry clusterconditions.ConditionRegistry
 
+	// hypershift signals whether the CVO is running inside a hosted control plane.
+	hypershift bool
+
 	// injectClusterIdIntoPromQL indicates whether the CVO should inject the cluster id
 	// into PromQL queries while evaluating risks from conditional updates. This is needed
 	// in HyperShift to differentiate between metrics from multiple hosted clusters in
@@ -203,6 +206,7 @@ func New(
 	operatorClient operatorclientset.Interface,
 	exclude string,
 	clusterProfile string,
+	hypershift bool,
 	promqlTarget clusterconditions.PromQLTarget,
 	injectClusterIdIntoPromQL bool,
 	updateService string,
@@ -234,6 +238,7 @@ func New(
 		availableUpdatesQueue: workqueue.NewTypedRateLimitingQueueWithConfig[any](workqueue.DefaultTypedControllerRateLimiter[any](), workqueue.TypedRateLimitingQueueConfig[any]{Name: "availableupdates"}),
 		upgradeableQueue:      workqueue.NewTypedRateLimitingQueueWithConfig[any](workqueue.DefaultTypedControllerRateLimiter[any](), workqueue.TypedRateLimitingQueueConfig[any]{Name: "upgradeable"}),
 
+		hypershift:                hypershift,
 		exclude:                   exclude,
 		clusterProfile:            clusterProfile,
 		conditionRegistry:         standard.NewConditionRegistry(promqlTarget),
@@ -459,7 +464,7 @@ func (optr *Operator) Run(runContext context.Context, shutdownContext context.Co
 		resultChannel <- asyncResult{name: "available updates"}
 	}()
 
-	if optr.enabledFeatureGates.CVOConfiguration() {
+	if optr.shouldReconcileCVOConfiguration() {
 		resultChannelCount++
 		go func() {
 			defer utilruntime.HandleCrash()
@@ -473,7 +478,7 @@ func (optr *Operator) Run(runContext context.Context, shutdownContext context.Co
 			resultChannel <- asyncResult{name: "cvo configuration"}
 		}()
 	} else {
-		klog.Infof("The ClusterVersionOperatorConfiguration feature gate is disabled; skipping initialization of configuration sync routine")
+		klog.Infof("The ClusterVersionOperatorConfiguration feature gate is disabled or HyperShift is detected; the configuration sync routine will not run.")
 	}
 
 	resultChannelCount++
@@ -1042,3 +1047,11 @@ func (optr *Operator) HTTPClient() (*http.Client, error) {
 		Transport: transport,
 	}, nil
 }
+
+// shouldReconcileCVOConfiguration returns whether the CVO should reconcile its configuration using the API server.
+//
+// enabledFeatureGates must be initialized before the function is called.
+func (optr *Operator) shouldReconcileCVOConfiguration() bool {
+	// The relevant CRD and CR are not applied in HyperShift, which configures the CVO via a configuration file
+	return optr.enabledFeatureGates.CVOConfiguration() && !optr.hypershift
+}

pkg/start/start.go

@@ -84,6 +84,8 @@ type Options struct {
 
 	ClusterProfile string
 
+	HyperShift bool
+
 	// AlwaysEnableCapabilities is a list of cluster version capabilities
 	// which will always be implicitly enabled.
 	AlwaysEnableCapabilities []string
@@ -161,6 +163,9 @@ func (o *Options) Run(ctx context.Context) error {
 		return fmt.Errorf("--always-enable-capabilities was set with unknown capabilities: %v", unknownCaps)
 	}
 
+	// Inject the cluster ID into PromQL queries in HyperShift
+	o.InjectClusterIdIntoPromQL = o.HyperShift
+
 	// parse the prometheus url
 	var err error
 	o.PromQLTarget.URL, err = url.Parse(o.PrometheusURLString)
@@ -502,6 +507,7 @@ func (o *Options) NewControllerContext(cb *ClientBuilder, alwaysEnableCapabiliti
 		operatorClient,
 		o.Exclude,
 		o.ClusterProfile,
+		o.HyperShift,
 		o.PromQLTarget,
 		o.InjectClusterIdIntoPromQL,
 		o.UpdateService,