Skip to content

OCPBUGS-99774: remove redundant cluster-wide informer and unused kube-system registration #966

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

Open
savio87 wants to merge 1 commit into
base: master
Choose a base branch
from
+2 −8
Open

OCPBUGS-99774: remove redundant cluster-wide informer and unused kube-system registration #966

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
6 changes: 0 additions & 6 deletions pkg/operator/replacement_starter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,6 @@ import (
"os"
"time"

kubeinformers "k8s.io/client-go/informers"
"k8s.io/utils/clock"

kubemigratorclient "sigs.k8s.io/kube-storage-version-migrator/pkg/clients/clientset"
Expand Down Expand Up @@ -236,8 +235,6 @@ type authenticationOperatorInformerFactories struct {
operatorInformer operatorinformer.SharedInformerFactory
apiregistrationInformers apiregistrationinformers.SharedInformerFactory
migrationInformer migrationv1alpha1informer.SharedInformerFactory
// TODO remove
kubeInformers kubeinformers.SharedInformerFactory

namespacedOpenshiftAuthenticationRoutes routeinformer.SharedInformerFactory
}
Expand All @@ -254,14 +251,12 @@ func newInformerFactories(authOperatorInput *authenticationOperatorInput) authen
"openshift-authentication-operator",
"openshift-kube-apiserver",
"", // an informer for non-namespaced resources
"kube-system",
libgoetcd.EtcdEndpointNamespace,
),
operatorConfigInformer: configinformer.NewSharedInformerFactoryWithOptions(authOperatorInput.configClient, resync),
operatorInformer: operatorinformer.NewSharedInformerFactory(authOperatorInput.operatorClient, 24*time.Hour),
apiregistrationInformers: apiregistrationinformers.NewSharedInformerFactory(authOperatorInput.apiregistrationv1Client, 10*time.Minute),
migrationInformer: migrationv1alpha1informer.NewSharedInformerFactory(authOperatorInput.migrationClient, time.Minute*30),
kubeInformers: kubeinformers.NewSharedInformerFactory(authOperatorInput.kubeClient, resync),

namespacedOpenshiftAuthenticationRoutes: routeinformer.NewSharedInformerFactoryWithOptions(authOperatorInput.routeClient, resync,
routeinformer.WithNamespace("openshift-authentication"),
Expand All @@ -277,7 +272,6 @@ func (a authenticationOperatorInformerFactories) simplifiedInformerFactories() [
libraryapplyconfiguration.GeneratedInformerFactoryAdapter(a.operatorConfigInformer),
libraryapplyconfiguration.GeneratedInformerFactoryAdapter(a.apiregistrationInformers),
libraryapplyconfiguration.GeneratedInformerFactoryAdapter(a.migrationInformer),
libraryapplyconfiguration.GeneratedInformerFactoryAdapter(a.kubeInformers),
libraryapplyconfiguration.GeneratedInformerFactoryAdapter(a.namespacedOpenshiftAuthenticationRoutes),
}
}
Expand Down
4 changes: 2 additions & 2 deletions pkg/operator/starter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -791,7 +791,7 @@ func prepareOauthAPIServerOperator(
Subject: &pkix.Name{CommonName: "system:serviceaccount:openshift-oauth-apiserver:openshift-authenticator"},
SignerName: certapiv1.KubeAPIServerClientSignerName,
},
informerFactories.kubeInformers.Certificates().V1().CertificateSigningRequests(),
informerFactories.kubeInformersForNamespaces.InformersFor("").Certificates().V1().CertificateSigningRequests(),
authOperatorInput.kubeClient.CertificatesV1().CertificateSigningRequests(),
informerFactories.kubeInformersForNamespaces.InformersFor("openshift-oauth-apiserver").Core().V1().Secrets(),
authOperatorInput.kubeClient.CoreV1(),
Expand All @@ -812,7 +812,7 @@ func prepareOauthAPIServerOperator(
"OpenShiftAuthenticator",
authOperatorInput.authenticationOperatorClient,
authOperatorInput.kubeClient.CertificatesV1().CertificateSigningRequests(),
informerFactories.kubeInformers.Certificates().V1().CertificateSigningRequests(),
informerFactories.kubeInformersForNamespaces.InformersFor("").Certificates().V1().CertificateSigningRequests(),
csr.NewLabelFilter(labelSelector),
csr.NewServiceAccountApprover(
"openshift-authentication-operator",
Expand Down