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

refactor bindingcontroller with c.Client (#131) 

Signed-off-by: chenxianpao <chenxianpao@huawei.com>
This commit is contained in:
Xianpao Chen 2021-01-21 17:33:47 +08:00 committed by GitHub
parent f04229cec9
commit 991d390778
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cmd/controller-manager/app/controllermanager.go
View File

@ -18,7 +18,6 @@ import (
"github.com/karmada-io/karmada/pkg/controllers/membercluster"
"github.com/karmada-io/karmada/pkg/controllers/policy"
"github.com/karmada-io/karmada/pkg/controllers/status"
karmadaclientset "github.com/karmada-io/karmada/pkg/generated/clientset/versioned"
"github.com/karmada-io/karmada/pkg/util/gclient"
"github.com/karmada-io/karmada/pkg/util/informermanager"
"github.com/karmada-io/karmada/pkg/util/objectwatcher"
@ -79,7 +78,6 @@ func Run(opts *options.Options, stopChan <-chan struct{}) error {
func setupControllers(mgr controllerruntime.Manager, stopChan <-chan struct{}) {
resetConfig := mgr.GetConfig()
dynamicClientSet := dynamic.NewForConfigOrDie(resetConfig)
karmadaClient := karmadaclientset.NewForConfigOrDie(resetConfig)
kubeClientSet := kubernetes.NewForConfigOrDie(resetConfig)
objectWatcher := objectwatcher.NewObjectWatcher(mgr.GetClient(), kubeClientSet, mgr.GetRESTMapper())
@ -116,7 +114,6 @@ func setupControllers(mgr controllerruntime.Manager, stopChan <-chan struct{}) {
bindingController := &binding.PropagationBindingController{
Client: mgr.GetClient(),
DynamicClient: dynamicClientSet,
KarmadaClient: karmadaClient,
EventRecorder: mgr.GetEventRecorderFor(binding.ControllerName),
RESTMapper: mgr.GetRESTMapper(),
OverrideManager: overridemanager,

21
pkg/controllers/binding/binding_controller.go
View File

@ -10,6 +10,7 @@ import (
"k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/apimachinery/pkg/selection"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/client-go/dynamic"
"k8s.io/client-go/tools/record"
@ -19,7 +20,6 @@ import (
"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
"github.com/karmada-io/karmada/pkg/apis/propagationstrategy/v1alpha1"
karmadaclientset "github.com/karmada-io/karmada/pkg/generated/clientset/versioned"
"github.com/karmada-io/karmada/pkg/util"
"github.com/karmada-io/karmada/pkg/util/names"
"github.com/karmada-io/karmada/pkg/util/overridemanager"
@ -33,9 +33,8 @@ var controllerKind = v1alpha1.SchemeGroupVersion.WithKind("PropagationBinding")
// PropagationBindingController is to sync PropagationBinding.
type PropagationBindingController struct {
client.Client // used to operate PropagationBinding resources.
DynamicClient dynamic.Interface // used to fetch arbitrary resources.
KarmadaClient karmadaclientset.Interface // used to create/update PropagationWork resources.
client.Client // used to operate PropagationBinding resources.
DynamicClient dynamic.Interface // used to fetch arbitrary resources.
EventRecorder record.EventRecorder
RESTMapper meta.RESTMapper
OverrideManager overridemanager.OverrideManager
@ -107,7 +106,7 @@ func (c *PropagationBindingController) syncBinding(binding *v1alpha1.Propagation
// removeOrphanBindings will remove orphan propagationWorks.
func (c *PropagationBindingController) removeOrphanWorks(works []v1alpha1.PropagationWork) error {
for _, work := range works {
err := c.KarmadaClient.PropagationstrategyV1alpha1().PropagationWorks(work.GetNamespace()).Delete(context.TODO(), work.GetName(), metav1.DeleteOptions{})
err := c.Client.Delete(context.TODO(), &work)
if err != nil {
return err
}
@ -118,12 +117,14 @@ func (c *PropagationBindingController) removeOrphanWorks(works []v1alpha1.Propag
// findOrphanWorks will find orphan propagationWorks that don't match current propagationBinding clusters.
func (c *PropagationBindingController) findOrphanWorks(ownerLabel string, clusterNames []string) ([]v1alpha1.PropagationWork, error) {
ownerLabelSelector := metav1.LabelSelector{
MatchLabels: map[string]string{util.OwnerLabel: ownerLabel},
}
propagationWorkList, err := c.KarmadaClient.PropagationstrategyV1alpha1().PropagationWorks(metav1.NamespaceAll).List(context.TODO(),
metav1.ListOptions{LabelSelector: labels.Set(ownerLabelSelector.MatchLabels).String()})
labelRequirement, err := labels.NewRequirement(util.OwnerLabel, selection.Equals, []string{ownerLabel})
if err != nil {
klog.Errorf("Failed to new a requirement. Error: %v", err)
return nil, err
}
selector := labels.NewSelector().Add(*labelRequirement)
propagationWorkList := &v1alpha1.PropagationWorkList{}
if err := c.Client.List(context.TODO(), propagationWorkList, &client.ListOptions{LabelSelector: selector}); err != nil {
return nil, err
}
var orphanWorks []v1alpha1.PropagationWork