github/open-cluster-management
1
0
Fork 0
mirror of https://github.com/open-cluster-management-io/ocm.git synced 2026-05-09 18:57:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #92 from qiujian16/eventfilter

Browse Source 
Use eventfilterinformer
This commit is contained in:
OpenShift Merge Robot
2020-12-10 10:11:05 -05:00
committed by GitHub
parent e6a8104c70 efc2acdfb2
commit 8ea6273fbe
2 changed files with 25 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
pkg/spoke/hubclientcert/controller.go
View File

@@ -103,17 +103,23 @@ func NewClientCertForHubController(
}
return factory.New().
WithInformersQueueKeyFunc(func(obj runtime.Object) string {
accessor, err := meta.Accessor(obj)
if err != nil {
return irrelevantSecretKey
}
// we want to only care about the hub kubeconfig secret, others are irrelevant
if accessor.GetNamespace() == hubKubeconfigSecretNamespace && accessor.GetName() == kubeconfigSecretName {
WithFilteredEventsInformersQueueKeyFunc(
func(obj runtime.Object) string {
accessor, _ := meta.Accessor(obj)
return accessor.GetName()
}
return irrelevantSecretKey
}, spokeSecretInformer.Informer()).
},
func(obj interface{}) bool {
accessor, err := meta.Accessor(obj)
if err != nil {
return false
}
// only enqueue when hub kubeconfig secret is changed
if accessor.GetNamespace() == hubKubeconfigSecretNamespace && accessor.GetName() == kubeconfigSecretName {
return true
}
return false
},
spokeSecretInformer.Informer()).
WithInformers(hubCSRInformer.Informer()).
WithSync(c.sync).
ResyncEvery(ControllerSyncInterval).
@@ -121,16 +127,6 @@ func NewClientCertForHubController(
}
func (c *ClientCertForHubController) sync(ctx context.Context, syncCtx factory.SyncContext) error {
// there are three cases for the quequeKey
// 1. queueKey equals irrelevantSecretKey, this key is the result of other secret changes on managed cluster, ignore it
// 2. queueKey equals hub kubeconfig secret name, this key is the result of the hub kubeconfig secret changes on managed
// cluster, reconcile the secret
// 3. queueKey equals defautl queue key value ("key"), this key is the result of the csr changes on hub, we need
// reconcile the hub kubeconfig secret
queueKey := syncCtx.QueueKey()
if queueKey == irrelevantSecretKey {
return nil
}
// get hubKubeconfigSecret
secret, err := c.spokeCoreClient.Secrets(c.hubKubeconfigSecretNamespace).Get(ctx, c.hubKubeconfigSecretName, metav1.GetOptions{})
switch {

17
pkg/spoke/hubclientcert/secret_controller.go
View File

@@ -47,16 +47,21 @@ func NewHubKubeconfigSecretController(
}
return factory.New().
WithInformersQueueKeyFunc(
WithFilteredEventsInformersQueueKeyFunc(
func(obj runtime.Object) string {
accessor, _ := meta.Accessor(obj)
return accessor.GetName()
},
func(obj interface{}) bool {
accessor, err := meta.Accessor(obj)
if err != nil {
return ""
return false
}
// only enqueue when hub kubeconfig secret is changed
if accessor.GetNamespace() == hubKubeconfigSecretNamespace && accessor.GetName() == hubKubeconfigSecretName {
return accessor.GetName()
return true
}
return ""
return false
}, spokeSecretInformer.Informer()).
WithSync(s.sync).
ResyncEvery(5*time.Minute).
@@ -64,10 +69,6 @@ func NewHubKubeconfigSecretController(
}
func (s *hubKubeconfigSecretController) sync(ctx context.Context, syncCtx factory.SyncContext) error {
queueKey := syncCtx.QueueKey()
if queueKey == "" {
return nil
}
klog.V(4).Infof("Reconciling Hub KubeConfig secret %q", s.hubKubeconfigSecretName)
secret, err := s.spokeCoreClient.Secrets(s.hubKubeconfigSecretNamespace).Get(ctx, s.hubKubeconfigSecretName, metav1.GetOptions{})
if errors.IsNotFound(err) {