Another bugfix

Author: carreter

cmd/agent/app/server.go

@@ -41,6 +41,7 @@ import (
 	"k8s.io/apimachinery/pkg/labels"
 	"k8s.io/client-go/kubernetes"
 	coordinationv1lister "k8s.io/client-go/listers/coordination/v1"
+	"k8s.io/client-go/tools/cache"
 	"k8s.io/client-go/tools/clientcmd"
 	"k8s.io/klog/v2"
 	"k8s.io/utils/clock"
@@ -154,6 +155,7 @@ func (a *Agent) runProxyConnection(o *options.GrpcProxyAgentOptions, drainCh, st
 		}
 		leaseInformer := agent.NewLeaseInformerWithMetrics(k8sClient, LeaseNamespace, LeaseInformerResync)
 		go leaseInformer.Run(stopCh)
+		cache.WaitForCacheSync(stopCh, leaseInformer.HasSynced)
 		leaseLister := coordinationv1lister.NewLeaseLister(leaseInformer.GetIndexer())
 		serverLeaseSelector, _ := labels.Parse("k8s-app=konnectivity-server")
 		serverLeaseCounter := agent.NewServerLeaseCounter(

pkg/agent/lease_counter.go

@@ -51,7 +51,7 @@ func NewServerLeaseCounter(pc clock.PassiveClock, leaseLister coordinationv1list
 	return &ServerLeaseCounter{
 		leaseLister:   leaseLister,
 		selector:      labelSelector,
-		fallbackCount: 0,
+		fallbackCount: 1,
 		pc:            pc,
 	}
 }

pkg/agent/lease_counter_test.go

@@ -26,6 +26,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/client-go/kubernetes/fake"
 	coordinationv1lister "k8s.io/client-go/listers/coordination/v1"
+	"k8s.io/client-go/tools/cache"
 	clocktesting "k8s.io/utils/clock/testing"
 	proxytesting "sigs.k8s.io/apiserver-network-proxy/pkg/testing"
 )
@@ -120,8 +121,9 @@ func TestServerLeaseCounter(t *testing.T) {
 
 			k8sClient := fake.NewSimpleClientset(leases...)
 			selector, _ := labels.Parse(tc.labelSelector)
-			leaseInformer := NewLeaseInformerWithMetrics(k8sClient, "", time.Millisecond*100)
-			leaseInformer.Run(context.TODO().Done())
+			leaseInformer := NewLeaseInformerWithMetrics(k8sClient, "", time.Millisecond)
+			go leaseInformer.Run(context.Background().Done())
+			cache.WaitForCacheSync(context.Background().Done(), leaseInformer.HasSynced)
 			leaseLister := coordinationv1lister.NewLeaseLister(leaseInformer.GetIndexer())
 
 			counter := NewServerLeaseCounter(pc, leaseLister, selector)
@@ -139,7 +141,7 @@ type fakeLeaseLister struct {
 	Err       error
 }
 
-func (lister fakeLeaseLister) List(selector labels.Selector) (ret []*coordinationv1.Lease, err error) {
+func (lister *fakeLeaseLister) List(selector labels.Selector) (ret []*coordinationv1.Lease, err error) {
 	if lister.Err != nil {
 		return nil, lister.Err
 	}
@@ -152,7 +154,7 @@ func (lister fakeLeaseLister) List(selector labels.Selector) (ret []*coordinatio
 	return ret, nil
 }
 
-func (lister fakeLeaseLister) Leases(_ string) coordinationv1lister.LeaseNamespaceLister {
+func (lister *fakeLeaseLister) Leases(_ string) coordinationv1lister.LeaseNamespaceLister {
 	panic("should not be used")
 }
 
@@ -171,12 +173,12 @@ func TestServerLeaseCounter_FallbackCount(t *testing.T) {
 	pc := clocktesting.NewFakeClock(time.Now())
 	leases := []*coordinationv1.Lease{proxytesting.NewLeaseFromTemplate(pc, validLease), proxytesting.NewLeaseFromTemplate(pc, validLease), proxytesting.NewLeaseFromTemplate(pc, validLease), proxytesting.NewLeaseFromTemplate(pc, invalidLease)}
 	selector, _ := labels.Parse("label=value")
-	leaseLister := fakeLeaseLister{LeaseList: leases}
+	leaseLister := &fakeLeaseLister{LeaseList: leases}
 
 	counter := NewServerLeaseCounter(pc, leaseLister, selector)
 
-	got := counter.Count()
 	leaseLister.Err = fmt.Errorf("fake lease listing error")
+	got := counter.Count()
 	if got != 1 {
 		t.Errorf("lease counter did not return fallback count on leaseLister error (got: %v, want: 1)", got)
 	}