openshift · bertinatto · Oct 7, 2025 · Oct 7, 2025 · Oct 7, 2025 · Oct 7, 2025
diff --git a/go.mod b/go.mod
diff --git a/go.sum b/go.sum
diff --git a/pkg/monitor/monitor_test.go b/pkg/monitor/monitor_test.go
@@ -109,7 +109,7 @@ func TestMonitor_Events(t *testing.T) {
 				},
 			}
 			if got := m.recorder.Intervals(tt.from, tt.to); !reflect.DeepEqual(got, tt.want) {
-				t.Errorf("%s", diff.ObjectReflectDiff(tt.want, got))
+				t.Errorf("%s", diff.Diff(tt.want, got))
 			}
 		})
 	}

diff --git a/pkg/resourcewatch/git/diff.go b/pkg/resourcewatch/git/diff.go
@@ -10,7 +10,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/util/managedfields"
 	"k8s.io/apimachinery/pkg/util/sets"
-	"sigs.k8s.io/structured-merge-diff/v4/typed"
+	"sigs.k8s.io/structured-merge-diff/v6/typed"
 )
 
 var typeConverter managedfields.TypeConverter = managedfields.NewDeducedTypeConverter()

diff --git a/test/extended/cli/debug.go b/test/extended/cli/debug.go
@@ -308,7 +308,7 @@ spec:
 		}
 		o.Expect(readyWorkerNode).NotTo(o.BeEmpty(), "No ready worker node found")
 
-		err = oc.AsAdmin().Run("debug").Args("node/"+readyWorkerNode, "--image="+image.LocationFor("registry.k8s.io/e2e-test-images/agnhost:2.53"), "--keep-labels=true", "--preserve-pod=true", "--", "sleep", "1").Execute()
+		err = oc.AsAdmin().Run("debug").Args("node/"+readyWorkerNode, "--image="+image.LocationFor("registry.k8s.io/e2e-test-images/agnhost:2.56"), "--keep-labels=true", "--preserve-pod=true", "--", "sleep", "1").Execute()
 		pods, err := oc.AdminKubeClient().CoreV1().Pods(ns).List(context.TODO(), metav1.ListOptions{LabelSelector: "debug.openshift.io/managed-by=oc-debug"})
 		o.Expect(err).NotTo(o.HaveOccurred())
 		o.Expect(pods.Items).To(o.HaveLen(1))
@@ -329,7 +329,7 @@ spec:
 		})
 		o.Expect(err).NotTo(o.HaveOccurred(), "Expected debug pod to be deleted")
 
-		err = oc.AsAdmin().Run("debug").Args("node/"+readyWorkerNode, "--image="+image.LocationFor("registry.k8s.io/e2e-test-images/agnhost:2.53"), "--preserve-pod=true", "--", "sleep", "1").Execute()
+		err = oc.AsAdmin().Run("debug").Args("node/"+readyWorkerNode, "--image="+image.LocationFor("registry.k8s.io/e2e-test-images/agnhost:2.56"), "--preserve-pod=true", "--", "sleep", "1").Execute()
 
 		// Tests the code fix in https://github.com/openshift/oc/pull/2074
 		o.Expect(err).NotTo(o.HaveOccurred())

diff --git a/test/extended/controller_manager/deploy_defaults.go b/test/extended/controller_manager/deploy_defaults.go
@@ -144,7 +144,7 @@ var _ = g.Describe("[sig-apps][Feature:OpenShiftControllerManager]", func() {
 
 			clearTransient(appsDC)
 			if !reflect.DeepEqual(appsDC, tc.apps) {
-				t.Errorf("Apps DC differs from expected output: %s", diff.ObjectReflectDiff(appsDC, tc.apps))
+				t.Errorf("Apps DC differs from expected output: %s", diff.Diff(appsDC, tc.apps))
 			}
 		}
 	})

diff --git a/test/extended/deployments/util.go b/test/extended/deployments/util.go
@@ -727,7 +727,7 @@ func (d *deployerPodInvariantChecker) UpdatePod(pod *corev1.Pod) {
 		spew.Sprintf("%v: detected deployer pod '%s/%s' transition from terminated phase: %q -> %q;\n"+
 			"old: %#+v\nnew: %#+v\ndiff: %s",
 			time.Now(), pod.Namespace, pod.Name, oldPhase, pod.Status.Phase,
-			oldPod, pod, diff.ObjectReflectDiff(oldPod, pod)))
+			oldPod, pod, diff.Diff(oldPod, pod)))
 
 	d.cache[key][index] = pod
 

diff --git a/test/extended/etcd/etcd_storage_path.go b/test/extended/etcd/etcd_storage_path.go
@@ -652,7 +652,7 @@ func testEtcd3StoragePath(t g.GinkgoTInterface, oc *exutil.CLI, etcdClient3Fn fu
 			}
 
 			if !kapihelper.Semantic.DeepDerivative(input, output) {
-				t.Errorf("Test stub for %v does not match: %s", gvk, diff.ObjectGoPrintDiff(input, output))
+				t.Errorf("Test stub for %v does not match: %s", gvk, diff.Diff(input, output))
 			}
 
 			addGVKToEtcdBucket(cohabitatingResources, actualGVK, getEtcdBucket(testData.ExpectedEtcdPath))

diff --git a/test/extended/imageapis/imagesigning.go b/test/extended/imageapis/imagesigning.go
@@ -40,13 +40,13 @@ var _ = g.Describe("[sig-imageregistry][Feature:Image] signature", func() {
 		}
 
 		if len(image.Signatures) != 0 {
-			t.Fatalf("expected empty signatures, not: %s", diff.ObjectDiff(image.Signatures, []imagev1.ImageSignature{}))
+			t.Fatalf("expected empty signatures, not: %s", diff.Diff(image.Signatures, []imagev1.ImageSignature{}))
 		}
 
 		userClient := oc.ImageClient()
 
 		if len(image.Signatures) != 0 {
-			t.Fatalf("expected empty signatures, not: %s", diff.ObjectDiff(image.Signatures, []imagev1.ImageSignature{}))
+			t.Fatalf("expected empty signatures, not: %s", diff.Diff(image.Signatures, []imagev1.ImageSignature{}))
 		}
 
 		// add some dummy signature
@@ -139,7 +139,7 @@ var _ = g.Describe("[sig-imageregistry][Feature:Image] signature", func() {
 		}
 
 		if len(image.Signatures) != 0 {
-			t.Fatalf("expected empty signatures, not: %s", diff.ObjectDiff(image.Signatures, []imagev1.ImageSignature{}))
+			t.Fatalf("expected empty signatures, not: %s", diff.Diff(image.Signatures, []imagev1.ImageSignature{}))
 		}
 
 		userClient := oc.ImageClient()
@@ -289,7 +289,7 @@ func compareSignatures(t g.GinkgoTInterface, a, b imagev1.ImageSignature) {
 	a.ObjectMeta = b.ObjectMeta
 	a.Name = aName
 	if !reflect.DeepEqual(a, b) {
-		t.Errorf("created and contained signatures differ: %v", diff.ObjectDiff(a, b))
+		t.Errorf("created and contained signatures differ: %v", diff.Diff(a, b))
 	}
 }
 

diff --git a/test/extended/networking/egress_firewall.go b/test/extended/networking/egress_firewall.go
@@ -25,7 +25,7 @@ const (
 	egressFWE2E       = "egress-firewall-e2e"
 	wcEgressFWE2E     = "wildcard-egress-firewall-e2e"
 	noEgressFWE2E     = "no-egress-firewall-e2e"
-	egressFWTestImage = "registry.k8s.io/e2e-test-images/agnhost:2.53"
+	egressFWTestImage = "registry.k8s.io/e2e-test-images/agnhost:2.56"
 	oVNKManifest      = "ovnk-egressfirewall-test.yaml"
 	oVNKWCManifest    = "ovnk-egressfirewall-wildcard-test.yaml"
 )

diff --git a/test/extended/oauth/groupsync.go b/test/extended/oauth/groupsync.go
@@ -394,7 +394,7 @@ func compareAndCleanup(oc *exutil.CLI, validationFileName string) {
 			append([]byte("apiVersion: user.openshift.io/v1\nkind: Group\n"), data...)...)
 	}
 
-	o.Expect(bytes.Compare(validationContent, actualBytes)).To(o.Equal(0), "diff: %s", kdiff.StringDiff(string(validationContent), string(actualBytes)))
+	o.Expect(bytes.Compare(validationContent, actualBytes)).To(o.Equal(0), "diff: %s", kdiff.Diff(string(validationContent), string(actualBytes)))
 }
 
 // normalizeGroupMetadata cleans the metadata of the group object so that it matches the meta expectations

diff --git a/test/extended/operators/certs.go b/test/extended/operators/certs.go
@@ -338,7 +338,7 @@ func fetchOnDiskCertificates(ctx context.Context, kubeClient kubernetes.Interfac
 	}
 	defer kubeClient.RbacV1().ClusterRoleBindings().Delete(ctx, nodeReaderCRB, metav1.DeleteOptions{})
 
-	pauseImage := image.LocationFor("registry.k8s.io/e2e-test-images/agnhost:2.53")
+	pauseImage := image.LocationFor("registry.k8s.io/e2e-test-images/agnhost:2.56")
 	podNameOnNode, err := createPods(ctx, kubeClient, namespace, nodeList, testPullSpec, pauseImage)
 	if err != nil {
 		return nil, err

diff --git a/test/extended/router/config_manager.go b/test/extended/router/config_manager.go
@@ -391,7 +391,7 @@ http {
 					Containers: []corev1.Container{
 						{
 							Name:  "test",
-							Image: image.LocationFor("registry.k8s.io/e2e-test-images/agnhost:2.53"),
+							Image: image.LocationFor("registry.k8s.io/e2e-test-images/agnhost:2.56"),
 							Args:  []string{"netexec"},
 							Ports: []corev1.ContainerPort{
 								{

diff --git a/test/extended/router/weighted.go b/test/extended/router/weighted.go
@@ -245,7 +245,7 @@ var _ = g.Describe("[sig-network][Feature:Router][apigroup:image.openshift.io]",
 					Containers: []corev1.Container{
 						{
 							Name:  "test",
-							Image: image.LocationFor("registry.k8s.io/e2e-test-images/agnhost:2.53"),
+							Image: image.LocationFor("registry.k8s.io/e2e-test-images/agnhost:2.56"),
 							Args: []string{
 								"netexec",
 							},
@@ -276,7 +276,7 @@ var _ = g.Describe("[sig-network][Feature:Router][apigroup:image.openshift.io]",
 					Containers: []corev1.Container{
 						{
 							Name:  "test",
-							Image: image.LocationFor("registry.k8s.io/e2e-test-images/agnhost:2.53"),
+							Image: image.LocationFor("registry.k8s.io/e2e-test-images/agnhost:2.56"),
 							Args: []string{
 								"netexec",
 							},
@@ -307,7 +307,7 @@ var _ = g.Describe("[sig-network][Feature:Router][apigroup:image.openshift.io]",
 					Containers: []corev1.Container{
 						{
 							Name:  "test",
-							Image: image.LocationFor("registry.k8s.io/e2e-test-images/agnhost:2.53"),
+							Image: image.LocationFor("registry.k8s.io/e2e-test-images/agnhost:2.56"),
 							Args: []string{
 								"netexec",
 							},

diff --git a/test/extended/testdata/bindata.go b/test/extended/testdata/bindata.go
diff --git a/test/extended/testdata/cmd/test/cmd/testdata/hello-openshift/hello-pod.json b/test/extended/testdata/cmd/test/cmd/testdata/hello-openshift/hello-pod.json
@@ -12,7 +12,7 @@
     "containers": [
       {
         "name": "hello-openshift",
-        "image": "registry.k8s.io/e2e-test-images/agnhost:2.53",
+        "image": "registry.k8s.io/e2e-test-images/agnhost:2.56",
         "args": ["netexec"],
         "ports": [
           {

diff --git a/test/extended/testdata/cmd/test/cmd/testdata/templateinstance_objectkinds.yaml b/test/extended/testdata/cmd/test/cmd/testdata/templateinstance_objectkinds.yaml
@@ -40,7 +40,7 @@ items:
             spec:
               containers:
               - name: hello-openshift
-                image: registry.k8s.io/e2e-test-images/agnhost:2.53
+                image: registry.k8s.io/e2e-test-images/agnhost:2.56
       - kind: Route
         apiVersion: route.openshift.io/v1
         metadata:

diff --git a/test/extended/testdata/idling-echo-server-deployment.yaml b/test/extended/testdata/idling-echo-server-deployment.yaml
@@ -21,7 +21,7 @@ items:
           deployment: idling-echo
       spec:
         containers:
-        - image: registry.k8s.io/e2e-test-images/agnhost:2.53
+        - image: registry.k8s.io/e2e-test-images/agnhost:2.56
           name: idling-echo-server
           args: [ "netexec", "--http-port", "8675", "--udp-port", "3090" ]
           ports:

diff --git a/test/extended/testdata/idling-echo-server-rc.yaml b/test/extended/testdata/idling-echo-server-rc.yaml
@@ -17,7 +17,7 @@ items:
           replicationcontroller: idling-echo
       spec:
         containers:
-        - image: registry.k8s.io/e2e-test-images/agnhost:2.53
+        - image: registry.k8s.io/e2e-test-images/agnhost:2.56
           name: idling-echo-server
           args: [ "netexec", "--http-port", "8675" ]
           ports:

diff --git a/test/extended/testdata/idling-echo-server.yaml b/test/extended/testdata/idling-echo-server.yaml
@@ -20,7 +20,7 @@ items:
           deploymentconfig: idling-echo
       spec:
         containers:
-        - image: registry.k8s.io/e2e-test-images/agnhost:2.53
+        - image: registry.k8s.io/e2e-test-images/agnhost:2.56
           name: idling-echo-server
           args: [ "netexec", "--http-port", "8675", "--udp-port", "3090" ]
           ports:

diff --git a/test/extended/testdata/router/ingress.yaml b/test/extended/testdata/router/ingress.yaml
@@ -91,7 +91,7 @@ items:
     terminationGracePeriodSeconds: 1
     containers:
     - name: test
-      image: registry.k8s.io/e2e-test-images/agnhost:2.53
+      image: registry.k8s.io/e2e-test-images/agnhost:2.56
       args: ["netexec"]
       ports:
       - containerPort: 8080
@@ -109,7 +109,7 @@ items:
     terminationGracePeriodSeconds: 1
     containers:
     - name: test
-      image: registry.k8s.io/e2e-test-images/agnhost:2.53
+      image: registry.k8s.io/e2e-test-images/agnhost:2.56
       args: ["netexec"]
       ports:
       - containerPort: 8080

diff --git a/test/extended/testdata/router/router-common.yaml b/test/extended/testdata/router/router-common.yaml
@@ -105,7 +105,7 @@ items:
     terminationGracePeriodSeconds: 1
     containers:
     - name: test
-      image: registry.k8s.io/e2e-test-images/agnhost:2.53
+      image: registry.k8s.io/e2e-test-images/agnhost:2.56
       args: ["netexec"]
       ports:
       - containerPort: 8080

diff --git a/test/extended/testdata/router/router-metrics.yaml b/test/extended/testdata/router/router-metrics.yaml
@@ -78,7 +78,7 @@ items:
     terminationGracePeriodSeconds: 1
     containers:
     - name: test
-      image: registry.k8s.io/e2e-test-images/agnhost:2.53
+      image: registry.k8s.io/e2e-test-images/agnhost:2.56
       args: ["netexec"]
       ports:
       - containerPort: 8080
@@ -96,7 +96,7 @@ items:
     terminationGracePeriodSeconds: 1
     containers:
     - name: test
-      image: registry.k8s.io/e2e-test-images/agnhost:2.53
+      image: registry.k8s.io/e2e-test-images/agnhost:2.56
       args: ["netexec"]
       ports:
       - containerPort: 8080

diff --git a/test/extended/testdata/templates/templateinstance_badobject.yaml b/test/extended/testdata/templates/templateinstance_badobject.yaml
@@ -28,4 +28,4 @@ items:
             spec:
               containers:
               - name: hello-openshift
-                image: registry.k8s.io/e2e-test-images/agnhost:2.53
+                image: registry.k8s.io/e2e-test-images/agnhost:2.56
diff --git a/test/extended/testdata/templates/templateinstance_objectkinds.yaml b/test/extended/testdata/templates/templateinstance_objectkinds.yaml
@@ -40,7 +40,7 @@ items:
             spec:
               containers:
               - name: hello-openshift
-                image: registry.k8s.io/e2e-test-images/agnhost:2.53
+                image: registry.k8s.io/e2e-test-images/agnhost:2.56
       - kind: Route
         apiVersion: route.openshift.io/v1
         metadata:

diff --git a/test/extended/util/compat_otp/oauthserver/tokencmd/request_token_test.go b/test/extended/util/compat_otp/oauthserver/tokencmd/request_token_test.go
@@ -723,7 +723,7 @@ func TestSetDefaultOsinConfig(t *testing.T) {
 
 		// compare the configs to see if they match
 		if !reflect.DeepEqual(*tc.expectedConfig, *opts.OsinConfig) {
-			t.Errorf("%s: expected osin config does not match, %s", tc.name, diff.ObjectDiff(*tc.expectedConfig, *opts.OsinConfig))
+			t.Errorf("%s: expected osin config does not match, %s", tc.name, diff.Diff(*tc.expectedConfig, *opts.OsinConfig))
 		}
 	}
 }
diff --git a/test/extended/util/image/image.go b/test/extended/util/image/image.go
@@ -50,8 +50,8 @@ var (
 
 		// allowed upstream kube images - index and value must match upstream or
 		// tests will fail (vendor/k8s.io/kubernetes/test/utils/image/manifest.go)
-		"registry.k8s.io/e2e-test-images/agnhost:2.53":     1,
-		"registry.k8s.io/e2e-test-images/busybox:1.36.1-1": 7,
+		"registry.k8s.io/e2e-test-images/agnhost:2.56":     1,
+		"registry.k8s.io/e2e-test-images/busybox:1.37.0-1": 7,
 		"registry.k8s.io/e2e-test-images/nginx:1.15-4":     19,
 
 		// used by KubeVirt test to start fedora VMs
-Original file line number
+Diff line change
@@ Expand Up / @@ -109,7 +109,7 @@ func TestMonitor_Events(t *testing.T) { @@
     				},
     			}
     			if got := m.recorder.Intervals(tt.from, tt.to); !reflect.DeepEqual(got, tt.want) {
-    				t.Errorf("%s", diff.ObjectReflectDiff(tt.want, got))
+    				t.Errorf("%s", diff.Diff(tt.want, got))
     			}
     		})
     	}
@@ Expand Down @@