Skip to content

OCPBUGS-32242: The MCO makes a lot of API requests for ClusterOperator objects #4321

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 1 commit into from
May 22, 2024
Merged

OCPBUGS-32242: The MCO makes a lot of API requests for ClusterOperator objects #4321

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
69 changes: 32 additions & 37 deletions pkg/operator/operator.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -83,30 +83,30 @@ type Operator struct {

syncHandler func(ic string) error

imgLister configlistersv1.ImageLister
crdLister apiextlistersv1.CustomResourceDefinitionLister
mcpLister mcfglistersv1.MachineConfigPoolLister
msLister mcfglistersalphav1.MachineConfigNodeLister
ccLister mcfglistersv1.ControllerConfigLister
mcLister mcfglistersv1.MachineConfigLister
deployLister appslisterv1.DeploymentLister
daemonsetLister appslisterv1.DaemonSetLister
infraLister configlistersv1.InfrastructureLister
networkLister configlistersv1.NetworkLister
mcoCmLister corelisterv1.ConfigMapLister
clusterCmLister corelisterv1.ConfigMapLister
proxyLister configlistersv1.ProxyLister
oseKubeAPILister corelisterv1.ConfigMapLister
nodeLister corelisterv1.NodeLister
dnsLister configlistersv1.DNSLister
mcoSALister corelisterv1.ServiceAccountLister
mcoSecretLister corelisterv1.SecretLister
ocSecretLister corelisterv1.SecretLister
mcoCOLister configlistersv1.ClusterOperatorLister
mcopLister mcoplistersv1.MachineConfigurationLister
mckLister mcfglistersv1.KubeletConfigLister
crcLister mcfglistersv1.ContainerRuntimeConfigLister
nodeClusterLister configlistersv1.NodeLister
imgLister configlistersv1.ImageLister
crdLister apiextlistersv1.CustomResourceDefinitionLister
mcpLister mcfglistersv1.MachineConfigPoolLister
msLister mcfglistersalphav1.MachineConfigNodeLister
ccLister mcfglistersv1.ControllerConfigLister
mcLister mcfglistersv1.MachineConfigLister
deployLister appslisterv1.DeploymentLister
daemonsetLister appslisterv1.DaemonSetLister
infraLister configlistersv1.InfrastructureLister
networkLister configlistersv1.NetworkLister
mcoCmLister corelisterv1.ConfigMapLister
clusterCmLister corelisterv1.ConfigMapLister
proxyLister configlistersv1.ProxyLister
oseKubeAPILister corelisterv1.ConfigMapLister
nodeLister corelisterv1.NodeLister
dnsLister configlistersv1.DNSLister
mcoSALister corelisterv1.ServiceAccountLister
mcoSecretLister corelisterv1.SecretLister
ocSecretLister corelisterv1.SecretLister
clusterOperatorLister configlistersv1.ClusterOperatorLister
mcopLister mcoplistersv1.MachineConfigurationLister
mckLister mcfglistersv1.KubeletConfigLister
crcLister mcfglistersv1.ContainerRuntimeConfigLister
nodeClusterLister configlistersv1.NodeLister

crdListerSynced cache.InformerSynced
deployListerSynced cache.InformerSynced
Expand All @@ -130,7 +130,7 @@ type Operator struct {
mcoSAListerSynced cache.InformerSynced
mcoSecretListerSynced cache.InformerSynced
ocSecretListerSynced cache.InformerSynced
mcoCOListerSynced cache.InformerSynced
clusterOperatorListerSynced cache.InformerSynced
mcopListerSynced cache.InformerSynced
mckListerSynced cache.InformerSynced
crcListerSynced cache.InformerSynced
Expand Down Expand Up @@ -175,7 +175,7 @@ func New(
mcoSAInformer coreinformersv1.ServiceAccountInformer,
mcoSecretInformer coreinformersv1.SecretInformer,
ocSecretInformer coreinformersv1.SecretInformer,
mcoCOInformer configinformersv1.ClusterOperatorInformer,
clusterOperatorInformer configinformersv1.ClusterOperatorInformer,
mcopClient mcopclientset.Interface,
mcopInformer mcopinformersv1.MachineConfigurationInformer,
fgAccess featuregates.FeatureGateAccess,
Expand Down Expand Up @@ -217,7 +217,7 @@ func New(
klog.Errorf("Could not modify scheme: %v", err)
}

informers := []cache.SharedIndexInformer{
for _, i := range []cache.SharedIndexInformer{
controllerConfigInformer.Informer(),
serviceAccountInfomer.Informer(),
crdInformer.Informer(),
Expand All @@ -239,17 +239,12 @@ func New(
mcoSAInformer.Informer(),
mcoSecretInformer.Informer(),
ocSecretInformer.Informer(),
mcoCOInformer.Informer(),
mcopInformer.Informer(),
mckInformer.Informer(),
crcInformer.Informer(),
nodeClusterInformer.Informer(),
}

// this is for the FG
// informers = append(informers, moscInformer.Informer())

for _, i := range informers {
clusterOperatorInformer.Informer(),
} {
i.AddEventHandler(optr.eventHandler())
}

Expand Down Expand Up @@ -298,8 +293,8 @@ func New(
optr.mcoSecretListerSynced = mcoSecretInformer.Informer().HasSynced
optr.ocSecretLister = ocSecretInformer.Lister()
optr.ocSecretListerSynced = ocSecretInformer.Informer().HasSynced
optr.mcoCOLister = mcoCOInformer.Lister()
optr.mcoCOListerSynced = mcoCOInformer.Informer().HasSynced
optr.clusterOperatorLister = clusterOperatorInformer.Lister()
optr.clusterOperatorListerSynced = clusterOperatorInformer.Informer().HasSynced
optr.mcopLister = mcopInformer.Lister()
optr.mcopListerSynced = mcopInformer.Informer().HasSynced
optr.mckLister = mckInformer.Lister()
Expand Down Expand Up @@ -350,7 +345,7 @@ func (optr *Operator) Run(workers int, stopCh <-chan struct{}) {
optr.mcoSAListerSynced,
optr.mcoSecretListerSynced,
optr.ocSecretListerSynced,
optr.mcoCOListerSynced,
optr.clusterOperatorListerSynced,
optr.mcopListerSynced,
optr.mckListerSynced,
optr.crcListerSynced,
Expand Down
8 changes: 7 additions & 1 deletion pkg/operator/operator_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ import (
features "github.com/openshift/api/features"
mcfgv1 "github.com/openshift/api/machineconfiguration/v1"
fakeconfigclientset "github.com/openshift/client-go/config/clientset/versioned/fake"
configlistersv1 "github.com/openshift/client-go/config/listers/config/v1"
"github.com/openshift/library-go/pkg/operator/configobserver/featuregates"
"github.com/openshift/machine-config-operator/test/helpers"
"github.com/prometheus/client_golang/prometheus/testutil"
Expand Down Expand Up @@ -61,10 +62,15 @@ func TestMetrics(t *testing.T) {
},
}

operatorIndexer := cache.NewIndexer(cache.MetaNamespaceKeyFunc, cache.Indexers{cache.NamespaceIndex: cache.MetaNamespaceIndexFunc})
optr.clusterOperatorLister = configlistersv1.NewClusterOperatorLister(operatorIndexer)
operatorIndexer.Add(co)
operatorIndexer.Add(kasOperator)

optr.configClient = fakeconfigclientset.NewSimpleClientset(co, kasOperator)
err := optr.syncAll([]syncFunc{
{name: "fn1",
fn: func(config *renderConfig) error { return nil },
fn: func(config *renderConfig, co *configv1.ClusterOperator) error { return nil },
},
})
require.Nil(t, err)
Expand Down
Loading