WIP: Rebase 1.35

.ci-operator.yaml

@@ -1,4 +1,4 @@
 build_root_image:
   name: release
   namespace: openshift
-  tag: rhel-9-release-golang-1.24-openshift-4.21
+  tag: rhel-9-release-golang-1.25-openshift-4.22

images/tests/Dockerfile.rhel

@@ -1,11 +1,11 @@
-FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.24-openshift-4.21 AS builder
+FROM registry.ci.openshift.org/ocp/builder:rhel-9-golang-1.25-openshift-4.22 AS builder
 WORKDIR /go/src/github.com/openshift/origin
 COPY . .
 RUN make; \
     mkdir -p /tmp/build; \
     cp /go/src/github.com/openshift/origin/openshift-tests /tmp/build/openshift-tests
 
-FROM registry.ci.openshift.org/ocp/4.21:tools
+FROM registry.ci.openshift.org/ocp/4.22:tools
 COPY --from=builder /tmp/build/openshift-tests /usr/bin/
 
 RUN PACKAGES="git gzip util-linux" && \

pkg/e2eanalysis/e2e_analysis.go

@@ -25,6 +25,7 @@ import (
 	"k8s.io/apimachinery/pkg/runtime/schema"
 	"k8s.io/client-go/dynamic"
 	clientset "k8s.io/client-go/kubernetes"
+	"k8s.io/klog/v2"
 	e2e "k8s.io/kubernetes/test/e2e/framework"
 	e2enode "k8s.io/kubernetes/test/e2e/framework/node"
 )
@@ -590,7 +591,7 @@ func checkMachineNodeConsistency(clientset clientset.Interface, dc dynamic.Inter
 		message := fmt.Sprintf("Ready and Scheduable Nodes count (%d) is less than Running Machine count (%d): ", readyNodeCount, runningMachineCount)
 		message += "Ready and Scheduable Nodes:"
 		for _, node := range nodeList.Items {
-			if e2enode.IsNodeSchedulable(&node) {
+			if e2enode.IsNodeSchedulable(klog.TODO(), &node) {
 				message += fmt.Sprintf(" %s", node.Name)
 			}
 		}
@@ -636,7 +637,7 @@ func GetReadyNodeCountByLabel(nodeList *k8sv1.NodeList, labelSelector string) (i
 		// First, check if the node's labels match the selector.
 		if selector.Matches(labels.Set(node.Labels)) {
 			// If they match, then check if the node is schedulable.
-			if e2enode.IsNodeSchedulable(&node) {
+			if e2enode.IsNodeSchedulable(klog.TODO(), &node) {
 				readyNodeCount++
 			}
 		}
@@ -651,7 +652,7 @@ func getUnreadyOrUnschedulableNodeNames(allNodes *k8sv1.NodeList) []string {
 	for _, node := range allNodes.Items {
 		// IsNodeSchedulable checks if the node is ready AND schedulable.
 		// If it returns false, the node is one we're interested in.
-		if !e2enode.IsNodeSchedulable(&node) {
+		if !e2enode.IsNodeSchedulable(klog.TODO(), &node) {
 			badNodeNames = append(badNodeNames, node.Name)
 		}
 	}

test/extended/cli/basics.go

@@ -37,7 +37,7 @@ var _ = g.Describe("[sig-cli] oc basics", func() {
 	)
 
 	g.It("can create and interact with a list of resources", func() {
-		file, err := replaceImageInFile(mixedAPIVersionsFile, "openshift/hello-openshift", k8simage.GetE2EImage(k8simage.HttpdNew))
+		file, err := replaceImageInFile(mixedAPIVersionsFile, "openshift/hello-openshift", k8simage.GetE2EImage(k8simage.NginxNew))
 		o.Expect(err).NotTo(o.HaveOccurred())
 		defer os.Remove(file)
 

test/extended/util/compat_otp/container/docker_client.go

@@ -10,7 +10,6 @@ import (
 
 	e2e "k8s.io/kubernetes/test/e2e/framework"
 
-	"github.com/docker/docker/api/types"
 	"github.com/docker/docker/api/types/container"
 	"github.com/docker/docker/api/types/image"
 	"github.com/docker/docker/client"
@@ -205,7 +204,7 @@ func (c *DockerCLI) Exec(id string, cmd []string) (int, string, string, error) {
 	// prepare exec
 	cli := c.CLI
 	ctx := context.Background()
-	execConfig := types.ExecConfig{
+	execConfig := container.ExecOptions{
 		AttachStdout: true,
 		AttachStderr: true,
 		Cmd:          cmd,
@@ -217,7 +216,7 @@ func (c *DockerCLI) Exec(id string, cmd []string) (int, string, string, error) {
 	execID := cresp.ID
 
 	// run it, with stdout/stderr attached
-	aresp, err := cli.ContainerExecAttach(ctx, execID, types.ExecStartCheck{})
+	aresp, err := cli.ContainerExecAttach(ctx, execID, container.ExecAttachOptions{})
 	if err != nil {
 		return 1, "", "", err
 	}

test/extended/util/configv1shim.go

@@ -293,13 +293,6 @@ type ConfigV1ClientShim struct {
 	fakeConfigV1Client configv1.ConfigV1Interface
 }
 
-func (c *ConfigV1ClientShim) InsightsDataGathers() configv1.InsightsDataGatherInterface {
-	if c.v1Kinds["APIServer"] {
-		panic(fmt.Errorf("APIServer not implemented"))
-	}
-	return c.configv1.InsightsDataGathers()
-}
-
 func (c *ConfigV1ClientShim) APIServers() configv1.APIServerInterface {
 	if c.v1Kinds["APIServer"] {
 		panic(fmt.Errorf("APIServer not implemented"))

test/extended/util/image/image.go

@@ -50,9 +50,13 @@ 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.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,
+		"registry.k8s.io/e2e-test-images/agnhost:2.55":     1,
+		"registry.k8s.io/e2e-test-images/agnhost:2.59":     2,
+		"registry.k8s.io/e2e-test-images/busybox:1.37.0-1": 6,
+		"registry.k8s.io/e2e-test-images/nginx:1.15-4":     16,
+
+		// used by DRA tests
+		"registry.k8s.io/e2e-test-images/sample-device-plugin:1.7": -1,
 
 		// used by KubeVirt test to start fedora VMs
 		"quay.io/kubevirt/fedora-with-test-tooling-container-disk:20241024_891122a6fc": -1,
@@ -225,6 +229,9 @@ var Exceptions = sets.NewString(
 	// ie. application/vnd.docker.image.rootfs.diff.tar which are not accepted
 	// by quay.io, this has to be manually mirrored with --filter-by-os=linux.*
 	"registry.k8s.io/pause:3.10",
+	// These images are intentionally invalid or require authentication and cannot be mirrored
+	"invalid.registry.k8s.io/invalid",
+	"gcr.io/k8s-authenticated-test",
 )
 
 // GetMappedImages returns the images if they were mapped to the provided

test/extended/util/image/zz_generated.txt

@@ -30,6 +30,7 @@ registry.k8s.io/e2e-test-images/perl:5.26 quay.io/openshift/community-e2e-images
 registry.k8s.io/e2e-test-images/regression-issue-74839:1.4 quay.io/openshift/community-e2e-images:e2e-27-registry-k8s-io-e2e-test-images-regression-issue-74839-1-4-w33wZ0IzvovJdTDe
 registry.k8s.io/e2e-test-images/resource-consumer:1.13 quay.io/openshift/community-e2e-images:e2e-28-registry-k8s-io-e2e-test-images-resource-consumer-1-13-LT0C2W4wMzShSeGS
 registry.k8s.io/e2e-test-images/sample-apiserver:1.29.2 quay.io/openshift/community-e2e-images:e2e-3-registry-k8s-io-e2e-test-images-sample-apiserver-1-29-2-jfc3qrk0SlKStkiL
+registry.k8s.io/e2e-test-images/sample-device-plugin:1.7 quay.io/openshift/community-e2e-images:e2e-registry-k8s-io-e2e-test-images-sample-device-plugin-1-7-ULwza-sZKxhdAQs1
 registry.k8s.io/e2e-test-images/volume/iscsi:2.6 quay.io/openshift/community-e2e-images:e2e-30-registry-k8s-io-e2e-test-images-volume-iscsi-2-6-3sOdD3WkuEQhhISN
 registry.k8s.io/e2e-test-images/volume/nfs:1.4 quay.io/openshift/community-e2e-images:e2e-29-registry-k8s-io-e2e-test-images-volume-nfs-1-4-u7V8iW5QIcWM2i6h
 registry.k8s.io/etcd:3.6.4-0 quay.io/openshift/community-e2e-images:e2e-9-registry-k8s-io-etcd-3-6-4-0-78AUjqNstXrktuyr