diff --git a/pkg/cvo/availableupdates.go b/pkg/cvo/availableupdates.go index 8e0033737..b973e76b9 100644 --- a/pkg/cvo/availableupdates.go +++ b/pkg/cvo/availableupdates.go @@ -210,7 +210,7 @@ func (optr *Operator) getHTTPSProxyURL() (*url.URL, string, error) { } func (optr *Operator) getTLSConfig(cmNameRef string) (*tls.Config, error) { - cm, err := optr.cmManagedLister.Get(cmNameRef) + cm, err := optr.cmConfigLister.Get(cmNameRef) if err != nil { return nil, err diff --git a/pkg/cvo/cvo.go b/pkg/cvo/cvo.go index f3d6c431f..9c2c20dc6 100644 --- a/pkg/cvo/cvo.go +++ b/pkg/cvo/cvo.go @@ -99,12 +99,11 @@ type Operator struct { // syncBackoff allows the tests to use a quicker backoff syncBackoff wait.Backoff - cvLister configlistersv1.ClusterVersionLister - coLister configlistersv1.ClusterOperatorLister - cmConfigLister listerscorev1.ConfigMapNamespaceLister - cmManagedLister listerscorev1.ConfigMapNamespaceLister - proxyLister configlistersv1.ProxyLister - cacheSynced []cache.InformerSynced + cvLister configlistersv1.ClusterVersionLister + coLister configlistersv1.ClusterOperatorLister + cmConfigLister listerscorev1.ConfigMapNamespaceLister + proxyLister configlistersv1.ProxyLister + cacheSynced []cache.InformerSynced // queue tracks applying updates to a cluster. queue workqueue.RateLimitingInterface @@ -139,7 +138,6 @@ func New( cvInformer configinformersv1.ClusterVersionInformer, coInformer configinformersv1.ClusterOperatorInformer, cmConfigInformer informerscorev1.ConfigMapInformer, - cmManagedInformer informerscorev1.ConfigMapInformer, proxyInformer configinformersv1.ProxyInformer, client clientset.Interface, kubeClient kubernetes.Interface, @@ -180,7 +178,6 @@ func New( optr.cacheSynced = append(optr.cacheSynced, cvInformer.Informer().HasSynced) optr.cmConfigLister = cmConfigInformer.Lister().ConfigMaps(internal.ConfigNamespace) - optr.cmManagedLister = cmManagedInformer.Lister().ConfigMaps(internal.ConfigManagedNamespace) if enableMetrics { if err := optr.registerMetrics(coInformer.Informer()); err != nil { diff --git a/pkg/internal/constants.go b/pkg/internal/constants.go index 8cbde156e..efc9b1cd9 100644 --- a/pkg/internal/constants.go +++ b/pkg/internal/constants.go @@ -1,7 +1,6 @@ package internal const ( - ConfigNamespace = "openshift-config" - ConfigManagedNamespace = "openshift-config-managed" - InstallerConfigMap = "openshift-install" + ConfigNamespace = "openshift-config" + InstallerConfigMap = "openshift-install" ) diff --git a/pkg/start/start.go b/pkg/start/start.go index 9bc635756..8242ec30c 100644 --- a/pkg/start/start.go +++ b/pkg/start/start.go @@ -299,10 +299,9 @@ type Context struct { CVO *cvo.Operator AutoUpdate *autoupdate.Controller - CVInformerFactory externalversions.SharedInformerFactory - CMConfigInformerFactory informers.SharedInformerFactory - CMManagedInformerFactory informers.SharedInformerFactory - InformerFactory externalversions.SharedInformerFactory + CVInformerFactory externalversions.SharedInformerFactory + OpenshiftConfigInformerFactory informers.SharedInformerFactory + InformerFactory externalversions.SharedInformerFactory } // NewControllerContext initializes the default Context for the current Options. It does @@ -314,18 +313,14 @@ func (o *Options) NewControllerContext(cb *ClientBuilder) *Context { cvInformer := externalversions.NewFilteredSharedInformerFactory(client, resyncPeriod(o.ResyncInterval)(), "", func(opts *metav1.ListOptions) { opts.FieldSelector = fmt.Sprintf("metadata.name=%s", o.Name) }) - cmConfigInformer := informers.NewFilteredSharedInformerFactory(kubeClient, resyncPeriod(o.ResyncInterval)(), internal.ConfigNamespace, func(opts *metav1.ListOptions) { - opts.FieldSelector = fmt.Sprintf("metadata.name=%s", internal.InstallerConfigMap) - }) - cmManagedInformer := informers.NewSharedInformerFactoryWithOptions(kubeClient, resyncPeriod(o.ResyncInterval)(), informers.WithNamespace(internal.ConfigManagedNamespace)) + openshiftConfigInformer := informers.NewSharedInformerFactoryWithOptions(kubeClient, resyncPeriod(o.ResyncInterval)(), informers.WithNamespace(internal.ConfigNamespace)) sharedInformers := externalversions.NewSharedInformerFactory(client, resyncPeriod(o.ResyncInterval)()) ctx := &Context{ - CVInformerFactory: cvInformer, - CMConfigInformerFactory: cmConfigInformer, - CMManagedInformerFactory: cmManagedInformer, - InformerFactory: sharedInformers, + CVInformerFactory: cvInformer, + OpenshiftConfigInformerFactory: openshiftConfigInformer, + InformerFactory: sharedInformers, CVO: cvo.New( o.NodeName, @@ -335,8 +330,7 @@ func (o *Options) NewControllerContext(cb *ClientBuilder) *Context { resyncPeriod(o.ResyncInterval)(), cvInformer.Config().V1().ClusterVersions(), sharedInformers.Config().V1().ClusterOperators(), - cmConfigInformer.Core().V1().ConfigMaps(), - cmManagedInformer.Core().V1().ConfigMaps(), + openshiftConfigInformer.Core().V1().ConfigMaps(), sharedInformers.Config().V1().Proxies(), cb.ClientOrDie(o.Namespace), cb.KubeClientOrDie(o.Namespace, useProtobuf), @@ -364,7 +358,6 @@ func (c *Context) Start(ctx context.Context) { go c.AutoUpdate.Run(2, ch) } c.CVInformerFactory.Start(ch) - c.CMConfigInformerFactory.Start(ch) - c.CMManagedInformerFactory.Start(ch) + c.OpenshiftConfigInformerFactory.Start(ch) c.InformerFactory.Start(ch) }