Merge pull request #30346 from bertinatto/rebase-1.34

OCPSTRAT-2371: Update to Kubernetes v1.34.1

Author: openshift-merge-bot[bot]

go.mod

@@ -20,5 +20,5 @@ RUN PACKAGES="git gzip util-linux" && \
 LABEL io.k8s.display-name="OpenShift End-to-End Tests" \
     io.openshift.release.operator=true \
     io.k8s.description="OpenShift is a platform for developing, building, and deploying containerized applications." \
-    io.openshift.build.versions="kubernetes-tests=1.33.4" \
+    io.openshift.build.versions="kubernetes-tests=1.34.1" \
     io.openshift.tags="openshift,tests,e2e"

go.sum

@@ -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))
 			}
 		})
 	}

images/tests/Dockerfile.rhel

@@ -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()

pkg/monitor/monitor_test.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())

pkg/resourcewatch/git/diff.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))
 			}
 		}
 	})

test/extended/cli/debug.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
 

test/extended/controller_manager/deploy_defaults.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))
 	}
 }