diff --git a/configmap/informed_watcher_test.go b/configmap/informed_watcher_test.go index f5bf31711..4f3ff3dab 100644 --- a/configmap/informed_watcher_test.go +++ b/configmap/informed_watcher_test.go @@ -27,9 +27,9 @@ import ( ) type counter struct { - name string - cfg []*corev1.ConfigMap - wg *sync.WaitGroup + name string + cfg []*corev1.ConfigMap + wg *sync.WaitGroup } func (c *counter) callback(cm *corev1.ConfigMap) { @@ -357,14 +357,13 @@ func TestWatchWithDefaultAfterStart(t *testing.T) { foo1 := &counter{name: "foo1"} - // Add the WatchWithDefault. This should panic because the InformedWatcher has already started. func() { defer func() { recover() }() cm.WatchWithDefault(*defaultFooCM, foo1.callback) - t.Fatal("WatchWithDefault should have panicked") + t.Fatal("WatchWithDefault should have panicked") }() // We expect nothing. diff --git a/controller/controller.go b/controller/controller.go index b8f62447f..d59851449 100644 --- a/controller/controller.go +++ b/controller/controller.go @@ -19,10 +19,11 @@ package controller import ( "context" "fmt" - "github.com/google/uuid" "sync" "time" + "github.com/google/uuid" + "go.uber.org/zap" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/apimachinery/pkg/runtime/schema"