start using the new featuregateaccessor via the API

Author: deads2k

pkg/cmd/render/render_test.go

@@ -177,11 +177,8 @@ func TestRenderCommand(t *testing.T) {
 						"--controllers=-tokencleaner",
 						"--controllers=-ttl",
 						"--enable-dynamic-provisioning=true",
-						"--feature-gates=APIPriorityAndFairness=true",
-						"--feature-gates=DownwardAPIHugePages=true",
 						"--feature-gates=OpenShiftPodSecurityAdmission=true",
 						"--feature-gates=RetroactiveDefaultStorageClass=false",
-						"--feature-gates=RotateKubeletServerCertificate=true",
 						"--flex-volume-plugin-dir=/etc/kubernetes/kubelet-plugins/volume/exec",
 						"--kube-api-burst=300",
 						"--kube-api-qps=150",

pkg/operator/configobservation/cloud/observe_cloud_volume_plugin_test.go

@@ -44,7 +44,7 @@ func TestObserveCloudVolumePlugin(t *testing.T) {
 					FeatureGateSelection: configv1.FeatureGateSelection{
 						FeatureSet: configv1.CustomNoUpgrade,
 						CustomNoUpgrade: &configv1.CustomFeatureGates{
-							Enabled: []string{cloudprovider.ExternalCloudProviderFeature},
+							Enabled: []configv1.FeatureGateName{cloudprovider.ExternalCloudProviderFeature},
 						},
 					},
 				},
@@ -78,7 +78,7 @@ func TestObserveCloudVolumePlugin(t *testing.T) {
 					FeatureGateSelection: configv1.FeatureGateSelection{
 						FeatureSet: configv1.CustomNoUpgrade,
 						CustomNoUpgrade: &configv1.CustomFeatureGates{
-							Enabled: []string{cloudprovider.ExternalCloudProviderFeature},
+							Enabled: []configv1.FeatureGateName{cloudprovider.ExternalCloudProviderFeature},
 						},
 					},
 				},

pkg/operator/configobservation/configobservercontroller/observe_config_controller.go

@@ -1,6 +1,7 @@
 package configobservercontroller
 
 import (
+	configv1 "github.com/openshift/api/config/v1"
 	"k8s.io/apimachinery/pkg/util/sets"
 	"k8s.io/client-go/tools/cache"
 
@@ -30,7 +31,7 @@ import (
 // OpenShift. Passing these to KCM causes it to log an error on startup.
 // This list is passed to the feature gate config observer as a blacklist,
 // excluding them from the feature gate output passed to KCM.
-var openShiftOnlyFeatureGates = sets.NewString(
+var openShiftOnlyFeatureGates = sets.New[configv1.FeatureGateName](
 	libgocloudprovider.ExternalCloudProviderFeature,
 )
 
@@ -43,6 +44,7 @@ func NewConfigObserver(
 	configinformers configinformers.SharedInformerFactory,
 	kubeInformersForNamespaces v1helpers.KubeInformersForNamespaces,
 	resourceSyncer resourcesynccontroller.ResourceSyncer,
+	featureGateAccessor featuregates.FeatureGateAccess,
 	eventRecorder events.Recorder,
 ) (*ConfigObserver, error) {
 
@@ -124,13 +126,15 @@ func NewConfigObserver(
 				nil,
 				openShiftOnlyFeatureGates,
 				[]string{"extendedArguments", "feature-gates"},
+				featureGateAccessor,
 			),
 
 			// this is picked up by the cluster-policy-controller container
 			featuregates.NewObserveFeatureFlagsFunc(
 				nil,
 				nil,
 				[]string{"featureGates"},
+				featureGateAccessor,
 			),
 			network.ObserveClusterCIDRs,
 			network.ObserveServiceClusterIPRanges,

pkg/operator/starter.go

@@ -3,6 +3,7 @@ package operator
 import (
 	"context"
 	"fmt"
+	"github.com/openshift/library-go/pkg/operator/configobserver/featuregates"
 	"os"
 	"time"
 
@@ -65,6 +66,27 @@ func RunOperator(ctx context.Context, cc *controllercmd.ControllerContext) error
 	}
 	operatorLister := dynamicInformers.ForResource(operatorv1.GroupVersion.WithResource("kubecontrollermanagers")).Lister()
 
+	desiredVersion := status.VersionForOperatorFromEnv()
+	missingVersion := "0.0.1-snapshot"
+
+	// By default, this will exit(0) the process if the featuregates ever change to a different set of values.
+	featureGateAccessor := featuregates.NewFeatureGateAccess(
+		desiredVersion, missingVersion,
+		configInformers.Config().V1().ClusterVersions(), configInformers.Config().V1().FeatureGates(),
+		cc.EventRecorder,
+	)
+	go featureGateAccessor.Run(ctx)
+	go configInformers.Start(ctx.Done())
+
+	select {
+	case <-featureGateAccessor.InitialFeatureGatesObserved():
+		enabled, disabled, _ := featureGateAccessor.CurrentFeatureGates()
+		klog.Infof("FeatureGates initialized: enabled=%v  disabled=%v", enabled, disabled)
+	case <-time.After(1 * time.Minute):
+		klog.Errorf("timed out waiting for FeatureGate detection")
+		return fmt.Errorf("timed out waiting for FeatureGate detection")
+	}
+
 	resourceSyncController, err := resourcesynccontroller.NewResourceSyncController(
 		operatorClient,
 		kubeInformersForNamespaces,
@@ -81,6 +103,7 @@ func RunOperator(ctx context.Context, cc *controllercmd.ControllerContext) error
 		configInformers,
 		kubeInformersForNamespaces,
 		resourceSyncController,
+		featureGateAccessor,
 		cc.EventRecorder,
 	)
 	if err != nil {