home/kt-connect
2
0
Fork 0
mirror of https://github.com/wahyd4/kt-connect.git synced 2026-08-09 05:16:02 +10:00
Code Issues Packages Projects Releases Wiki Activity

refact: make cloud watcher stopable

Browse Source
This commit is contained in:
yunlzheng
2020-03-08 11:01:52 +08:00
parent 6c45e69f30
commit 14204a71d8
3 changed files with 9 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/apiserver/cluster/pods.go
+1 -3
View File
@@ -4,7 +4,6 @@ import (
"time"
"k8s.io/apimachinery/pkg/util/runtime"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/client-go/informers"
v1 "k8s.io/client-go/listers/core/v1"
"k8s.io/client-go/tools/cache"
@@ -20,10 +19,9 @@ func podDeleted(obj interface{}) {
}
// Pods watch pods change
func (w *Watcher) Pods() (lister v1.PodLister, err error) {
func (w *Watcher) Pods(stopCh <-chan struct{}) (lister v1.PodLister, err error) {
resyncPeriod := 30 * time.Minute
stopCh := wait.NeverStop
factory := informers.NewSharedInformerFactory(w.Client, resyncPeriod)
podInformer := factory.Core().V1().Pods()
informer := podInformer.Informer()
pkg/apiserver/cluster/watcher.go
+5 -5
View File
@@ -34,7 +34,7 @@ func Construct(client kubernetes.Interface, config *rest.Config) (w Watcher, err
}
w.NamespaceLister = namespaceLister
podListener, err := w.Pods()
podListener, err := w.Pods(wait.NeverStop)
if err != nil {
return
}
@@ -55,9 +55,9 @@ func Construct(client kubernetes.Interface, config *rest.Config) (w Watcher, err
}
// ServiceListener ServiceListener
func ServiceListener(client kubernetes.Interface) (lister v1.ServiceLister, err error) {
func ServiceListener(client kubernetes.Interface, stopCh <-chan struct{}) (lister v1.ServiceLister, err error) {
w := Watcher{Client: client}
lister, err = w.Services(wait.NeverStop)
lister, err = w.Services(stopCh)
if err != nil {
return
}
@@ -65,9 +65,9 @@ func ServiceListener(client kubernetes.Interface) (lister v1.ServiceLister, err
}
// PodListener PodListener
func PodListener(client kubernetes.Interface) (lister v1.PodLister, err error) {
func PodListener(client kubernetes.Interface, stopCh <-chan struct{}) (lister v1.PodLister, err error) {
w := Watcher{Client: client}
lister, err = w.Pods()
lister, err = w.Pods(stopCh)
if err != nil {
return
}
pkg/kt/cluster/types.go
+3 -2
View File
@@ -3,6 +3,7 @@ package cluster
import (
clusterWatcher "github.com/alibaba/kt-connect/pkg/apiserver/cluster"
appV1 "k8s.io/api/apps/v1"
"k8s.io/apimachinery/pkg/util/wait"
"k8s.io/client-go/kubernetes"
v1 "k8s.io/client-go/listers/core/v1"
)
@@ -13,8 +14,8 @@ func Create(kubeConfig string) (kubernetes Kubernetes, err error) {
if err != nil {
return
}
serviceListener, err := clusterWatcher.ServiceListener(clientSet)
podListener, err := clusterWatcher.PodListener(clientSet)
serviceListener, err := clusterWatcher.ServiceListener(clientSet, wait.NeverStop)
podListener, err := clusterWatcher.PodListener(clientSet, wait.NeverStop)
if err != nil {
return
}