Merge pull request #1052 from csrwng/revert_1026

OCPBUGS-34399:  Revert "Merge pull request #1026 from deepsm007/expose-chunksize"

Author: openshift-merge-bot[bot]

manifests/02-rbac.yaml

@@ -40,8 +40,6 @@ rules:
 - apiGroups:
   - config.openshift.io
   resources:
-  - clusterversions
-  - featuregates
   - infrastructures
   verbs:
   - get

manifests/07-operator-ibm-cloud-managed.yaml

@@ -50,8 +50,6 @@ spec:
           value: quay.io/openshift/origin-cli:v4.0
         - name: AZURE_ENVIRONMENT_FILEPATH
           value: /tmp/azurestackcloud.json
-        - name: OPERATOR_IMAGE_VERSION
-          value: 0.0.1-snapshot
         image: docker.io/openshift/origin-cluster-image-registry-operator:latest
         imagePullPolicy: IfNotPresent
         name: cluster-image-registry-operator

manifests/07-operator.yaml

@@ -77,8 +77,6 @@ spec:
               value: quay.io/openshift/origin-cli:v4.0
             - name: AZURE_ENVIRONMENT_FILEPATH
               value: /tmp/azurestackcloud.json
-            - name: OPERATOR_IMAGE_VERSION
-              value: 0.0.1-snapshot
           terminationMessagePolicy: FallbackToLogsOnError
           volumeMounts:
             - name: trusted-ca

pkg/operator/azurepathfixcontroller.go

@@ -30,7 +30,6 @@ import (
 	configlisters "github.com/openshift/client-go/config/listers/config/v1"
 	imageregistryv1informers "github.com/openshift/client-go/imageregistry/informers/externalversions/imageregistry/v1"
 	imageregistryv1listers "github.com/openshift/client-go/imageregistry/listers/imageregistry/v1"
-	"github.com/openshift/library-go/pkg/operator/configobserver/featuregates"
 	"github.com/openshift/library-go/pkg/operator/v1helpers"
 
 	"github.com/openshift/cluster-image-registry-operator/pkg/defaults"
@@ -52,8 +51,6 @@ type AzurePathFixController struct {
 
 	cachesToSync []cache.InformerSynced
 	queue        workqueue.RateLimitingInterface
-
-	featureGateAccessor featuregates.FeatureGateAccess
 }
 
 func NewAzurePathFixController(
@@ -67,7 +64,6 @@ func NewAzurePathFixController(
 	proxyInformer configv1informers.ProxyInformer,
 	openshiftConfigInformer corev1informers.ConfigMapInformer,
 	podInformer corev1informers.PodInformer,
-	featureGateAccessor featuregates.FeatureGateAccess,
 ) (*AzurePathFixController, error) {
 	c := &AzurePathFixController{
 		batchClient:               batchClient,
@@ -81,7 +77,6 @@ func NewAzurePathFixController(
 		openshiftConfigLister:     openshiftConfigInformer.Lister().ConfigMaps(defaults.OpenShiftConfigNamespace),
 		kubeconfig:                kubeconfig,
 		queue:                     workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "AzurePathFixController"),
-		featureGateAccessor:       featureGateAccessor,
 	}
 
 	if _, err := jobInformer.Informer().AddEventHandler(c.eventHandler()); err != nil {

pkg/operator/controller.go

@@ -28,7 +28,6 @@ import (
 	imageregistryinformers "github.com/openshift/client-go/imageregistry/informers/externalversions"
 	routeclient "github.com/openshift/client-go/route/clientset/versioned"
 	routeinformers "github.com/openshift/client-go/route/informers/externalversions"
-	"github.com/openshift/library-go/pkg/operator/configobserver/featuregates"
 	"github.com/openshift/library-go/pkg/operator/events"
 
 	regopclient "github.com/openshift/cluster-image-registry-operator/pkg/client"
@@ -79,13 +78,12 @@ func NewController(
 	configInformerFactory configinformers.SharedInformerFactory,
 	regopInformerFactory imageregistryinformers.SharedInformerFactory,
 	routeInformerFactory routeinformers.SharedInformerFactory,
-	featureGateAccessor featuregates.FeatureGateAccess,
 ) (*Controller, error) {
 	listers := &regopclient.Listers{}
 	clients := &regopclient.Clients{}
 	c := &Controller{
 		kubeconfig: kubeconfig,
-		generator:  resource.NewGenerator(eventRecorder, kubeconfig, clients, listers, featureGateAccessor),
+		generator:  resource.NewGenerator(eventRecorder, kubeconfig, clients, listers),
 		workqueue:  workqueue.NewNamedRateLimitingQueue(workqueue.DefaultControllerRateLimiter(), "Changes"),
 		listers:    listers,
 		clients:    clients,

pkg/operator/imageregistrycertificates.go

@@ -20,7 +20,6 @@ import (
 	configv1listers "github.com/openshift/client-go/config/listers/config/v1"
 	imageregistryv1informers "github.com/openshift/client-go/imageregistry/informers/externalversions/imageregistry/v1"
 	imageregistryv1listers "github.com/openshift/client-go/imageregistry/listers/imageregistry/v1"
-	"github.com/openshift/library-go/pkg/operator/configobserver/featuregates"
 	"github.com/openshift/library-go/pkg/operator/v1helpers"
 
 	"github.com/openshift/cluster-image-registry-operator/pkg/client"
@@ -42,8 +41,6 @@ type ImageRegistryCertificatesController struct {
 
 	cachesToSync []cache.InformerSynced
 	queue        workqueue.RateLimitingInterface
-
-	featureGateAccessor featuregates.FeatureGateAccess
 }
 
 func NewImageRegistryCertificatesController(
@@ -152,7 +149,7 @@ func (c *ImageRegistryCertificatesController) processNextWorkItem() bool {
 func (c *ImageRegistryCertificatesController) sync() error {
 	ctx := context.TODO()
 
-	g := resource.NewGeneratorCAConfig(c.configMapLister, c.imageConfigLister, c.openshiftConfigLister, c.serviceLister, c.imageRegistryConfigLister, c.storageListers, c.kubeconfig, c.coreClient, c.featureGateAccessor)
+	g := resource.NewGeneratorCAConfig(c.configMapLister, c.imageConfigLister, c.openshiftConfigLister, c.serviceLister, c.imageRegistryConfigLister, c.storageListers, c.kubeconfig, c.coreClient)
 	err := resource.ApplyMutator(g)
 	if err != nil {
 		_, _, updateError := v1helpers.UpdateStatus(
@@ -177,7 +174,6 @@ func (c *ImageRegistryCertificatesController) sync() error {
 		c.storageListers,
 		c.kubeconfig,
 		c.coreClient,
-		c.featureGateAccessor,
 	)
 	err = resource.ApplyMutator(g)
 	if err != nil {

pkg/operator/starter.go

@@ -2,8 +2,6 @@ package operator
 
 import (
 	"context"
-	"fmt"
-	"time"
 
 	kubeinformers "k8s.io/client-go/informers"
 	kubeclient "k8s.io/client-go/kubernetes"
@@ -19,10 +17,8 @@ import (
 	imageregistryinformers "github.com/openshift/client-go/imageregistry/informers/externalversions"
 	routeclient "github.com/openshift/client-go/route/clientset/versioned"
 	routeinformers "github.com/openshift/client-go/route/informers/externalversions"
-	"github.com/openshift/library-go/pkg/operator/configobserver/featuregates"
 	"github.com/openshift/library-go/pkg/operator/events"
 	"github.com/openshift/library-go/pkg/operator/loglevel"
-	"github.com/openshift/library-go/pkg/operator/status"
 
 	"github.com/openshift/cluster-image-registry-operator/pkg/client"
 	"github.com/openshift/cluster-image-registry-operator/pkg/defaults"
@@ -72,24 +68,6 @@ func RunOperator(ctx context.Context, kubeconfig *restclient.Config) error {
 	}
 	eventRecorder := events.NewKubeRecorder(kubeClient.CoreV1().Events(defaults.ImageRegistryOperatorNamespace), "image-registry-operator", controllerRef)
 
-	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(), eventRecorder)
-
-	go featureGateAccessor.Run(ctx)
-	configInformers.Start(ctx.Done())
-
-	select {
-	case <-featureGateAccessor.InitialFeatureGatesObserved():
-		featureGates, _ := featureGateAccessor.CurrentFeatureGates()
-		klog.Infof("FeatureGates initialized: knownFeatureGates=%v", featureGates.KnownFeatures())
-	case <-time.After(1 * time.Minute):
-		klog.Errorf("timed out waiting for FeatureGate detection")
-		return fmt.Errorf("timed out waiting for FeatureGate detection")
-	}
-
 	controller, err := NewController(
 		eventRecorder,
 		kubeconfig,
@@ -104,7 +82,6 @@ func RunOperator(ctx context.Context, kubeconfig *restclient.Config) error {
 		configInformers,
 		imageregistryInformers,
 		routeInformers,
-		featureGateAccessor,
 	)
 	if err != nil {
 		return err
@@ -202,7 +179,6 @@ func RunOperator(ctx context.Context, kubeconfig *restclient.Config) error {
 		configInformers.Config().V1().Proxies(),
 		kubeInformersForOpenShiftConfig.Core().V1().ConfigMaps(),
 		kubeInformers.Core().V1().Pods(),
-		featureGateAccessor,
 	)
 	if err != nil {
 		return err

pkg/resource/caconfig.go

@@ -17,7 +17,6 @@ import (
 	operatorv1 "github.com/openshift/api/operator/v1"
 	configlisters "github.com/openshift/client-go/config/listers/config/v1"
 	imageregistryv1listers "github.com/openshift/client-go/imageregistry/listers/imageregistry/v1"
-	"github.com/openshift/library-go/pkg/operator/configobserver/featuregates"
 
 	"github.com/openshift/cluster-image-registry-operator/pkg/client"
 	"github.com/openshift/cluster-image-registry-operator/pkg/defaults"
@@ -35,7 +34,6 @@ type generatorCAConfig struct {
 	storageListers            *client.StorageListers
 	kubeconfig                *restclient.Config
 	client                    coreset.CoreV1Interface
-	featureGateAccessor       featuregates.FeatureGateAccess
 }
 
 func NewGeneratorCAConfig(
@@ -47,7 +45,6 @@ func NewGeneratorCAConfig(
 	storageListers *client.StorageListers,
 	kubeconfig *restclient.Config,
 	client coreset.CoreV1Interface,
-	featureGateAccessor featuregates.FeatureGateAccess,
 ) Mutator {
 	return &generatorCAConfig{
 		lister:                    lister,
@@ -58,7 +55,6 @@ func NewGeneratorCAConfig(
 		storageListers:            storageListers,
 		kubeconfig:                kubeconfig,
 		client:                    client,
-		featureGateAccessor:       featureGateAccessor,
 	}
 }
 
@@ -88,7 +84,7 @@ func (gcac *generatorCAConfig) storageDriver() (storage.Driver, bool, error) {
 		return nil, false, nil
 	}
 
-	driver, err := storage.NewDriver(&imageRegistryConfig.Spec.Storage, gcac.kubeconfig, gcac.storageListers, gcac.featureGateAccessor)
+	driver, err := storage.NewDriver(&imageRegistryConfig.Spec.Storage, gcac.kubeconfig, gcac.storageListers)
 	if err == storage.ErrStorageNotConfigured || storage.IsMultiStoragesError(err) {
 		return nil, false, nil
 	} else if err != nil {

pkg/resource/generator.go

@@ -15,7 +15,6 @@ import (
 	"k8s.io/klog/v2"
 
 	imageregistryv1 "github.com/openshift/api/imageregistry/v1"
-	"github.com/openshift/library-go/pkg/operator/configobserver/featuregates"
 	"github.com/openshift/library-go/pkg/operator/events"
 
 	"github.com/openshift/cluster-image-registry-operator/pkg/client"
@@ -66,22 +65,20 @@ func ApplyMutator(gen Mutator) error {
 	})
 }
 
-func NewGenerator(eventRecorder events.Recorder, kubeconfig *rest.Config, clients *client.Clients, listers *client.Listers, featureGateAccessor featuregates.FeatureGateAccess) *Generator {
+func NewGenerator(eventRecorder events.Recorder, kubeconfig *rest.Config, clients *client.Clients, listers *client.Listers) *Generator {
 	return &Generator{
-		eventRecorder:       eventRecorder,
-		kubeconfig:          kubeconfig,
-		listers:             listers,
-		clients:             clients,
-		featureGateAccessor: featureGateAccessor,
+		eventRecorder: eventRecorder,
+		kubeconfig:    kubeconfig,
+		listers:       listers,
+		clients:       clients,
 	}
 }
 
 type Generator struct {
-	eventRecorder       events.Recorder
-	kubeconfig          *rest.Config
-	listers             *client.Listers
-	clients             *client.Clients
-	featureGateAccessor featuregates.FeatureGateAccess
+	eventRecorder events.Recorder
+	kubeconfig    *rest.Config
+	listers       *client.Listers
+	clients       *client.Clients
 }
 
 func (g *Generator) listRoutes(cr *imageregistryv1.Config) []Mutator {
@@ -98,7 +95,7 @@ func (g *Generator) listRoutes(cr *imageregistryv1.Config) []Mutator {
 }
 
 func (g *Generator) List(cr *imageregistryv1.Config) ([]Mutator, error) {
-	driver, err := storage.NewDriver(&cr.Spec.Storage, g.kubeconfig, &g.listers.StorageListers, g.featureGateAccessor)
+	driver, err := storage.NewDriver(&cr.Spec.Storage, g.kubeconfig, &g.listers.StorageListers)
 	if err != nil && err != storage.ErrStorageNotConfigured {
 		return nil, err
 	} else if err == storage.ErrStorageNotConfigured {
@@ -128,13 +125,13 @@ func (g *Generator) List(cr *imageregistryv1.Config) ([]Mutator, error) {
 func (g *Generator) syncStorage(cr *imageregistryv1.Config) error {
 	var runCreate bool
 	// Create a driver with the current configuration
-	driver, err := storage.NewDriver(&cr.Spec.Storage, g.kubeconfig, &g.listers.StorageListers, g.featureGateAccessor)
+	driver, err := storage.NewDriver(&cr.Spec.Storage, g.kubeconfig, &g.listers.StorageListers)
 	if err == storage.ErrStorageNotConfigured {
 		cr.Spec.Storage, _, err = storage.GetPlatformStorage(&g.listers.StorageListers)
 		if err != nil {
 			return fmt.Errorf("unable to get storage configuration from cluster install config: %s", err)
 		}
-		driver, err = storage.NewDriver(&cr.Spec.Storage, g.kubeconfig, &g.listers.StorageListers, g.featureGateAccessor)
+		driver, err = storage.NewDriver(&cr.Spec.Storage, g.kubeconfig, &g.listers.StorageListers)
 	}
 	if err != nil {
 		return err
@@ -172,11 +169,11 @@ func (g *Generator) storageReconfigured(
 	restCfg *rest.Config,
 	listers *client.Listers,
 ) bool {
-	prev, err := storage.NewDriver(&regCfg.Status.Storage, restCfg, &listers.StorageListers, g.featureGateAccessor)
+	prev, err := storage.NewDriver(&regCfg.Status.Storage, restCfg, &listers.StorageListers)
 	if err != nil {
 		return false
 	}
-	cur, err := storage.NewDriver(&regCfg.Spec.Storage, restCfg, &listers.StorageListers, g.featureGateAccessor)
+	cur, err := storage.NewDriver(&regCfg.Spec.Storage, restCfg, &listers.StorageListers)
 	if err != nil {
 		return false
 	}
@@ -292,7 +289,7 @@ func (g *Generator) Remove(cr *imageregistryv1.Config) error {
 		klog.Infof("object %s deleted", Name(gen))
 	}
 
-	driver, err := storage.NewDriver(&cr.Status.Storage, g.kubeconfig, &g.listers.StorageListers, g.featureGateAccessor)
+	driver, err := storage.NewDriver(&cr.Status.Storage, g.kubeconfig, &g.listers.StorageListers)
 	if err == storage.ErrStorageNotConfigured {
 		return nil
 	} else if err != nil {

pkg/resource/imageregistryca.go

@@ -17,7 +17,6 @@ import (
 	operatorv1 "github.com/openshift/api/operator/v1"
 	configlisters "github.com/openshift/client-go/config/listers/config/v1"
 	imageregistryv1listers "github.com/openshift/client-go/imageregistry/listers/imageregistry/v1"
-	"github.com/openshift/library-go/pkg/operator/configobserver/featuregates"
 
 	"github.com/openshift/cluster-image-registry-operator/pkg/client"
 	"github.com/openshift/cluster-image-registry-operator/pkg/defaults"
@@ -36,7 +35,6 @@ type generatorImageRegistryCA struct {
 	storageListers            *client.StorageListers
 	kubeconfig                *restclient.Config
 	client                    coreset.CoreV1Interface
-	featureGateAccessor       featuregates.FeatureGateAccess
 }
 
 func NewGeneratorImageRegistryCA(
@@ -49,7 +47,6 @@ func NewGeneratorImageRegistryCA(
 	storageListers *client.StorageListers,
 	kubeconfig *restclient.Config,
 	client coreset.CoreV1Interface,
-	featureGateAccessor featuregates.FeatureGateAccess,
 ) Mutator {
 	return &generatorImageRegistryCA{
 		lister:                    lister,
@@ -61,7 +58,6 @@ func NewGeneratorImageRegistryCA(
 		storageListers:            storageListers,
 		kubeconfig:                kubeconfig,
 		client:                    client,
-		featureGateAccessor:       featureGateAccessor,
 	}
 }
 
@@ -91,7 +87,7 @@ func (girca *generatorImageRegistryCA) storageDriver() (storage.Driver, bool, er
 		return nil, false, nil
 	}
 
-	driver, err := storage.NewDriver(&imageRegistryConfig.Spec.Storage, girca.kubeconfig, girca.storageListers, girca.featureGateAccessor)
+	driver, err := storage.NewDriver(&imageRegistryConfig.Spec.Storage, girca.kubeconfig, girca.storageListers)
 	if err == storage.ErrStorageNotConfigured || storage.IsMultiStoragesError(err) {
 		return nil, false, nil
 	} else if err != nil {