Fix controller tests

Signed-off-by: terashima <[email protected]>
cybozu-go · Dec 23, 2024 · 9c72524 · 9c72524
1 parent da602a7
commit 9c72524
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 3 deletions.
diff --git a/v2/cmd/coil-egress/sub/run.go b/v2/cmd/coil-egress/sub/run.go
@@ -37,8 +37,6 @@ func init() {
 
 	// +kubebuilder:scaffold:scheme
 
-	metrics.Registry.MustRegister(controllers.ClientPods)
-	metrics.Registry.MustRegister(controllers.ClientPodInfo)
 	metrics.Registry.MustRegister(egressMetrics.NfConnctackCount)
 	metrics.Registry.MustRegister(egressMetrics.NfConnctackLimit)
 	metrics.Registry.MustRegister(egressMetrics.NfTableMasqueradeBytes)

diff --git a/v2/controllers/mock_test.go b/v2/controllers/mock_test.go
@@ -158,7 +158,7 @@ func (t *mockFoUTunnel) AddPeer(ip net.IP, sportAuto bool) (netlink.Link, error)
 	defer t.mu.Unlock()
 
 	t.peers[ip.String()] = sportAuto
-	return nil, nil
+	return &mockLink{name: ip.String()}, nil
 }
 
 func (t *mockFoUTunnel) DelPeer(ip net.IP) error {
@@ -211,3 +211,16 @@ func (e *mockEgress) GetClients() map[string]bool {
 	}
 	return m
 }
+
+// mockLink implements netlink.Link interface
+type mockLink struct {
+	name string
+}
+
+func (m *mockLink) Attrs() *netlink.LinkAttrs {
+	return &netlink.LinkAttrs{Name: m.name}
+}
+
+func (m *mockLink) Type() string {
+	return "mock-link"
+}
diff --git a/v2/controllers/pod_watcher.go b/v2/controllers/pod_watcher.go
@@ -21,6 +21,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/client/config"
 	"sigs.k8s.io/controller-runtime/pkg/log"
+	"sigs.k8s.io/controller-runtime/pkg/metrics"
 )
 
 var (
@@ -45,6 +46,11 @@ var (
 	)
 )
 
+func init() {
+	metrics.Registry.MustRegister(ClientPods)
+	metrics.Registry.MustRegister(ClientPodInfo)
+}
+
 // +kubebuilder:rbac:groups="",resources=pods,verbs=get;list;watch
 
 // SetupPodWatcher registers pod watching reconciler to mgr.