bump(k8s): align to upstream diff util changes

Author: kevinrizza

pkg/apps/deployer/deployer_controller_test.go

@@ -1212,8 +1212,8 @@ func TestMakeDeployerPod(t *testing.T) {
 
 		if !reflect.DeepEqual(inputPodTemplate.Spec, outputPodTemplate.Spec) {
 			t.Fatalf("Deployer pod is missing fields:\n%s\n\n%s",
-				diff.ObjectReflectDiff(inputPodTemplate.Spec, outputPodTemplate.Spec),
-				diff.ObjectDiff(inputPodTemplate.Spec, outputPodTemplate.Spec),
+				diff.Diff(inputPodTemplate.Spec, outputPodTemplate.Spec),
+				diff.Diff(inputPodTemplate.Spec, outputPodTemplate.Spec),
 			)
 		}
 	}

pkg/apps/deploymentconfig/deploymentconfig_controller_test.go

@@ -428,7 +428,7 @@ func TestHandleScenarios(t *testing.T) {
 		for i := 0; i < len(expectedDeployments); i++ {
 			expected, actual := expectedDeployments[i], actualDeployments[i]
 			if !kapihelper.Semantic.DeepEqual(expected, actual) {
-				t.Errorf("actual deployment don't match expected: %v", diff.ObjectDiff(expected, actual))
+				t.Errorf("actual deployment don't match expected: %v", diff.Diff(expected, actual))
 			}
 		}
 	}

pkg/build/controller/common/buildpodutil_test.go

@@ -19,7 +19,7 @@ func TestGetBuild(t *testing.T) {
 		t.Fatalf("unexpected error: %v", err)
 	}
 	if e, a := build.AsBuild(), resultBuild; !reflect.DeepEqual(e, a) {
-		t.Errorf("did not get expected build: %s", diff.ObjectDiff(e, a))
+		t.Errorf("did not get expected build: %s", diff.Diff(e, a))
 	}
 }
 
@@ -32,6 +32,6 @@ func TestSetBuild(t *testing.T) {
 	}
 	resultBuild := pod.GetBuild(t)
 	if e, a := build.AsBuild(), resultBuild; !reflect.DeepEqual(e, a) {
-		t.Errorf("%s: did not get expected build: %s", version, diff.ObjectDiff(e, a))
+		t.Errorf("%s: did not get expected build: %s", version, diff.Diff(e, a))
 	}
 }

pkg/image/controller/trigger/image_trigger_controller_test.go

@@ -361,7 +361,7 @@ func TestTriggerControllerSyncBuildConfigResource(t *testing.T) {
 				t.Errorf("unexpected error: %v", err)
 			}
 			if inst.namespace != "test2" || !reflect.DeepEqual(inst.req, test.req) {
-				t.Errorf("For test %s unexpected: %s %s", test.name, inst.namespace, diff.ObjectReflectDiff(test.req, inst.req))
+				t.Errorf("For test %s unexpected: %s %s", test.name, inst.namespace, diff.Diff(test.req, inst.req))
 			}
 			if inst.req == nil {
 				t.Fatal("never instantiated")
@@ -517,7 +517,7 @@ func TestBuildConfigTriggerIndexer(t *testing.T) {
 
 	actual, ok := c.Get("buildconfigs/test/build1")
 	if e := scenario_1_buildConfig_strategy_cacheEntry(); !ok || !reflect.DeepEqual(e, actual) {
-		t.Fatalf("unexpected: %s", diff.ObjectReflectDiff(e, actual))
+		t.Fatalf("unexpected: %s", diff.Diff(e, actual))
 	}
 	if err := verifyEntriesAt(c, []interface{}{scenario_1_buildConfig_strategy_cacheEntry()}, "test/stream"); err != nil {
 		t.Fatal(err)
@@ -526,7 +526,7 @@ func TestBuildConfigTriggerIndexer(t *testing.T) {
 	// verify we create two index entries and can cross namespaces with trigger types
 	actual, ok = c.Get("buildconfigs/test2/build2")
 	if e := scenario_1_buildConfig_imageSource_cacheEntry(); !ok || !reflect.DeepEqual(e, actual) {
-		t.Fatalf("unexpected: %s", diff.ObjectReflectDiff(e, actual))
+		t.Fatalf("unexpected: %s", diff.Diff(e, actual))
 	}
 	if err := verifyEntriesAt(c, []interface{}{scenario_1_buildConfig_imageSource_cacheEntry()}, "other/stream", "test2/stream"); err != nil {
 		t.Fatal(err)
@@ -589,7 +589,7 @@ func TestDeploymentConfigTriggerIndexer(t *testing.T) {
 
 	actual, ok := c.Get("deploymentconfigs/test/deploy1")
 	if e := scenario_1_deploymentConfig_imageSource_cacheEntry(); !ok || !reflect.DeepEqual(e, actual) {
-		t.Fatalf("unexpected: %s\n%#v", diff.ObjectReflectDiff(e, actual), actual)
+		t.Fatalf("unexpected: %s\n%#v", diff.Diff(e, actual), actual)
 	}
 	if err := verifyEntriesAt(c, []interface{}{scenario_1_deploymentConfig_imageSource_cacheEntry()}, "test/stream"); err != nil {
 		t.Fatal(err)
@@ -610,7 +610,7 @@ func verifyEntriesAt(c cache.ThreadSafeStore, entries []interface{}, keys ...str
 			return fmt.Errorf("unexpected error for key %s: %v", key, err)
 		}
 		if e, a := entries, indexed; !reflect.DeepEqual(e, a) {
-			return fmt.Errorf("unexpected entry for key %s: %s", key, diff.ObjectReflectDiff(e, a))
+			return fmt.Errorf("unexpected entry for key %s: %s", key, diff.Diff(e, a))
 		}
 	}
 	return nil
@@ -1423,7 +1423,7 @@ func verifyState(
 		var failures []string
 		for _, obj := range bcInformer.GetStore().List() {
 			if bc, err := updateBuildConfigImages(obj.(*buildv1.BuildConfig), c.tagRetriever); bc != nil || err != nil {
-				failures = append(failures, fmt.Sprintf("%s is not fully resolved: %v %s", obj.(*buildv1.BuildConfig).Name, err, diff.ObjectReflectDiff(obj, bc)))
+				failures = append(failures, fmt.Sprintf("%s is not fully resolved: %v %s", obj.(*buildv1.BuildConfig).Name, err, diff.Diff(obj, bc)))
 				continue
 			}
 		}

pkg/image/trigger/buildconfigs/buildconfigs_test.go

@@ -351,7 +351,7 @@ func TestBuildConfigReactor(t *testing.T) {
 		initial := test.obj.DeepCopy()
 		err := r.ImageChanged(test.obj, fakeTagRetriever(test.tags))
 		if !kapihelper.Semantic.DeepEqual(initial, test.obj) {
-			t.Errorf("%d: should not have mutated: %s", i, diff.ObjectReflectDiff(initial, test.obj))
+			t.Errorf("%d: should not have mutated: %s", i, diff.Diff(initial, test.obj))
 		}
 		switch {
 		case err == nil && test.expectedErr, err != nil && !test.expectedErr:
@@ -365,7 +365,7 @@ func TestBuildConfigReactor(t *testing.T) {
 				t.Errorf("%d: unexpected request: %v", i, instantiator.request)
 			}
 			if !reflect.DeepEqual(test.expected, instantiator.request) {
-				t.Errorf("%d: not equal: %s", i, diff.ObjectReflectDiff(test.expected, instantiator.request))
+				t.Errorf("%d: not equal: %s", i, diff.Diff(test.expected, instantiator.request))
 				t.Logf("%#v", instantiator.request.TriggeredBy)
 				continue
 			}

pkg/image/trigger/deploymentconfigs/deploymentconfigs_test.go

@@ -401,7 +401,7 @@ func TestDeploymentConfigReactor(t *testing.T) {
 			initial := test.obj.DeepCopy()
 			err := r.ImageChanged(test.obj, fakeTagRetriever(test.tags))
 			if !kapihelper.Semantic.DeepEqual(initial, test.obj) {
-				t.Errorf("should not have mutated: %s", diff.ObjectReflectDiff(initial, test.obj))
+				t.Errorf("should not have mutated: %s", diff.Diff(initial, test.obj))
 			}
 			switch {
 			case err == nil && test.expectedErr, err != nil && !test.expectedErr:
@@ -418,7 +418,7 @@ func TestDeploymentConfigReactor(t *testing.T) {
 					t.Fatalf("no response defined %#v", actions)
 				}
 				if !reflect.DeepEqual(test.expected, actualUpdate) {
-					t.Fatalf("not equal: %s", diff.ObjectReflectDiff(test.expected, actualUpdate))
+					t.Fatalf("not equal: %s", diff.Diff(test.expected, actualUpdate))
 				}
 			} else {
 				if len(c.Actions()) != 0 {