karmada-io
/
karmada
mirror of https://github.com/karmada-io/karmada.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #382 from huiwq1990/bugfix-clusterResourceBinding 

Remove dead code
This commit is contained in:
karmada-bot 2021-06-08 09:11:30 +08:00 committed by GitHub
parent dd7bdc2403 d96ac4e222
commit b9ca6606ee
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
pkg/util/detector/detector.go
View File

@ -62,10 +62,6 @@ type ResourceDetector struct {
// a reconcile function to consume the items in queue.
bindingReconcileWorker util.AsyncWorker
// clusterBindingReconcileWorker maintains a rate limited queue which used to store ClusterResourceBinding's key and
// a reconcile function to consume the items in queue.
clusterBindingReconcileWorker util.AsyncWorker
RESTMapper meta.RESTMapper
// waitingObjects tracks of objects which haven't be propagated yet as lack of appropriate policies.
@ -97,8 +93,6 @@ func (d *ResourceDetector) Start(ctx context.Context) error {
// setup binding reconcile worker
d.bindingReconcileWorker = util.NewAsyncWorker("binding reconciler", time.Microsecond, ClusterWideKeyFunc, d.ReconcileResourceBinding)
d.bindingReconcileWorker.Run(1, d.stopCh)
d.clusterBindingReconcileWorker = util.NewAsyncWorker("cluster binding reconciler", time.Microsecond, ClusterWideKeyFunc, d.ReconcileClusterResourceBinding)
d.clusterBindingReconcileWorker.Run(1, d.stopCh)
// watch and enqueue binding changes.
bindingHandler := informermanager.NewHandlerOnEvents(d.OnResourceBindingAdd, d.OnResourceBindingUpdate, d.OnResourceBindingDelete)
@ -546,7 +540,6 @@ func (d *ResourceDetector) BuildClusterResourceBinding(object *unstructured.Unst
Resource: workv1alpha1.ObjectReference{
APIVersion: object.GetAPIVersion(),
Kind: object.GetKind(),
Namespace: object.GetNamespace(),
Name: object.GetName(),
ResourceVersion: object.GetResourceVersion(),
},
@ -900,12 +893,7 @@ func (d *ResourceDetector) ReconcileResourceBinding(key util.QueueKey) error {
// OnClusterResourceBindingAdd handles object add event.
func (d *ResourceDetector) OnClusterResourceBindingAdd(obj interface{}) {
key, err := ClusterWideKeyFunc(obj)
if err != nil {
return
}
d.clusterBindingReconcileWorker.AddRateLimited(key)
}
// OnClusterResourceBindingUpdate handles object update event and push the object to queue.
@ -935,34 +923,6 @@ func (d *ResourceDetector) OnResourceBindingDelete(obj interface{}) {
}
}
// ReconcileClusterResourceBinding handles ResourceBinding object changes.
// For each ClusterResourceBinding changes, we will try to calculate the summary status and update to original object
// that the ClusterResourceBinding refer to.
func (d *ResourceDetector) ReconcileClusterResourceBinding(key util.QueueKey) error {
ckey, ok := key.(keys.ClusterWideKey)
if !ok { // should not happen
klog.Error("Found invalid key when reconciling cluster resource binding.")
return fmt.Errorf("invalid key")
}
binding := &workv1alpha1.ClusterResourceBinding{}
if err := d.Client.Get(context.TODO(), client.ObjectKey{Name: ckey.Name}, binding); err != nil {
if apierrors.IsNotFound(err) {
return nil
}
return err
}
klog.Infof("Reconciling cluster resource binding(%s)", binding.Name)
switch binding.Spec.Resource.Kind {
case util.DeploymentKind:
return d.AggregateDeploymentStatus(binding.Spec.Resource, binding.Status.AggregatedStatus)
default:
// Unsupported resource type.
return nil
}
}
// AggregateDeploymentStatus summarize deployment status and update to original objects.
func (d *ResourceDetector) AggregateDeploymentStatus(objRef workv1alpha1.ObjectReference, status []workv1alpha1.AggregatedStatusItem) error {
if objRef.APIVersion != "apps/v1" {