kube-controller-manager: finish conversion to contextual logging

This removes all exceptions and fixes the remaining unconverted log calls.

pkg/controller/controller_utils_test.go

@@ -51,6 +51,7 @@ import (
 	"k8s.io/kubernetes/pkg/controller/testutil"
 	"k8s.io/kubernetes/pkg/features"
 	"k8s.io/kubernetes/pkg/securitycontext"
+	"k8s.io/kubernetes/test/utils/ktesting"
 	testingclock "k8s.io/utils/clock/testing"
 	"k8s.io/utils/pointer"
 
@@ -170,6 +171,7 @@ func newReplicaSet(name string, replicas int) *apps.ReplicaSet {
 }
 
 func TestControllerExpectations(t *testing.T) {
+	logger, _ := ktesting.NewTestContext(t)
 	ttl := 30 * time.Second
 	e, fakeClock := NewFakeControllerExpectationsLookup(ttl)
 	// In practice we can't really have add and delete expectations since we only either create or
@@ -182,26 +184,26 @@ func TestControllerExpectations(t *testing.T) {
 	rcKey, err := KeyFunc(rc)
 	assert.NoError(t, err, "Couldn't get key for object %#v: %v", rc, err)
 
-	e.SetExpectations(rcKey, adds, dels)
+	e.SetExpectations(logger, rcKey, adds, dels)
 	var wg sync.WaitGroup
 	for i := 0; i < adds+1; i++ {
 		wg.Add(1)
 		go func() {
 			// In prod this can happen either because of a failed create by the rc
 			// or after having observed a create via informer
-			e.CreationObserved(rcKey)
+			e.CreationObserved(logger, rcKey)
 			wg.Done()
 		}()
 	}
 	wg.Wait()
 
 	// There are still delete expectations
-	assert.False(t, e.SatisfiedExpectations(rcKey), "Rc will sync before expectations are met")
+	assert.False(t, e.SatisfiedExpectations(logger, rcKey), "Rc will sync before expectations are met")
 
 	for i := 0; i < dels+1; i++ {
 		wg.Add(1)
 		go func() {
-			e.DeletionObserved(rcKey)
+			e.DeletionObserved(logger, rcKey)
 			wg.Done()
 		}()
 	}
@@ -215,10 +217,10 @@ func TestControllerExpectations(t *testing.T) {
 	add, del := podExp.GetExpectations()
 	assert.Equal(t, int64(-1), add, "Unexpected pod expectations %#v", podExp)
 	assert.Equal(t, int64(-1), del, "Unexpected pod expectations %#v", podExp)
-	assert.True(t, e.SatisfiedExpectations(rcKey), "Expectations are met but the rc will not sync")
+	assert.True(t, e.SatisfiedExpectations(logger, rcKey), "Expectations are met but the rc will not sync")
 
 	// Next round of rc sync, old expectations are cleared
-	e.SetExpectations(rcKey, 1, 2)
+	e.SetExpectations(logger, rcKey, 1, 2)
 	podExp, exists, err = e.GetExpectations(rcKey)
 	assert.NoError(t, err, "Could not get expectations for rc, exists %v and err %v", exists, err)
 	assert.True(t, exists, "Could not get expectations for rc, exists %v and err %v", exists, err)
@@ -229,11 +231,12 @@ func TestControllerExpectations(t *testing.T) {
 
 	// Expectations have expired because of ttl
 	fakeClock.Step(ttl + 1)
-	assert.True(t, e.SatisfiedExpectations(rcKey),
+	assert.True(t, e.SatisfiedExpectations(logger, rcKey),
 		"Expectations should have expired but didn't")
 }
 
 func TestUIDExpectations(t *testing.T) {
+	logger, _ := ktesting.NewTestContext(t)
 	uidExp := NewUIDTrackingControllerExpectations(NewControllerExpectations())
 	rcList := []*v1.ReplicationController{
 		newReplicationController(2),
@@ -261,24 +264,24 @@ func TestUIDExpectations(t *testing.T) {
 			rcPodNames = append(rcPodNames, PodKey(p))
 		}
 		rcToPods[rcKey] = rcPodNames
-		uidExp.ExpectDeletions(rcKey, rcPodNames)
+		uidExp.ExpectDeletions(logger, rcKey, rcPodNames)
 	}
 	for i := range rcKeys {
 		j := rand.Intn(i + 1)
 		rcKeys[i], rcKeys[j] = rcKeys[j], rcKeys[i]
 	}
 	for _, rcKey := range rcKeys {
-		assert.False(t, uidExp.SatisfiedExpectations(rcKey),
+		assert.False(t, uidExp.SatisfiedExpectations(logger, rcKey),
 			"Controller %v satisfied expectations before deletion", rcKey)
 
 		for _, p := range rcToPods[rcKey] {
-			uidExp.DeletionObserved(rcKey, p)
+			uidExp.DeletionObserved(logger, rcKey, p)
 		}
 
-		assert.True(t, uidExp.SatisfiedExpectations(rcKey),
+		assert.True(t, uidExp.SatisfiedExpectations(logger, rcKey),
 			"Controller %v didn't satisfy expectations after deletion", rcKey)
 
-		uidExp.DeleteExpectations(rcKey)
+		uidExp.DeleteExpectations(logger, rcKey)
 
 		assert.Nil(t, uidExp.GetUIDs(rcKey),
 			"Failed to delete uid expectations for %v", rcKey)
@@ -378,6 +381,7 @@ func TestDeletePodsAllowsMissing(t *testing.T) {
 }
 
 func TestActivePodFiltering(t *testing.T) {
+	logger, _ := ktesting.NewTestContext(t)
 	// This rc is not needed by the test, only the newPodList to give the pods labels/a namespace.
 	rc := newReplicationController(0)
 	podList := newPodList(nil, 5, v1.PodRunning, rc)
@@ -392,7 +396,7 @@ func TestActivePodFiltering(t *testing.T) {
 	for i := range podList.Items {
 		podPointers = append(podPointers, &podList.Items[i])
 	}
-	got := FilterActivePods(podPointers)
+	got := FilterActivePods(logger, podPointers)
 	gotNames := sets.NewString()
 	for _, pod := range got {
 		gotNames.Insert(pod.Name)