diff --git a/go.mod b/go.mod index b48acea1a..1f69222d1 100644 --- a/go.mod +++ b/go.mod @@ -126,6 +126,6 @@ require ( ) replace ( - github.com/kubernetes-sigs/application => github.com/kubesphere/application v0.0.0-20190518133311-b9d9eb0b5cf7 github.com/kiali/kiali => github.com/kubesphere/kiali v0.15.1-0.20190407071308-6b5b818211c3 + github.com/kubernetes-sigs/application => github.com/kubesphere/application v0.0.0-20190518133311-b9d9eb0b5cf7 ) diff --git a/pkg/controller/application/application_controller.go b/pkg/controller/application/application_controller.go index 208f28d85..f852c1816 100644 --- a/pkg/controller/application/application_controller.go +++ b/pkg/controller/application/application_controller.go @@ -20,7 +20,6 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" "k8s.io/client-go/util/workqueue" - "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/util/metrics" servicemeshinformers "kubesphere.io/kubesphere/pkg/client/informers/externalversions/servicemesh/v1alpha2" servicemeshlisters "kubesphere.io/kubesphere/pkg/client/listers/servicemesh/v1alpha2" @@ -160,7 +159,7 @@ func (v *ApplicationController) Run(workers int, stopCh <-chan struct{}) { log.Info("starting application controller") defer log.Info("shutting down application controller") - if !controller.WaitForCacheSync("application-controller", stopCh, v.deploymentSynced, v.statefulSetSynced, v.serviceSynced, v.strategySynced, v.servicePolicySynced, v.applicationSynced) { + if !cache.WaitForCacheSync(stopCh, v.deploymentSynced, v.statefulSetSynced, v.serviceSynced, v.strategySynced, v.servicePolicySynced, v.applicationSynced) { return } diff --git a/pkg/controller/destinationrule/destinationrule_controller.go b/pkg/controller/destinationrule/destinationrule_controller.go index 3b9f5f588..ca23f7bed 100644 --- a/pkg/controller/destinationrule/destinationrule_controller.go +++ b/pkg/controller/destinationrule/destinationrule_controller.go @@ -2,9 +2,11 @@ package destinationrule import ( "fmt" + "reflect" + "github.com/knative/pkg/apis/istio/v1alpha3" appsv1 "k8s.io/api/apps/v1" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" @@ -14,13 +16,13 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/kubernetes/scheme" v1core "k8s.io/client-go/kubernetes/typed/core/v1" - "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/util/metrics" servicemeshv1alpha2 "kubesphere.io/kubesphere/pkg/apis/servicemesh/v1alpha2" "kubesphere.io/kubesphere/pkg/controller/virtualservice/util" - "reflect" logf "sigs.k8s.io/controller-runtime/pkg/runtime/log" + "time" + istioclientset "github.com/knative/pkg/client/clientset/versioned" istioinformers "github.com/knative/pkg/client/informers/externalversions/istio/v1alpha3" istiolisters "github.com/knative/pkg/client/listers/istio/v1alpha3" @@ -32,7 +34,6 @@ import ( "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" "k8s.io/client-go/util/workqueue" - "time" servicemeshclient "kubesphere.io/kubesphere/pkg/client/clientset/versioned" servicemeshinformers "kubesphere.io/kubesphere/pkg/client/informers/externalversions/servicemesh/v1alpha2" @@ -159,7 +160,7 @@ func (v *DestinationRuleController) Run(workers int, stopCh <-chan struct{}) { log.Info("starting destinationrule controller") defer log.Info("shutting down destinationrule controller") - if !controller.WaitForCacheSync("destinationrule-controller", stopCh, v.serviceSynced, v.destinationRuleSynced, v.deploymentSynced, v.servicePolicySynced) { + if !cache.WaitForCacheSync(stopCh, v.serviceSynced, v.destinationRuleSynced, v.deploymentSynced, v.servicePolicySynced) { return } @@ -171,7 +172,7 @@ func (v *DestinationRuleController) Run(workers int, stopCh <-chan struct{}) { } func (v *DestinationRuleController) enqueueService(obj interface{}) { - key, err := controller.KeyFunc(obj) + key, err := cache.MetaNamespaceKeyFunc(obj) if err != nil { utilruntime.HandleError(fmt.Errorf("couldn't get key for object %+v: %v", obj, err)) return @@ -433,7 +434,7 @@ func (v *DestinationRuleController) getDeploymentServiceMemberShip(deployment *a } selector := labels.Set(service.Spec.Selector).AsSelectorPreValidated() if selector.Matches(labels.Set(deployment.Spec.Selector.MatchLabels)) { - key, err := controller.KeyFunc(service) + key, err := cache.MetaNamespaceKeyFunc(service) if err != nil { return nil, err } @@ -458,7 +459,7 @@ func (v *DestinationRuleController) addServicePolicy(obj interface{}) { set := sets.String{} for _, service := range services { - key, err := controller.KeyFunc(service) + key, err := cache.MetaNamespaceKeyFunc(service) if err != nil { utilruntime.HandleError(err) continue diff --git a/pkg/controller/job/job_controller.go b/pkg/controller/job/job_controller.go index 409b62524..1247179bd 100644 --- a/pkg/controller/job/job_controller.go +++ b/pkg/controller/job/job_controller.go @@ -20,24 +20,25 @@ package job import ( "encoding/json" "fmt" + "reflect" + "github.com/golang/glog" batchv1 "k8s.io/api/batch/v1" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" utilruntime "k8s.io/apimachinery/pkg/util/runtime" "k8s.io/apimachinery/pkg/util/wait" batchv1informers "k8s.io/client-go/informers/batch/v1" batchv1listers "k8s.io/client-go/listers/batch/v1" - "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/util/metrics" - "reflect" logf "sigs.k8s.io/controller-runtime/pkg/runtime/log" + "time" + clientset "k8s.io/client-go/kubernetes" "k8s.io/client-go/tools/cache" "k8s.io/client-go/tools/record" "k8s.io/client-go/util/workqueue" - "time" ) const ( @@ -106,7 +107,7 @@ func (v *JobController) Run(workers int, stopCh <-chan struct{}) { log.Info("starting job controller") defer log.Info("shutting down job controller") - if !controller.WaitForCacheSync("job-controller", stopCh, v.jobSynced) { + if !cache.WaitForCacheSync(stopCh, v.jobSynced) { return } @@ -118,7 +119,7 @@ func (v *JobController) Run(workers int, stopCh <-chan struct{}) { } func (v *JobController) enqueueJob(obj interface{}) { - key, err := controller.KeyFunc(obj) + key, err := cache.MetaNamespaceKeyFunc(obj) if err != nil { utilruntime.HandleError(fmt.Errorf("couldn't get key for object %+v: %v", obj, err)) return diff --git a/pkg/controller/virtualservice/virtualservice_controller.go b/pkg/controller/virtualservice/virtualservice_controller.go index ba81de932..b3820c3cc 100644 --- a/pkg/controller/virtualservice/virtualservice_controller.go +++ b/pkg/controller/virtualservice/virtualservice_controller.go @@ -2,8 +2,11 @@ package virtualservice import ( "fmt" + "reflect" + "strings" + "github.com/knative/pkg/apis/istio/v1alpha3" - "k8s.io/api/core/v1" + v1 "k8s.io/api/core/v1" "k8s.io/apimachinery/pkg/api/errors" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/labels" @@ -13,12 +16,9 @@ import ( "k8s.io/apimachinery/pkg/util/wait" "k8s.io/client-go/kubernetes/scheme" v1core "k8s.io/client-go/kubernetes/typed/core/v1" - "k8s.io/kubernetes/pkg/controller" "k8s.io/kubernetes/pkg/util/metrics" "kubesphere.io/kubesphere/pkg/controller/virtualservice/util" - "reflect" logf "sigs.k8s.io/controller-runtime/pkg/runtime/log" - "strings" istioclient "github.com/knative/pkg/client/clientset/versioned" istioinformers "github.com/knative/pkg/client/informers/externalversions/istio/v1alpha3" @@ -156,7 +156,7 @@ func (v *VirtualServiceController) Run(workers int, stopCh <-chan struct{}) { log.Info("starting virtualservice controller") defer log.Info("shutting down virtualservice controller") - if !controller.WaitForCacheSync("virtualservice-controller", stopCh, v.serviceSynced, v.virtualServiceSynced, v.destinationRuleSynced, v.strategySynced) { + if !cache.WaitForCacheSync(stopCh, v.serviceSynced, v.virtualServiceSynced, v.destinationRuleSynced, v.strategySynced) { return } @@ -168,7 +168,7 @@ func (v *VirtualServiceController) Run(workers int, stopCh <-chan struct{}) { } func (v *VirtualServiceController) enqueueService(obj interface{}) { - key, err := controller.KeyFunc(obj) + key, err := cache.MetaNamespaceKeyFunc(obj) if err != nil { utilruntime.HandleError(fmt.Errorf("couldn't get key for object %+v: %v", obj, err)) return @@ -428,7 +428,7 @@ func (v *VirtualServiceController) addDestinationRule(obj interface{}) { _, err = v.virtualServiceLister.VirtualServices(dr.Namespace).Get(dr.Name) if err != nil { if errors.IsNotFound(err) { - key, err := controller.KeyFunc(service) + key, err := cache.MetaNamespaceKeyFunc(service) if err != nil { utilruntime.HandleError(fmt.Errorf("get service %s/%s key failed", service.Namespace, service.Name)) return @@ -472,7 +472,7 @@ func (v *VirtualServiceController) addStrategy(obj interface{}) { continue } - key, err := controller.KeyFunc(service) + key, err := cache.MetaNamespaceKeyFunc(service) if err != nil { utilruntime.HandleError(err) return