diff --git a/assets/components/openshift-dns/dns/daemonset.yaml b/assets/components/openshift-dns/dns/daemonset.yaml
index 5faae9a3e8..5187b192aa 100644
--- a/assets/components/openshift-dns/dns/daemonset.yaml
+++ b/assets/components/openshift-dns/dns/daemonset.yaml
@@ -1,5 +1,6 @@
 kind: DaemonSet
 apiVersion: apps/v1
+# name, namespace and labels are set at runtime
 spec:
   # minReadySeconds should be 3x the readiness probe's polling interval (i.e. periodSeconds).
   minReadySeconds: 9
@@ -7,114 +8,87 @@ spec:
     metadata:
       annotations:
         target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
-      labels:
-        dns.operator.openshift.io/daemonset-dns: default
     spec:
       serviceAccountName: dns
       priorityClassName: system-node-critical
       containers:
-        - name: dns
-          imagePullPolicy: IfNotPresent
-          terminationMessagePolicy: FallbackToLogsOnError
-          command: ["coredns"]
-          args: ["-conf", "/etc/coredns/Corefile"]
-          volumeMounts:
-            - name: config-volume
-              mountPath: /etc/coredns
-              readOnly: true
-            - mountPath: /tmp
-              name: tmp-dir
-            {{- if .HostsEnabled }}
-            - mountPath: /tmp/hosts
-              name: hosts
-              readOnly: true
-            {{- end }}
-          ports:
-            - containerPort: 5353
-              name: dns
-              protocol: UDP
-            - containerPort: 5353
-              name: dns-tcp
-              protocol: TCP
-          readinessProbe:
-            httpGet:
-              path: /ready
-              port: 8181
-              scheme: HTTP
-            initialDelaySeconds: 10
-            periodSeconds: 3 # Update the daemonset's spec.minReadySeconds above if you change this value!
-            successThreshold: 1
-            failureThreshold: 3
-            timeoutSeconds: 3
-          livenessProbe:
-            httpGet:
-              path: /health
-              port: 8080
-              scheme: HTTP
-            initialDelaySeconds: 60
-            timeoutSeconds: 5
-            successThreshold: 1
-            failureThreshold: 5
-          resources:
-            requests:
-              cpu: 50m
-              memory: 70Mi
-          securityContext:
-            readOnlyRootFilesystem: true
-          image: '{{ .ReleaseImage.coredns }}'
-        - name: kube-rbac-proxy
-          ports:
-            - containerPort: 9154
-              name: metrics
-          resources:
-            requests:
-              cpu: 10m
-              memory: 40Mi
-          terminationMessagePolicy: FallbackToLogsOnError
-          volumeMounts:
-            - mountPath: /etc/tls/private
-              name: metrics-tls
-              readOnly: true
-            - mountPath: /tmp
-              name: tmp-dir
-          securityContext:
-            readOnlyRootFilesystem: true
-          image: '{{ .ReleaseImage.kube_rbac_proxy }}'
-          args:
-            - --secure-listen-address=:9154
-            - --tls-cipher-suites={{ .TLSCipherSuites }}
-            - --tls-min-version={{ .TLSMinVersion }}
-            - --upstream=http://127.0.0.1:9153/
-            - --tls-cert-file=/etc/tls/private/tls.crt
-            - --tls-private-key-file=/etc/tls/private/tls.key
-          imagePullPolicy: IfNotPresent
+      - name: dns
+        # image is set at runtime
+        imagePullPolicy: IfNotPresent
+        terminationMessagePolicy: FallbackToLogsOnError
+        command: [ "coredns" ]
+        args: [ "-conf", "/etc/coredns/Corefile" ]
+        volumeMounts:
+        - name: config-volume
+          mountPath: /etc/coredns
+          readOnly: true
+        - mountPath: /tmp
+          name: tmp-dir
+        ports:
+        - containerPort: 5353
+          name: dns
+          protocol: UDP
+        - containerPort: 5353
+          name: dns-tcp
+          protocol: TCP
+        readinessProbe:
+          httpGet:
+            path: /ready
+            port: 8181
+            scheme: HTTP
+          initialDelaySeconds: 10
+          periodSeconds: 3 # Update the daemonset's spec.minReadySeconds above if you change this value!
+          successThreshold: 1
+          failureThreshold: 3
+          timeoutSeconds: 3
+        livenessProbe:
+          httpGet:
+            path: /health
+            port: 8080
+            scheme: HTTP
+          initialDelaySeconds: 60
+          timeoutSeconds: 5
+          successThreshold: 1
+          failureThreshold: 5
+        resources:
+          requests:
+            cpu: 50m
+            memory: 70Mi
+        securityContext:
+          readOnlyRootFilesystem: true
+      - name: kube-rbac-proxy
+        # image and args are set at runtime by the operator based on the
+        # centralized TLS security profile from apiservers.config.openshift.io/cluster
+        ports:
+        - containerPort: 9154
+          name: metrics
+        resources:
+          requests:
+            cpu: 10m
+            memory: 40Mi
+        terminationMessagePolicy: FallbackToLogsOnError
+        volumeMounts:
+        - mountPath: /etc/tls/private
+          name: metrics-tls
+          readOnly: true
+        - mountPath: /tmp
+          name: tmp-dir
+        securityContext:
+          readOnlyRootFilesystem: true
       dnsPolicy: Default
+      # nodeSelector is set at runtime.
       volumes:
-        - name: config-volume
-          configMap:
-            items:
-              - key: Corefile
-                path: Corefile
-            name: dns-default
-        - name: metrics-tls
-          secret:
-            defaultMode: 420
-            secretName: dns-default-metrics-tls
-        {{- if .HostsEnabled }}
-        - name: hosts
-          configMap:
-            name: hosts-file
-            items:
-              - key: hosts
-                path: hosts
-        {{- end }}
-        - name: tmp-dir
-          emptyDir: {}
-      nodeSelector:
-        kubernetes.io/os: linux
-      tolerations:
-        - key: node-role.kubernetes.io/master
-          operator: Exists
+      - name: config-volume
+        configMap:
+        # Name is set at runtime
+          items:
+          - key: Corefile
+            path: Corefile
+      - name: metrics-tls
+        # secretName is set at runtime
+      - name: tmp-dir
+        emptyDir: {}
+      # tolerations is set at runtime.
   updateStrategy:
     type: RollingUpdate
     rollingUpdate:
@@ -126,11 +100,3 @@ spec:
       maxSurge: 10%
       # maxUnavailable must be zero when maxSurge is nonzero.
       maxUnavailable: 0
-  selector:
-    matchLabels:
-      dns.operator.openshift.io/daemonset-dns: default
-metadata:
-  name: dns-default
-  namespace: openshift-dns
-  labels:
-    dns.operator.openshift.io/owning-dns: default
diff --git a/assets/components/openshift-dns/dns/hosts-configmap-role.yaml b/assets/components/openshift-dns/dns/hosts-configmap-role.yaml
deleted file mode 100644
index e23d64663a..0000000000
--- a/assets/components/openshift-dns/dns/hosts-configmap-role.yaml
+++ /dev/null
@@ -1,16 +0,0 @@
-kind: Role
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: hosts-configmap-reader
-  namespace: openshift-dns
-rules:
-- apiGroups:
-  - ""
-  resources:
-  - configmaps
-  resourceNames:
-  - hosts-file
-  verbs:
-  - get
-  - list
-  - watch
diff --git a/assets/components/openshift-dns/dns/hosts-configmap-rolebinding.yaml b/assets/components/openshift-dns/dns/hosts-configmap-rolebinding.yaml
deleted file mode 100644
index e5acd3916e..0000000000
--- a/assets/components/openshift-dns/dns/hosts-configmap-rolebinding.yaml
+++ /dev/null
@@ -1,13 +0,0 @@
-kind: RoleBinding
-apiVersion: rbac.authorization.k8s.io/v1
-metadata:
-  name: hosts-configmap-reader
-  namespace: openshift-dns
-subjects:
-- kind: ServiceAccount
-  name: dns
-  namespace: openshift-dns
-roleRef:
-  kind: Role
-  name: hosts-configmap-reader
-  apiGroup: rbac.authorization.k8s.io
diff --git a/assets/components/openshift-dns/dns/service.yaml b/assets/components/openshift-dns/dns/service.yaml
index a53188dcc6..6e3cd2ec8d 100644
--- a/assets/components/openshift-dns/dns/service.yaml
+++ b/assets/components/openshift-dns/dns/service.yaml
@@ -1,25 +1,20 @@
 kind: Service
 apiVersion: v1
+# name, namespace,labels and annotations are set at runtime
 spec:
+  # clusterIP will be automatically managed.
+  # selector is set at runtime
   trafficDistribution: PreferSameNode
   ports:
-    - name: dns
-      port: 53
-      targetPort: dns
-      protocol: UDP
-    - name: dns-tcp
-      port: 53
-      targetPort: dns-tcp
-      protocol: TCP
-    - name: metrics
-      port: 9154
-      targetPort: metrics
-      protocol: TCP
-  clusterIP: '{{.ClusterIP}}'
-  selector:
-    dns.operator.openshift.io/daemonset-dns: default
-metadata:
-  annotations:
-    service.beta.openshift.io/serving-cert-secret-name: dns-default-metrics-tls
-  name: dns-default
-  namespace: openshift-dns
+  - name: dns
+    port: 53
+    targetPort: dns
+    protocol: UDP
+  - name: dns-tcp
+    port: 53
+    targetPort: dns-tcp
+    protocol: TCP
+  - name: metrics
+    port: 9154
+    targetPort: metrics
+    protocol: TCP
diff --git a/assets/components/openshift-dns/node-resolver/daemonset.yaml b/assets/components/openshift-dns/node-resolver/daemonset.yaml
deleted file mode 100644
index 04e7548730..0000000000
--- a/assets/components/openshift-dns/node-resolver/daemonset.yaml
+++ /dev/null
@@ -1,140 +0,0 @@
-apiVersion: apps/v1
-kind: DaemonSet
-metadata:
-  name: node-resolver
-  namespace: openshift-dns
-spec:
-  revisionHistoryLimit: 10
-  selector:
-    matchLabels:
-      dns.operator.openshift.io/daemonset-node-resolver: ""
-  template:
-    metadata:
-      annotations:
-        target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
-      labels:
-        dns.operator.openshift.io/daemonset-node-resolver: ""
-    spec:
-      containers:
-      - command:
-        - /bin/bash
-        - -c
-        - |
-          #!/bin/bash
-          set -uo pipefail
-
-          trap 'jobs -p | xargs kill || true; wait; exit 0' TERM
-
-          NAMESERVER=${DNS_DEFAULT_SERVICE_HOST}
-          OPENSHIFT_MARKER="openshift-generated-node-resolver"
-          HOSTS_FILE="/etc/hosts"
-          TEMP_FILE="/tmp/hosts.tmp"
-
-          IFS=', ' read -r -a services <<< "${SERVICES}"
-
-          # Make a temporary file with the old hosts file's attributes.
-          if ! cp -f --attributes-only "${HOSTS_FILE}" "${TEMP_FILE}"; then
-            echo "Failed to preserve hosts file. Exiting."
-            exit 1
-          fi
-
-          while true; do
-            declare -A svc_ips
-            for svc in "${services[@]}"; do
-              # Fetch service IP from cluster dns if present. We make several tries
-              # to do it: IPv4, IPv6, IPv4 over TCP and IPv6 over TCP. The two last ones
-              # are for deployments with Kuryr on older OpenStack (OSP13) - those do not
-              # support UDP loadbalancers and require reaching DNS through TCP.
-              cmds=('dig -t A @"${NAMESERVER}" +short "${svc}.${CLUSTER_DOMAIN}"|grep -v "^;"'
-                    'dig -t AAAA @"${NAMESERVER}" +short "${svc}.${CLUSTER_DOMAIN}"|grep -v "^;"'
-                    'dig -t A +tcp +retry=0 @"${NAMESERVER}" +short "${svc}.${CLUSTER_DOMAIN}"|grep -v "^;"'
-                    'dig -t AAAA +tcp +retry=0 @"${NAMESERVER}" +short "${svc}.${CLUSTER_DOMAIN}"|grep -v "^;"')
-              for i in ${!cmds[*]}
-              do
-                ips=($(eval "${cmds[i]}"))
-                if [[ "$?" -eq 0 && "${#ips[@]}" -ne 0 ]]; then
-                  svc_ips["${svc}"]="${ips[@]}"
-                  break
-                fi
-              done
-            done
-
-            # Update /etc/hosts only if we get valid service IPs
-            # We will not update /etc/hosts when there is coredns service outage or api unavailability
-            # Stale entries could exist in /etc/hosts if the service is deleted
-            if [[ -n "${svc_ips[*]-}" ]]; then
-              # Build a new hosts file from /etc/hosts with our custom entries filtered out
-              if ! sed --silent "/# ${OPENSHIFT_MARKER}/d; w ${TEMP_FILE}" "${HOSTS_FILE}"; then
-                # Only continue rebuilding the hosts entries if its original content is preserved
-                sleep 60 & wait
-                continue
-              fi
-
-              # Append resolver entries for services
-              rc=0
-              for svc in "${!svc_ips[@]}"; do
-                for ip in ${svc_ips[${svc}]}; do
-                  echo "${ip} ${svc} ${svc}.${CLUSTER_DOMAIN} # ${OPENSHIFT_MARKER}" >> "${TEMP_FILE}" || rc=$?
-                done
-              done
-              if [[ $rc -ne 0 ]]; then
-                sleep 60 & wait
-                continue
-              fi
-
-
-              # TODO: Update /etc/hosts atomically to avoid any inconsistent behavior
-              # Replace /etc/hosts with our modified version if needed
-              cmp "${TEMP_FILE}" "${HOSTS_FILE}" || cp -f "${TEMP_FILE}" "${HOSTS_FILE}"
-              # TEMP_FILE is not removed to avoid file create/delete and attributes copy churn
-            fi
-            sleep 60 & wait
-            unset svc_ips
-          done
-        env:
-        - name: SERVICES
-          # Comma or space separated list of services
-          # NOTE: For now, ensure these are relative names; for each relative name,
-          # an alias with the CLUSTER_DOMAIN suffix will also be added.
-          value: "image-registry.openshift-image-registry.svc"
-        - name: NAMESERVER
-          value: 172.30.0.10
-        - name: CLUSTER_DOMAIN
-          value: cluster.local
-        image: {{ .ReleaseImage.cli }}
-        imagePullPolicy: IfNotPresent
-        name: dns-node-resolver
-        resources:
-          requests:
-            cpu: 5m
-            memory: 21Mi
-        securityContext:
-          privileged: true
-        terminationMessagePath: /dev/termination-log
-        terminationMessagePolicy: FallbackToLogsOnError
-        volumeMounts:
-        - mountPath: /etc/hosts
-          name: hosts-file
-      dnsPolicy: ClusterFirst
-      hostNetwork: true
-      nodeSelector:
-        kubernetes.io/os: linux
-      priorityClassName: system-node-critical
-      restartPolicy: Always
-      schedulerName: default-scheduler
-      securityContext: {}
-      serviceAccount: node-resolver
-      serviceAccountName: node-resolver
-      terminationGracePeriodSeconds: 30
-      tolerations:
-      - operator: Exists
-      volumes:
-      - hostPath:
-          path: /etc/hosts
-          type: File
-        name: hosts-file
-  updateStrategy:
-    rollingUpdate:
-      maxSurge: 0
-      maxUnavailable: 33%
-    type: RollingUpdate
diff --git a/assets/components/openshift-router/deployment.yaml b/assets/components/openshift-router/deployment.yaml
index af1f48f67f..dbcf6b2d6c 100644
--- a/assets/components/openshift-router/deployment.yaml
+++ b/assets/components/openshift-router/deployment.yaml
@@ -1,156 +1,35 @@
 # Deployment with default values
+# Ingress Controller specific values are applied at runtime.
 kind: Deployment
 apiVersion: apps/v1
+# name and namespace are set at runtime.
 spec:
   progressDeadlineSeconds: 600
   template:
     metadata:
       annotations:
         target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
-        openshift.io/required-scc: restricted
-      labels:
-        ingresscontroller.operator.openshift.io/deployment-ingresscontroller: default
     spec:
       serviceAccountName: router
+      # nodeSelector is set at runtime.
       priorityClassName: system-cluster-critical
       containers:
         - name: router
+          # image is set at runtime.
           imagePullPolicy: IfNotPresent
           securityContext:
             # See https://bugzilla.redhat.com/2007246
             allowPrivilegeEscalation: true
             readOnlyRootFilesystem: false
           terminationMessagePolicy: FallbackToLogsOnError
+          # Merged at runtime.
           env:
-            - name: ROUTER_SERVICE_NAMESPACE
-              value: openshift-ingress
-            - name: DEFAULT_CERTIFICATE_DIR
-              value: /etc/pki/tls/private
-            - name: DEFAULT_DESTINATION_CA_PATH
-              value: /var/run/configmaps/service-ca/service-ca.crt
-            - name: STATS_PORT
-              value: "1936"
-            - name: RELOAD_INTERVAL
-              value: 5s
-            - name: ROUTER_ALLOW_WILDCARD_ROUTES
-              value: '{{ .RouterAllowWildcardRoutes }}'
-            - name: ROUTER_CANONICAL_HOSTNAME
-              value: router-default.apps.{{ .BaseDomain }}
-            - name: ROUTER_CIPHERS
-              value: '{{ .RouterCiphers }}'
-            - name: ROUTER_CIPHERSUITES
-              value: '{{ .RouterCiphersSuites }}'
-            - name: ROUTER_DISABLE_HTTP2
-              value: '{{ .RouterDisableHttp2 }}'
-            - name: ROUTER_DISABLE_NAMESPACE_OWNERSHIP_CHECK
-              value: '{{.RouterNamespaceOwnership}}'
-            - name: ROUTER_LOAD_BALANCE_ALGORITHM
-              value: random
-            - name: ROUTER_METRICS_TYPE
-              value: haproxy
-            - name: ROUTER_SERVICE_NAME
-              value: default
-            - name: ROUTER_SET_FORWARDED_HEADERS
-              value: '{{ .ForwardedHeaderPolicy }}'
-            - name: ROUTER_TCP_BALANCE_SCHEME
-              value: source
-            - name: ROUTER_THREADS
-              value: '{{ .ThreadCount }}'
-            - name: SSL_MIN_VERSION
-              value: '{{ .RouterSSLMinVersion }}'
-            - name: ROUTER_USE_PROXY_PROTOCOL
-              value: "false"
-            - name: GRACEFUL_SHUTDOWN_DELAY
-              value: 1s
-            - name: ROUTER_DOMAIN
-              value: apps.{{ .BaseDomain }}
-            - name: ROUTER_IP_V4_V6_MODE
-              value: '{{ .RouterMode }}'
-            - name: ROUTER_BUF_SIZE
-              value: '{{ .RouterBufSize }}'
-            - name: ROUTER_MAX_REWRITE_SIZE
-              value: '{{ .HeaderBufferMaxRewriteBytes }}'
-            - name: ROUTER_BACKEND_CHECK_INTERVAL
-              value: '{{ .HealthCheckInterval }}'
-            - name: ROUTER_DEFAULT_CLIENT_TIMEOUT
-              value: '{{ .ClientTimeout }}'
-            - name: ROUTER_CLIENT_FIN_TIMEOUT
-              value: '{{ .ClientFinTimeout }}'
-            - name: ROUTER_DEFAULT_SERVER_TIMEOUT
-              value: '{{ .ServerTimeout }}'
-            - name: ROUTER_DEFAULT_SERVER_FIN_TIMEOUT
-              value: '{{ .ServerFinTimeout }}'
-            - name: ROUTER_DEFAULT_TUNNEL_TIMEOUT
-              value: '{{ .TunnelTimeout }}'
-            - name: ROUTER_INSPECT_DELAY
-              value: '{{ .TlsInspectDelay }}'
-            - name: ROUTER_MAX_CONNECTIONS
-              value: '{{ .MaxConnections }}'
-            - name: ROUTER_DONT_LOG_NULL
-              value: '{{ .LogEmptyRequests }}'
-            - name: ROUTER_HTTP_IGNORE_PROBES
-              value: '{{ .HTTPEmptyRequestsPolicy }}'
-            - name: ROUTER_ENABLE_COMPRESSION
-              value: '{{ .RouterEnableCompression }}'
-            - name: ROUTER_COMPRESSION_MIME
-              value: '{{ .RouterCompressionMime }}'
-            - name: ROUTER_ENABLE_EXTERNAL_CERTIFICATE
-              value: "true"
-            {{- if .ClientAuthCAPath }}
-            - name: ROUTER_MUTUAL_TLS_AUTH
-              value: '{{ .ClientAuthPolicy }}'
-            - name: ROUTER_MUTUAL_TLS_AUTH_CA
-              value: '{{ .ClientAuthCAPath }}'
-            - name: ROUTER_MUTUAL_TLS_AUTH_FILTER
-              value: '{{ .ClientAuthFilter }}'
-            {{- end }}
-            {{- if .AccessLoggingEnabled }}
-            - name: ROUTER_SYSLOG_ADDRESS
-            {{- if .AccessLoggingSyslogAddress }}
-              value: '{{ .AccessLoggingSyslogAddress }}'
-            {{- else }}
-              value: /var/lib/rsyslog/rsyslog.sock
-            {{- /* AccessLoggingSyslogAddress*/}}
-            {{- end }}
-            - name: ROUTER_LOG_LEVEL
-              value: info
-            {{- if .AccessLoggingMaxLength}}
-            - name: ROUTER_LOG_MAX_LENGTH
-              value: '{{ .AccessLoggingMaxLength }}'
-            {{- /* AccessLoggingMaxLength */}}
-            {{- end }}
-            {{- if .AccessLoggingSyslogFacility }}
-            - name: ROUTER_LOG_FACILITY
-              value: {{ .AccessLoggingSyslogFacility }}
-            {{- end }}
-            {{- if .HttpLogFormat }}
-            - name: ROUTER_SYSLOG_FORMAT
-              value: '"{{ .HttpLogFormat }}"'
-            {{- /* HttpLogFormat */}}
-            {{- end }}
-            {{- if .HttpCaptureHeadersRequest }}
-            - name: ROUTER_CAPTURE_HTTP_REQUEST_HEADERS
-              value: '{{ .HttpCaptureHeadersRequest }}'
-            {{- /* HttpCaptureHeadersRequest */}}
-            {{- end }}
-            {{- if .HttpCaptureHeadersResponse }}
-            - name: ROUTER_CAPTURE_HTTP_RESPONSE_HEADERS
-              value: '{{ .HttpCaptureHeadersResponse }}'
-            {{- /* HttpCaptureHeadersResponse */}}
-            {{- end }}
-            {{- if .HttpCaptureCookies }}
-            - name: ROUTER_CAPTURE_HTTP_COOKIE
-              value: '{{ .HttpCaptureCookies }}'
-            {{- /* HttpCaptureCookies */}}
-            {{- end }}
-            {{- /* AccessLoggingEnabled */}}
-            {{- end }}
-            {{- if .HttpErrorCodePages }}
-            - name: ROUTER_ERRORFILE_503
-              value: /var/lib/haproxy/errorfiles/error-page-503.http
-            - name: ROUTER_ERRORFILE_404
-              value: /var/lib/haproxy/errorfiles/error-page-404.http
-            {{- end }}
+          - name: ROUTER_SERVICE_NAMESPACE
+            value: openshift-ingress
+          - name: DEFAULT_CERTIFICATE_DIR
+            value: /etc/pki/tls/private
+          - name: DEFAULT_DESTINATION_CA_PATH
+            value: /var/run/configmaps/service-ca/service-ca.crt
           livenessProbe:
             failureThreshold: 3
             httpGet:
@@ -184,124 +63,30 @@ spec:
               cpu: 100m
               memory: 256Mi
           volumeMounts:
-            - mountPath: /etc/pki/tls/private
-              name: default-certificate
-              readOnly: true
-            - mountPath: /var/run/configmaps/service-ca
-              name: service-ca-bundle
-              readOnly: true
-            {{- if .ClientCAMapName }}
-            - mountPath: '{{ .ClientCAMountPath }}'
-              name: '{{ .ClientCAMapName}}'
-              readOnly: true
-            {{- end }}
-            {{- if .HttpErrorCodePages }}
-            - mountPath: /var/lib/haproxy/errorfiles
-              name: error-code-pages
-              readOnly: true
-            {{- end }}
-            {{- if and .AccessLoggingEnabled (not .AccessLoggingSyslogAddress) }}
-            - mountPath: /var/lib/rsyslog
-              name: rsyslog-socket
-              readOnly: false
-            {{- end }}
-          image: '{{ .ReleaseImage.haproxy_router }}'
-          ports:
-            - name: http
-              containerPort: 80
-              protocol: TCP
-            - name: https
-              containerPort: 443
-              protocol: TCP
-            - name: metrics
-              containerPort: 1936
-              protocol: TCP
-          args:
-            - -v=4
-        {{- if and .AccessLoggingEnabled (not .AccessLoggingSyslogAddress) }}
-        - name: logs
-          imagePullPolicy: IfNotPresent
-          terminationMessagePolicy: FallbackToLogsOnError
-          image: '{{ .ReleaseImage.haproxy_router }}'
-          imagePullPolicy: IfNotPresent
-          command:
-            - /sbin/rsyslogd
-            - -n
-            - -i
-            - /tmp/rsyslogd.pid
-            - -f
-            - /etc/rsyslog/rsyslog.conf
-          resources:
-            requests:
-              cpu: 50m
-              memory: 128Mi
-          volumeMounts:
-            - mountPath: /var/lib/rsyslog
-              name: rsyslog-socket
-            - mountPath: /etc/rsyslog
-              name: rsyslog-config
-        {{- end}}
+          - mountPath: /etc/pki/tls/private
+            name: default-certificate
+            readOnly: true
+          - mountPath: /var/run/configmaps/service-ca
+            name: service-ca-bundle
+            readOnly: true
       tolerations:
-        # Ensure the pod isn't deleted during serial NoExecuteTaintManager tests.
-        # Remember that NoExecute uses Delete, not Evict, because removing the pod
-        # is non-optional.  This means that PDBs are not honored.
-        - key: "kubernetes.io/e2e-evict-taint-key"
-          operator: "Equal"
-          value: "evictTaintVal"
-          effect: "NoExecute"
+      # Ensure the pod isn't deleted during serial NoExecuteTaintManager tests.
+      # Remember that NoExecute uses Delete, not Evict, because removing the pod
+      # is non-optional.  This means that PDBs are not honored.
+      - key: "kubernetes.io/e2e-evict-taint-key"
+        operator: "Equal"
+        value: "evictTaintVal"
+        effect: "NoExecute"
       volumes:
-        - name: default-certificate
-          secret:
-            defaultMode: 420
-            secretName: '{{ .ServingCertificateSecret }}'
-        - name: service-ca-bundle
-          configMap:
-            defaultMode: 420
-            items:
-              - key: service-ca.crt
-                path: service-ca.crt
-            name: service-ca-bundle
-            optional: false
-        {{- if .ClientCAMapName }}
-        - name: '{{ .ClientCAMapName }}'
-          configMap:
-            defaultMode: 420
-            items:
-            - key: '{{ .ClientCABundleFilename }}'
-              path: '{{ .ClientCABundleFilename }}'
-            name: '{{ .ClientCAMapName }}'
-            optional: false
-        {{- end }}
-        {{- if .HttpErrorCodePages }}
-        - name: error-code-pages
-          configMap:
-            name: {{ .HttpErrorCodePages }}
-        {{- end }}
-        {{- if and .AccessLoggingEnabled (not .AccessLoggingSyslogAddress) }}
-        - name: rsyslog-socket
-          emptyDir: {}
-        - name: rsyslog-config
-          configMap:
-            name: access-logs-rsyslog-config
-            optional: false
-        {{- end }}
-      restartPolicy: Always
-      dnsPolicy: ClusterFirst
-      nodeSelector:
-        kubernetes.io/os: linux
-        node-role.kubernetes.io/worker: ""
-      serviceAccount: router
-      securityContext: {}
-      schedulerName: default-scheduler
-  minReadySeconds: 30
-  selector:
-    matchLabels:
-      ingresscontroller.operator.openshift.io/deployment-ingresscontroller: default
-  replicas: 1
-  strategy:
-    type: Recreate
-metadata:
-  name: router-default
-  namespace: openshift-ingress
-  labels:
-    ingresscontroller.operator.openshift.io/owning-ingresscontroller: default
+      - name: default-certificate
+        secret:
+          defaultMode: 420
+          # SecretName is set at run-time.
+      - name: service-ca-bundle
+        configMap:
+          defaultMode: 420
+          items:
+          - key: service-ca.crt
+            path: service-ca.crt
+          name: service-ca-bundle
+          optional: false
diff --git a/assets/components/openshift-router/ingress-class.yaml b/assets/components/openshift-router/ingress-class.yaml
deleted file mode 100644
index 5485dc8f98..0000000000
--- a/assets/components/openshift-router/ingress-class.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-apiVersion: networking.k8s.io/v1
-kind: IngressClass
-metadata:
-  name: openshift-ingress
-spec:
-  controller: openshift.io/ingress-to-route
diff --git a/assets/components/openshift-router/service-cloud.yaml b/assets/components/openshift-router/service-cloud.yaml
index 305993fb02..9f5a072b7f 100644
--- a/assets/components/openshift-router/service-cloud.yaml
+++ b/assets/components/openshift-router/service-cloud.yaml
@@ -7,24 +7,21 @@ metadata:
   namespace: openshift-ingress
   labels:
     app: router
-    ingresscontroller.operator.openshift.io/owning-ingresscontroller: default
-  name: router-default
 spec:
   type: LoadBalancer
   selector:
-    ingresscontroller.operator.openshift.io/deployment-ingresscontroller: default
+    app: router
   # This also has the effect of marking LB pool targets as unhealthy when no
   # router pods are present on a node behind the service.
   externalTrafficPolicy: Local
   internalTrafficPolicy: Cluster
   ports:
-    - name: http
-      protocol: TCP
-      port: {{ .RouterHttpPort }}
-      targetPort: http
-    - name: https
-      protocol: TCP
-      port: {{ .RouterHttpsPort }}
-      targetPort: https
+  - name: http
+    protocol: TCP
+    port: 80
+    targetPort: http
+  - name: https
+    protocol: TCP
+    port: 443
+    targetPort: https
   sessionAffinity: None
-  ipFamilyPolicy: '{{.IPFamily}}'
diff --git a/assets/components/openshift-router/service-internal.yaml b/assets/components/openshift-router/service-internal.yaml
index 5183fe49b8..126f6ba273 100644
--- a/assets/components/openshift-router/service-internal.yaml
+++ b/assets/components/openshift-router/service-internal.yaml
@@ -2,28 +2,21 @@
 # Ingress Controller specific annotations are applied at runtime.
 kind: Service
 apiVersion: v1
+# name, namespace and annotations are set at runtime.
 spec:
   type: ClusterIP
   internalTrafficPolicy: Cluster
   ports:
-    - name: http
-      port: 80
-      protocol: TCP
-      targetPort: http
-    - name: https
-      port: 443
-      protocol: TCP
-      targetPort: https
-    - name: metrics
-      port: 1936
-      protocol: TCP
-      targetPort: metrics
+  - name: http
+    port: 80
+    protocol: TCP
+    targetPort: http
+  - name: https
+    port: 443
+    protocol: TCP
+    targetPort: https
+  - name: metrics
+    port: 1936
+    protocol: TCP
+    targetPort: metrics
   sessionAffinity: None
-  selector:
-    ingresscontroller.operator.openshift.io/deployment-ingresscontroller: default
-  ipFamilyPolicy: '{{.IPFamily}}'
-metadata:
-  labels:
-    ingresscontroller.operator.openshift.io/owning-ingresscontroller: default
-  name: router-internal-default
-  namespace: openshift-ingress
diff --git a/assets/components/service-ca/clusterrole.yaml b/assets/components/service-ca/clusterrole.yaml
deleted file mode 100644
index 4ef03dc5cf..0000000000
--- a/assets/components/service-ca/clusterrole.yaml
+++ /dev/null
@@ -1,80 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRole
-metadata:
-  name: system:openshift:controller:service-ca
-rules:
-- apiGroups:
-  - ""
-  resources:
-  - secrets
-  verbs:
-  - get
-  - list
-  - watch
-  - create
-  - update
-  - patch
-- apiGroups:
-  - ""
-  resources:
-  - services
-  verbs:
-  - get
-  - list
-  - watch
-  - update
-  - patch
-- apiGroups:
-  - admissionregistration.k8s.io
-  resources:
-  - mutatingwebhookconfigurations
-  - validatingwebhookconfigurations
-  verbs:
-  - get
-  - list
-  - watch
-  - update
-- apiGroups:
-  - apiextensions.k8s.io
-  resources:
-  - customresourcedefinitions
-  verbs:
-  - get
-  - list
-  - watch
-  - update
-- apiGroups:
-  - apiregistration.k8s.io
-  resources:
-  - apiservices
-  verbs:
-  - get
-  - list
-  - watch
-  - update
-  - patch
-- apiGroups:
-  - ""
-  resources:
-  - configmaps
-  verbs:
-  - get
-  - list
-  - watch
-  - update
-- apiGroups:
-  - config.openshift.io
-  resources:
-  - infrastructures
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - config.openshift.io
-  resources:
-  - clusterversions
-  verbs:
-  - get
-  - list
-  - watch
diff --git a/assets/components/service-ca/clusterrolebinding.yaml b/assets/components/service-ca/clusterrolebinding.yaml
deleted file mode 100644
index 33f1431cc2..0000000000
--- a/assets/components/service-ca/clusterrolebinding.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: ClusterRoleBinding
-metadata:
-  name: system:openshift:controller:service-ca
-roleRef:
-  kind: ClusterRole
-  name: system:openshift:controller:service-ca
-subjects:
-- kind: ServiceAccount
-  namespace: openshift-service-ca
-  name: service-ca
diff --git a/assets/components/service-ca/deployment.yaml b/assets/components/service-ca/deployment.yaml
deleted file mode 100644
index fc27a300fb..0000000000
--- a/assets/components/service-ca/deployment.yaml
+++ /dev/null
@@ -1,70 +0,0 @@
-apiVersion: apps/v1
-kind: Deployment
-metadata:
-  namespace: openshift-service-ca
-  name: service-ca
-  labels:
-    app: service-ca
-    service-ca: "true"
-spec:
-  strategy:
-    type: Recreate
-  selector:
-    matchLabels:
-      app: service-ca
-      service-ca: "true"
-  template:
-    metadata:
-      name: service-ca
-      annotations:
-        target.workload.openshift.io/management: '{"effect": "PreferredDuringScheduling"}'
-        openshift.io/required-scc: restricted-v2
-      labels:
-        app: service-ca
-        service-ca: "true"
-    spec:
-      serviceAccountName: service-ca
-      containers:
-        - name: service-ca-controller
-          image: '{{ .ReleaseImage.service_ca_operator }}'
-          imagePullPolicy: IfNotPresent
-          command: ["service-ca-operator", "controller"]
-          ports:
-            - containerPort: 8443
-          securityContext:
-            runAsNonRoot: true
-          resources:
-            requests:
-              memory: 120Mi
-              cpu: 10m
-          terminationMessagePolicy: FallbackToLogsOnError
-          volumeMounts:
-            - mountPath: /var/run/secrets/signing-key
-              name: signing-key
-            - mountPath: /var/run/configmaps/signing-cabundle
-              name: signing-cabundle
-          args:
-            - -v=2
-      volumes:
-        - name: signing-key
-          secret:
-            secretName: '{{.TLSSecret}}'
-        - name: signing-cabundle
-          configMap:
-            name: '{{.CAConfigMap}}'
-      nodeSelector:
-        node-role.kubernetes.io/master: ""
-      priorityClassName: "system-cluster-critical"
-      tolerations:
-        - key: node-role.kubernetes.io/master
-          operator: Exists
-          effect: "NoSchedule"
-        - key: "node.kubernetes.io/unreachable"
-          operator: "Exists"
-          effect: "NoExecute"
-          tolerationSeconds: 120
-        - key: "node.kubernetes.io/not-ready"
-          operator: "Exists"
-          effect: "NoExecute"
-          tolerationSeconds: 120
-  replicas: 1
diff --git a/assets/components/service-ca/ns.yaml b/assets/components/service-ca/ns.yaml
deleted file mode 100644
index 5826956115..0000000000
--- a/assets/components/service-ca/ns.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-apiVersion: v1
-kind: Namespace
-metadata:
-  name: openshift-service-ca
-  annotations:
-    openshift.io/node-selector: ""
-    workload.openshift.io/allowed: "management"
diff --git a/assets/components/service-ca/role.yaml b/assets/components/service-ca/role.yaml
deleted file mode 100644
index 202a208d84..0000000000
--- a/assets/components/service-ca/role.yaml
+++ /dev/null
@@ -1,55 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: Role
-metadata:
-  name: system:openshift:controller:service-ca
-  namespace: openshift-service-ca
-rules:
-- apiGroups:
-  - security.openshift.io
-  resources:
-  - securitycontextconstraints
-  resourceNames:
-  - restricted
-  verbs:
-  - use
-- apiGroups:
-  - ""
-  resources:
-  - events
-  verbs:
-  - create
-- apiGroups:
-  - coordination.k8s.io
-  resources:
-  - leases
-  verbs:
-  - get
-  - update
-  - create
-- apiGroups:
-  - ""
-  resources:
-  - configmaps
-  verbs:
-  - get
-  - list
-  - watch
-  - update
-  - create
-- apiGroups:
-  - ""
-  resources:
-  - pods
-  verbs:
-  - get
-  - list
-  - watch
-- apiGroups:
-  - "apps"
-  resources:
-  - replicasets
-  - deployments
-  verbs:
-  - get
-  - list
-  - watch
diff --git a/assets/components/service-ca/rolebinding.yaml b/assets/components/service-ca/rolebinding.yaml
deleted file mode 100644
index 537480da29..0000000000
--- a/assets/components/service-ca/rolebinding.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: rbac.authorization.k8s.io/v1
-kind: RoleBinding
-metadata:
-  name: system:openshift:controller:service-ca
-  namespace: openshift-service-ca
-roleRef:
-  kind: Role
-  name: system:openshift:controller:service-ca
-subjects:
-- kind: ServiceAccount
-  namespace: openshift-service-ca
-  name: service-ca
diff --git a/assets/components/service-ca/sa.yaml b/assets/components/service-ca/sa.yaml
deleted file mode 100644
index e48fd54c2c..0000000000
--- a/assets/components/service-ca/sa.yaml
+++ /dev/null
@@ -1,5 +0,0 @@
-apiVersion: v1
-kind: ServiceAccount
-metadata:
-  namespace: openshift-service-ca
-  name: service-ca
diff --git a/assets/components/service-ca/signing-cabundle.yaml b/assets/components/service-ca/signing-cabundle.yaml
deleted file mode 100644
index f0d552f88a..0000000000
--- a/assets/components/service-ca/signing-cabundle.yaml
+++ /dev/null
@@ -1,10 +0,0 @@
-apiVersion: v1
-kind: ConfigMap
-metadata:
-  namespace: openshift-service-ca
-  name: signing-cabundle
-  annotations:
-    openshift.io/owning-component: service-ca
-    openshift.io/description: "Service CA configmap contains the data for the PEM-encoded CA signing bundle which will be injected to resources annotated with 'service.beta.openshift.io/inject-cabundle=true'"
-data:
-  ca-bundle.crt:
diff --git a/assets/components/service-ca/signing-secret.yaml b/assets/components/service-ca/signing-secret.yaml
deleted file mode 100644
index c8e9d34611..0000000000
--- a/assets/components/service-ca/signing-secret.yaml
+++ /dev/null
@@ -1,12 +0,0 @@
-apiVersion: v1
-kind: Secret
-metadata:
-  namespace: openshift-service-ca
-  name: signing-key
-  annotations:
-    openshift.io/owning-component: service-ca
-    openshift.io/description: "Service CA secret contains a signing key that will be used to issue a signed serving certificate/key pair to services annotated with 'service.beta.openshift.io/serving-cert-secret-name'"
-type: kubernetes.io/tls
-data:
-  tls.crt:
-  tls.key:
diff --git a/assets/optional/cert-manager/manager/images-aarch64.yaml b/assets/optional/cert-manager/manager/images-aarch64.yaml
index 06fcd9ece0..1ccfaeaa10 100644
--- a/assets/optional/cert-manager/manager/images-aarch64.yaml
+++ b/assets/optional/cert-manager/manager/images-aarch64.yaml
@@ -4,9 +4,9 @@ metadata:
   name: cert-manager-images
   namespace: cert-manager
 data:
-  cert-manager-webhook: registry.redhat.io/cert-manager/jetstack-cert-manager-rhel9@sha256:8227c8925d00d1c81c95e7017209fdc6b5b1925cde2fa4fe3752fb6c81510a2d
-  cert-manager-ca-injector: registry.redhat.io/cert-manager/jetstack-cert-manager-rhel9@sha256:8227c8925d00d1c81c95e7017209fdc6b5b1925cde2fa4fe3752fb6c81510a2d
-  cert-manager-controller: registry.redhat.io/cert-manager/jetstack-cert-manager-rhel9@sha256:8227c8925d00d1c81c95e7017209fdc6b5b1925cde2fa4fe3752fb6c81510a2d
-  cert-manager-acmesolver: registry.redhat.io/cert-manager/jetstack-cert-manager-acmesolver-rhel9@sha256:b001612ad6362a1b7273e178d9870ab3d020a40ee3339a0f95fef1cd3913356e
-  cert-manager-istiocsr: registry.redhat.io/cert-manager/cert-manager-istio-csr-rhel9@sha256:78564158857ed7f1534597f3ee7faaee23b692f9ed5aa0259e19196f5400167d
-  controller: registry.redhat.io/cert-manager/cert-manager-operator-rhel9@sha256:9f37a838089d2e3c199a4fd97bea028cb6b66b4214e8233884716efe0a998298
+  cert-manager-webhook: registry.redhat.io/cert-manager/jetstack-cert-manager-rhel9@sha256:f1b903ff69100fa938d6bdf4d730d35158eec905351344a246e30ef14c847222
+  cert-manager-ca-injector: registry.redhat.io/cert-manager/jetstack-cert-manager-rhel9@sha256:f1b903ff69100fa938d6bdf4d730d35158eec905351344a246e30ef14c847222
+  cert-manager-controller: registry.redhat.io/cert-manager/jetstack-cert-manager-rhel9@sha256:f1b903ff69100fa938d6bdf4d730d35158eec905351344a246e30ef14c847222
+  cert-manager-acmesolver: registry.redhat.io/cert-manager/jetstack-cert-manager-acmesolver-rhel9@sha256:3258027c0fb9426c9ee3567f6dc0d02b85cb661c23300b230f5b1400b43bac25
+  cert-manager-istiocsr: registry.redhat.io/cert-manager/cert-manager-istio-csr-rhel9@sha256:95f5dfa4331fcfb96357ed28f4d7f0fd00d9419d9252e3cff3962aec6cedbeb9
+  controller: registry.redhat.io/cert-manager/cert-manager-operator-rhel9@sha256:22f4e686a81fc809e70e3f73206ec221f8081e842243f173308dc1fbc7f02a3e
diff --git a/assets/optional/cert-manager/manager/images-x86_64.yaml b/assets/optional/cert-manager/manager/images-x86_64.yaml
index e947228bea..71aea542a9 100644
--- a/assets/optional/cert-manager/manager/images-x86_64.yaml
+++ b/assets/optional/cert-manager/manager/images-x86_64.yaml
@@ -4,9 +4,9 @@ metadata:
   name: cert-manager-images
   namespace: cert-manager
 data:
-  cert-manager-webhook: registry.redhat.io/cert-manager/jetstack-cert-manager-rhel9@sha256:40b47054e42363a365b491ccfe0d86f109e19fc317058ba834ffe0f5c733880b
-  cert-manager-ca-injector: registry.redhat.io/cert-manager/jetstack-cert-manager-rhel9@sha256:40b47054e42363a365b491ccfe0d86f109e19fc317058ba834ffe0f5c733880b
-  cert-manager-controller: registry.redhat.io/cert-manager/jetstack-cert-manager-rhel9@sha256:40b47054e42363a365b491ccfe0d86f109e19fc317058ba834ffe0f5c733880b
-  cert-manager-acmesolver: registry.redhat.io/cert-manager/jetstack-cert-manager-acmesolver-rhel9@sha256:3a40eb434e032fb2135f369b6fc65266ae0f409db92fd65d12cf13c7f32b5020
-  cert-manager-istiocsr: registry.redhat.io/cert-manager/cert-manager-istio-csr-rhel9@sha256:0f20d178f980a3fa4527bc1613b8639385e36c367e30c93b4cbb4c4a434d3405
-  controller: registry.redhat.io/cert-manager/cert-manager-operator-rhel9@sha256:8eecb53c8c81c0fa8f198260acb273759c0d12b5c01642a128923c5716df19d2
+  cert-manager-webhook: registry.redhat.io/cert-manager/jetstack-cert-manager-rhel9@sha256:09c857f0c20721d6b447f5f567182befc1ca6157128225849117a5c830feab23
+  cert-manager-ca-injector: registry.redhat.io/cert-manager/jetstack-cert-manager-rhel9@sha256:09c857f0c20721d6b447f5f567182befc1ca6157128225849117a5c830feab23
+  cert-manager-controller: registry.redhat.io/cert-manager/jetstack-cert-manager-rhel9@sha256:09c857f0c20721d6b447f5f567182befc1ca6157128225849117a5c830feab23
+  cert-manager-acmesolver: registry.redhat.io/cert-manager/jetstack-cert-manager-acmesolver-rhel9@sha256:155383c4664ea3ed18d0f079be720ad68a5de044448a744d7579af7ff0fc7e0a
+  cert-manager-istiocsr: registry.redhat.io/cert-manager/cert-manager-istio-csr-rhel9@sha256:41df7aabbce42599bad7fdc721cd12aa6e12d17e1c0658fb3294a1f68483d656
+  controller: registry.redhat.io/cert-manager/cert-manager-operator-rhel9@sha256:57a1aea49d7cc275b37b8f52d602a3a9d1601ec6a21a3268dd4903566cb2e335
diff --git a/assets/optional/cert-manager/release-cert-manager-aarch64.json b/assets/optional/cert-manager/release-cert-manager-aarch64.json
index 52ade756ee..af1ec78f24 100644
--- a/assets/optional/cert-manager/release-cert-manager-aarch64.json
+++ b/assets/optional/cert-manager/release-cert-manager-aarch64.json
@@ -1,13 +1,13 @@
 {
   "release": {
-    "base": "1.18.0"
+    "base": "1.18.1"
   },
   "images": {
-    "cert-manager-operator": "registry.redhat.io/cert-manager/cert-manager-operator-rhel9@sha256:9f37a838089d2e3c199a4fd97bea028cb6b66b4214e8233884716efe0a998298",
-    "cert-manager-istiocsr": "registry.redhat.io/cert-manager/cert-manager-istio-csr-rhel9@sha256:78564158857ed7f1534597f3ee7faaee23b692f9ed5aa0259e19196f5400167d",
-    "cert-manager-acmesolver": "registry.redhat.io/cert-manager/jetstack-cert-manager-acmesolver-rhel9@sha256:b001612ad6362a1b7273e178d9870ab3d020a40ee3339a0f95fef1cd3913356e",
-    "cert-manager-webhook": "registry.redhat.io/cert-manager/jetstack-cert-manager-rhel9@sha256:8227c8925d00d1c81c95e7017209fdc6b5b1925cde2fa4fe3752fb6c81510a2d",
-    "cert-manager-ca-injector": "registry.redhat.io/cert-manager/jetstack-cert-manager-rhel9@sha256:8227c8925d00d1c81c95e7017209fdc6b5b1925cde2fa4fe3752fb6c81510a2d",
-    "cert-manager-controller": "registry.redhat.io/cert-manager/jetstack-cert-manager-rhel9@sha256:8227c8925d00d1c81c95e7017209fdc6b5b1925cde2fa4fe3752fb6c81510a2d"
+    "cert-manager-operator": "registry.redhat.io/cert-manager/cert-manager-operator-rhel9@sha256:22f4e686a81fc809e70e3f73206ec221f8081e842243f173308dc1fbc7f02a3e",
+    "cert-manager-istiocsr": "registry.redhat.io/cert-manager/cert-manager-istio-csr-rhel9@sha256:95f5dfa4331fcfb96357ed28f4d7f0fd00d9419d9252e3cff3962aec6cedbeb9",
+    "cert-manager-acmesolver": "registry.redhat.io/cert-manager/jetstack-cert-manager-acmesolver-rhel9@sha256:3258027c0fb9426c9ee3567f6dc0d02b85cb661c23300b230f5b1400b43bac25",
+    "cert-manager-webhook": "registry.redhat.io/cert-manager/jetstack-cert-manager-rhel9@sha256:f1b903ff69100fa938d6bdf4d730d35158eec905351344a246e30ef14c847222",
+    "cert-manager-ca-injector": "registry.redhat.io/cert-manager/jetstack-cert-manager-rhel9@sha256:f1b903ff69100fa938d6bdf4d730d35158eec905351344a246e30ef14c847222",
+    "cert-manager-controller": "registry.redhat.io/cert-manager/jetstack-cert-manager-rhel9@sha256:f1b903ff69100fa938d6bdf4d730d35158eec905351344a246e30ef14c847222"
   }
 }
diff --git a/assets/optional/cert-manager/release-cert-manager-x86_64.json b/assets/optional/cert-manager/release-cert-manager-x86_64.json
index cad3495978..40fb38817f 100644
--- a/assets/optional/cert-manager/release-cert-manager-x86_64.json
+++ b/assets/optional/cert-manager/release-cert-manager-x86_64.json
@@ -1,13 +1,13 @@
 {
   "release": {
-    "base": "1.18.0"
+    "base": "1.18.1"
   },
   "images": {
-    "cert-manager-operator": "registry.redhat.io/cert-manager/cert-manager-operator-rhel9@sha256:8eecb53c8c81c0fa8f198260acb273759c0d12b5c01642a128923c5716df19d2",
-    "cert-manager-istiocsr": "registry.redhat.io/cert-manager/cert-manager-istio-csr-rhel9@sha256:0f20d178f980a3fa4527bc1613b8639385e36c367e30c93b4cbb4c4a434d3405",
-    "cert-manager-acmesolver": "registry.redhat.io/cert-manager/jetstack-cert-manager-acmesolver-rhel9@sha256:3a40eb434e032fb2135f369b6fc65266ae0f409db92fd65d12cf13c7f32b5020",
-    "cert-manager-webhook": "registry.redhat.io/cert-manager/jetstack-cert-manager-rhel9@sha256:40b47054e42363a365b491ccfe0d86f109e19fc317058ba834ffe0f5c733880b",
-    "cert-manager-ca-injector": "registry.redhat.io/cert-manager/jetstack-cert-manager-rhel9@sha256:40b47054e42363a365b491ccfe0d86f109e19fc317058ba834ffe0f5c733880b",
-    "cert-manager-controller": "registry.redhat.io/cert-manager/jetstack-cert-manager-rhel9@sha256:40b47054e42363a365b491ccfe0d86f109e19fc317058ba834ffe0f5c733880b"
+    "cert-manager-operator": "registry.redhat.io/cert-manager/cert-manager-operator-rhel9@sha256:57a1aea49d7cc275b37b8f52d602a3a9d1601ec6a21a3268dd4903566cb2e335",
+    "cert-manager-istiocsr": "registry.redhat.io/cert-manager/cert-manager-istio-csr-rhel9@sha256:41df7aabbce42599bad7fdc721cd12aa6e12d17e1c0658fb3294a1f68483d656",
+    "cert-manager-acmesolver": "registry.redhat.io/cert-manager/jetstack-cert-manager-acmesolver-rhel9@sha256:155383c4664ea3ed18d0f079be720ad68a5de044448a744d7579af7ff0fc7e0a",
+    "cert-manager-webhook": "registry.redhat.io/cert-manager/jetstack-cert-manager-rhel9@sha256:09c857f0c20721d6b447f5f567182befc1ca6157128225849117a5c830feab23",
+    "cert-manager-ca-injector": "registry.redhat.io/cert-manager/jetstack-cert-manager-rhel9@sha256:09c857f0c20721d6b447f5f567182befc1ca6157128225849117a5c830feab23",
+    "cert-manager-controller": "registry.redhat.io/cert-manager/jetstack-cert-manager-rhel9@sha256:09c857f0c20721d6b447f5f567182befc1ca6157128225849117a5c830feab23"
   }
 }
diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json
index 981ce6e34f..ea02699bff 100644
--- a/assets/release/release-aarch64.json
+++ b/assets/release/release-aarch64.json
@@ -1,16 +1,16 @@
 {
   "release": {
-    "base": "4.22.0-0.nightly-arm64-2026-03-31-033117"
+    "base": "4.22.0-0.nightly-arm64-2026-04-02-033117"
   },
   "images": {
-    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e27439092ba192070359a268fe8dc7949e2c57bd9a45e954a3ac85201bca8534",
-    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b628d002923ae8208304f6d4bfa507af754cc773dc1d5b222fc7c065ddb1894e",
-    "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:927782656b13a97853d0026b921aa422671761955fcf91c9e3dac855ba6fb206",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:379f906d6e3970fca176447c41e5b3e4b140986e47bedda5876b850726aa6a6d",
-    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:eef7bdf15087595b1931f230697e0e28bd44f099a730f64d47c43a23452a1663",
-    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ac628fe7cc2515e11d50b708fc69a77258640fc44cd073ad2891e997030c4d35",
-    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:545b886030911f9992d828943c8dfb84b5ca74bc257a3101e6a0a19fd85b1efe",
+    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c7906bd45f977ef8c43a2dd65c3cad1c0098b61d4a0c4646e4e373dd159688b1",
+    "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7abb8320c380cfc7d75599f01e96907d1b9562a1be4a5e800c25b62de24eff62",
+    "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fdb988f8075078798dc00de52f75d4b9c7aa9d80ffdd202fd7476a5de7430c91",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b2a0c592a6105fcba0299bcebf9c6079015f533bc2ebb8791e7953b26861c788",
+    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ef9cad701c4c04fc7677bce9bdae0f39609f5c3578feb97c95c4ea0d5d9b8573",
+    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0eee7f97711c71d3a4c559c0063d9752ccddc563e196b6a876a5184402495a86",
+    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:433aa7050a25cf8eacbca42a490c715334f42ddb8c894036dfb3bed430a3a92e",
     "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:3766640b19c336b443619ecdb35f36b479c79ea71b21de97febf024a5eaf6c84",
-    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cea3031aafbf72710d2417451e7171bc4843d01d78d6143ad016765786613183"
+    "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dc954461f464bb9a26fbfa41aa3f9275d382fe0e529185827b829f5e1b075eb5"
   }
 }
diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json
index 1f354c0c1a..1a510332f1 100644
--- a/assets/release/release-x86_64.json
+++ b/assets/release/release-x86_64.json
@@ -1,15 +1,15 @@
 {
   "release": {
-    "base": "4.22.0-0.nightly-2026-03-29-173136"
+    "base": "4.22.0-0.nightly-2026-04-01-151631"
   },
   "images": {
-    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:342b870f3c887288c985007c756ac589662c3e6058c69ddcdafa04b7efac5d40",
+    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7ad3ce5124bdb658eff859a78a616f41714324245f13c6d0cd77ecfe20ae64e1",
     "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:df026456d0a6a79d09c561ee382e9f5997de6196691038e0e050c4bce6a4af2c",
-    "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bec267008a9b95e4a4d0667b0948beecec9b0f5e76ff0dadaba72139d18a9c86",
+    "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:aecc401a907f4f40c41ed677e91a966876fe72ea0142e05bf0551187bd10d16e",
     "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b24b10973a22c0dad43644e033ece7a1ec2bf3b2469ca390260ee94a32f1630c",
-    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:443665f687873dbb4b3fe1a9fa4cef654d263f4f715d7fee946d57d115178040",
-    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:99e3448beed2df93641fced98f2cfd9e1ffe02901da9e7fae2ea54b5ce63cf16",
-    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4acf7689bcf12bd09e0c729f29121ad2b8ad42819d609dc4111eeeffa3256d56",
+    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:96b29defdb6e7cae2553a6834e7e7528ecea1e25b19565b096ab49c48a598ca5",
+    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fb8d06e3e46118e7921331871891a4bea62ff086e084781b6c772569314bd45f",
+    "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:86152fb19c42d74ce3c0f62ead0927a01c23d8452d61d0ac19ce8a785d1ed969",
     "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:58804d8baf922927b66cec9424d431a3bdb341d207024ce40cc8f0123bac03ee",
     "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7e6cd34ecd2cae602fbd1ae770d9b8090ab2d50766ef539daaef5ccfc1db98d5"
   }
diff --git a/deps/github.com/openshift/kubernetes/CHANGELOG/CHANGELOG-1.35.md b/deps/github.com/openshift/kubernetes/CHANGELOG/CHANGELOG-1.35.md
index 65c8392736..d0a45e27c7 100644
--- a/deps/github.com/openshift/kubernetes/CHANGELOG/CHANGELOG-1.35.md
+++ b/deps/github.com/openshift/kubernetes/CHANGELOG/CHANGELOG-1.35.md
@@ -1,148 +1,247 @@
 <!-- BEGIN MUNGE: GENERATED_TOC -->
 
-- [v1.35.1](#v1351)
-  - [Downloads for v1.35.1](#downloads-for-v1351)
+- [v1.35.2](#v1352)
+  - [Downloads for v1.35.2](#downloads-for-v1352)
     - [Source Code](#source-code)
     - [Client Binaries](#client-binaries)
     - [Server Binaries](#server-binaries)
     - [Node Binaries](#node-binaries)
     - [Container Images](#container-images)
-  - [Changelog since v1.35.0](#changelog-since-v1350)
+  - [Changelog since v1.35.1](#changelog-since-v1351)
   - [Changes by Kind](#changes-by-kind)
     - [Feature](#feature)
-    - [Bug or Regression](#bug-or-regression)
-    - [Other (Cleanup or Flake)](#other-cleanup-or-flake)
   - [Dependencies](#dependencies)
     - [Added](#added)
     - [Changed](#changed)
     - [Removed](#removed)
-- [v1.35.0](#v1350)
-  - [Downloads for v1.35.0](#downloads-for-v1350)
+- [v1.35.1](#v1351)
+  - [Downloads for v1.35.1](#downloads-for-v1351)
     - [Source Code](#source-code-1)
     - [Client Binaries](#client-binaries-1)
     - [Server Binaries](#server-binaries-1)
     - [Node Binaries](#node-binaries-1)
     - [Container Images](#container-images-1)
-  - [Changelog since v1.34.0](#changelog-since-v1340)
-  - [Urgent Upgrade Notes](#urgent-upgrade-notes)
-    - [(No, really, you MUST read this before you upgrade)](#no-really-you-must-read-this-before-you-upgrade)
+  - [Changelog since v1.35.0](#changelog-since-v1350)
   - [Changes by Kind](#changes-by-kind-1)
-    - [Deprecation](#deprecation)
-    - [API Change](#api-change)
     - [Feature](#feature-1)
-    - [Documentation](#documentation)
-    - [Bug or Regression](#bug-or-regression-1)
-    - [Other (Cleanup or Flake)](#other-cleanup-or-flake-1)
+    - [Bug or Regression](#bug-or-regression)
+    - [Other (Cleanup or Flake)](#other-cleanup-or-flake)
   - [Dependencies](#dependencies-1)
     - [Added](#added-1)
     - [Changed](#changed-1)
     - [Removed](#removed-1)
-- [v1.35.0-rc.1](#v1350-rc1)
-  - [Downloads for v1.35.0-rc.1](#downloads-for-v1350-rc1)
+- [v1.35.0](#v1350)
+  - [Downloads for v1.35.0](#downloads-for-v1350)
     - [Source Code](#source-code-2)
     - [Client Binaries](#client-binaries-2)
     - [Server Binaries](#server-binaries-2)
     - [Node Binaries](#node-binaries-2)
     - [Container Images](#container-images-2)
-  - [Changelog since v1.35.0-rc.0](#changelog-since-v1350-rc0)
+  - [Changelog since v1.34.0](#changelog-since-v1340)
+  - [Urgent Upgrade Notes](#urgent-upgrade-notes)
+    - [(No, really, you MUST read this before you upgrade)](#no-really-you-must-read-this-before-you-upgrade)
   - [Changes by Kind](#changes-by-kind-2)
+    - [Deprecation](#deprecation)
+    - [API Change](#api-change)
     - [Feature](#feature-2)
-    - [Bug or Regression](#bug-or-regression-2)
-    - [Other (Cleanup or Flake)](#other-cleanup-or-flake-2)
+    - [Documentation](#documentation)
+    - [Bug or Regression](#bug-or-regression-1)
+    - [Other (Cleanup or Flake)](#other-cleanup-or-flake-1)
   - [Dependencies](#dependencies-2)
     - [Added](#added-2)
     - [Changed](#changed-2)
     - [Removed](#removed-2)
-- [v1.35.0-rc.0](#v1350-rc0)
-  - [Downloads for v1.35.0-rc.0](#downloads-for-v1350-rc0)
+- [v1.35.0-rc.1](#v1350-rc1)
+  - [Downloads for v1.35.0-rc.1](#downloads-for-v1350-rc1)
     - [Source Code](#source-code-3)
     - [Client Binaries](#client-binaries-3)
     - [Server Binaries](#server-binaries-3)
     - [Node Binaries](#node-binaries-3)
     - [Container Images](#container-images-3)
-  - [Changelog since v1.35.0-beta.0](#changelog-since-v1350-beta0)
+  - [Changelog since v1.35.0-rc.0](#changelog-since-v1350-rc0)
   - [Changes by Kind](#changes-by-kind-3)
     - [Feature](#feature-3)
-    - [Bug or Regression](#bug-or-regression-3)
+    - [Bug or Regression](#bug-or-regression-2)
+    - [Other (Cleanup or Flake)](#other-cleanup-or-flake-2)
   - [Dependencies](#dependencies-3)
     - [Added](#added-3)
     - [Changed](#changed-3)
     - [Removed](#removed-3)
-- [v1.35.0-beta.0](#v1350-beta0)
-  - [Downloads for v1.35.0-beta.0](#downloads-for-v1350-beta0)
+- [v1.35.0-rc.0](#v1350-rc0)
+  - [Downloads for v1.35.0-rc.0](#downloads-for-v1350-rc0)
     - [Source Code](#source-code-4)
     - [Client Binaries](#client-binaries-4)
     - [Server Binaries](#server-binaries-4)
     - [Node Binaries](#node-binaries-4)
     - [Container Images](#container-images-4)
-  - [Changelog since v1.35.0-alpha.3](#changelog-since-v1350-alpha3)
+  - [Changelog since v1.35.0-beta.0](#changelog-since-v1350-beta0)
   - [Changes by Kind](#changes-by-kind-4)
-    - [API Change](#api-change-1)
     - [Feature](#feature-4)
-    - [Bug or Regression](#bug-or-regression-4)
-    - [Other (Cleanup or Flake)](#other-cleanup-or-flake-3)
+    - [Bug or Regression](#bug-or-regression-3)
   - [Dependencies](#dependencies-4)
     - [Added](#added-4)
     - [Changed](#changed-4)
     - [Removed](#removed-4)
-- [v1.35.0-alpha.3](#v1350-alpha3)
-  - [Downloads for v1.35.0-alpha.3](#downloads-for-v1350-alpha3)
+- [v1.35.0-beta.0](#v1350-beta0)
+  - [Downloads for v1.35.0-beta.0](#downloads-for-v1350-beta0)
     - [Source Code](#source-code-5)
     - [Client Binaries](#client-binaries-5)
     - [Server Binaries](#server-binaries-5)
     - [Node Binaries](#node-binaries-5)
     - [Container Images](#container-images-5)
-  - [Changelog since v1.35.0-alpha.2](#changelog-since-v1350-alpha2)
-  - [Urgent Upgrade Notes](#urgent-upgrade-notes-1)
-    - [(No, really, you MUST read this before you upgrade)](#no-really-you-must-read-this-before-you-upgrade-1)
+  - [Changelog since v1.35.0-alpha.3](#changelog-since-v1350-alpha3)
   - [Changes by Kind](#changes-by-kind-5)
-    - [API Change](#api-change-2)
+    - [API Change](#api-change-1)
     - [Feature](#feature-5)
-    - [Bug or Regression](#bug-or-regression-5)
-    - [Other (Cleanup or Flake)](#other-cleanup-or-flake-4)
+    - [Bug or Regression](#bug-or-regression-4)
+    - [Other (Cleanup or Flake)](#other-cleanup-or-flake-3)
   - [Dependencies](#dependencies-5)
     - [Added](#added-5)
     - [Changed](#changed-5)
     - [Removed](#removed-5)
-- [v1.35.0-alpha.2](#v1350-alpha2)
-  - [Downloads for v1.35.0-alpha.2](#downloads-for-v1350-alpha2)
+- [v1.35.0-alpha.3](#v1350-alpha3)
+  - [Downloads for v1.35.0-alpha.3](#downloads-for-v1350-alpha3)
     - [Source Code](#source-code-6)
     - [Client Binaries](#client-binaries-6)
     - [Server Binaries](#server-binaries-6)
     - [Node Binaries](#node-binaries-6)
     - [Container Images](#container-images-6)
-  - [Changelog since v1.35.0-alpha.1](#changelog-since-v1350-alpha1)
+  - [Changelog since v1.35.0-alpha.2](#changelog-since-v1350-alpha2)
+  - [Urgent Upgrade Notes](#urgent-upgrade-notes-1)
+    - [(No, really, you MUST read this before you upgrade)](#no-really-you-must-read-this-before-you-upgrade-1)
   - [Changes by Kind](#changes-by-kind-6)
-    - [Deprecation](#deprecation-1)
-    - [API Change](#api-change-3)
+    - [API Change](#api-change-2)
     - [Feature](#feature-6)
-    - [Documentation](#documentation-1)
-    - [Bug or Regression](#bug-or-regression-6)
-    - [Other (Cleanup or Flake)](#other-cleanup-or-flake-5)
+    - [Bug or Regression](#bug-or-regression-5)
+    - [Other (Cleanup or Flake)](#other-cleanup-or-flake-4)
   - [Dependencies](#dependencies-6)
     - [Added](#added-6)
     - [Changed](#changed-6)
     - [Removed](#removed-6)
-- [v1.35.0-alpha.1](#v1350-alpha1)
-  - [Downloads for v1.35.0-alpha.1](#downloads-for-v1350-alpha1)
+- [v1.35.0-alpha.2](#v1350-alpha2)
+  - [Downloads for v1.35.0-alpha.2](#downloads-for-v1350-alpha2)
     - [Source Code](#source-code-7)
     - [Client Binaries](#client-binaries-7)
     - [Server Binaries](#server-binaries-7)
     - [Node Binaries](#node-binaries-7)
     - [Container Images](#container-images-7)
-  - [Changelog since v1.34.0](#changelog-since-v1340-1)
+  - [Changelog since v1.35.0-alpha.1](#changelog-since-v1350-alpha1)
   - [Changes by Kind](#changes-by-kind-7)
-    - [API Change](#api-change-4)
+    - [Deprecation](#deprecation-1)
+    - [API Change](#api-change-3)
     - [Feature](#feature-7)
-    - [Bug or Regression](#bug-or-regression-7)
-    - [Other (Cleanup or Flake)](#other-cleanup-or-flake-6)
+    - [Documentation](#documentation-1)
+    - [Bug or Regression](#bug-or-regression-6)
+    - [Other (Cleanup or Flake)](#other-cleanup-or-flake-5)
   - [Dependencies](#dependencies-7)
     - [Added](#added-7)
     - [Changed](#changed-7)
     - [Removed](#removed-7)
+- [v1.35.0-alpha.1](#v1350-alpha1)
+  - [Downloads for v1.35.0-alpha.1](#downloads-for-v1350-alpha1)
+    - [Source Code](#source-code-8)
+    - [Client Binaries](#client-binaries-8)
+    - [Server Binaries](#server-binaries-8)
+    - [Node Binaries](#node-binaries-8)
+    - [Container Images](#container-images-8)
+  - [Changelog since v1.34.0](#changelog-since-v1340-1)
+  - [Changes by Kind](#changes-by-kind-8)
+    - [API Change](#api-change-4)
+    - [Feature](#feature-8)
+    - [Bug or Regression](#bug-or-regression-7)
+    - [Other (Cleanup or Flake)](#other-cleanup-or-flake-6)
+  - [Dependencies](#dependencies-8)
+    - [Added](#added-8)
+    - [Changed](#changed-8)
+    - [Removed](#removed-8)
 
 <!-- END MUNGE: GENERATED_TOC -->
 
+# v1.35.2
+
+
+## Downloads for v1.35.2
+
+
+
+### Source Code
+
+filename | sha512 hash
+-------- | -----------
+[kubernetes.tar.gz](https://dl.k8s.io/v1.35.2/kubernetes.tar.gz) | 0264ce8adcc15926e7a4701f4e25b9dd477d1f9242e05dcfd885d0803951ccafe8ada789961de7ad0e0a2813bca668b717a6c658ba905800dc86acd6da59854b
+[kubernetes-src.tar.gz](https://dl.k8s.io/v1.35.2/kubernetes-src.tar.gz) | 5489905c35cd35084130613a636423a2743a92d2a76047371398f1530700353c255b88eef99228b210f6a8590c18c2e5d5eb153ea8adc6ef6554e899fcc43f76
+
+### Client Binaries
+
+filename | sha512 hash
+-------- | -----------
+[kubernetes-client-darwin-amd64.tar.gz](https://dl.k8s.io/v1.35.2/kubernetes-client-darwin-amd64.tar.gz) | 570d84f1c248d543fe185751d029c6bc2f7a3644f9b7b45e49ca34b29adf7d03b07349f63d6104570a70e04ab68f5f05046bac7b84b9a2770bc52e953d192354
+[kubernetes-client-darwin-arm64.tar.gz](https://dl.k8s.io/v1.35.2/kubernetes-client-darwin-arm64.tar.gz) | eacc6860b6afecb15d9facdd69d6514c7234404ad7793b6203bb7b5efffbda67aaf2cd0dc0608d2f2debdf8b19e9767c4a9cab4ba2890fc021993a408df6a9d0
+[kubernetes-client-linux-386.tar.gz](https://dl.k8s.io/v1.35.2/kubernetes-client-linux-386.tar.gz) | a4b447153432fdc21e1c718edbdd763e94c57d786191c74d03172f56f17e141c164eb5586245720c6d48cb831de04200064e29f3efa7a4d3570a09037e020e56
+[kubernetes-client-linux-amd64.tar.gz](https://dl.k8s.io/v1.35.2/kubernetes-client-linux-amd64.tar.gz) | c16cad61183e84a8dd6247ba6b163a830dc9490a06e86f452d8406c8d877620688557695f89b70b87672bb4a8922889e8aea8ca8f085f7cf68c1cbee9db63c92
+[kubernetes-client-linux-arm.tar.gz](https://dl.k8s.io/v1.35.2/kubernetes-client-linux-arm.tar.gz) | d3c2e63f752211e3fd86bb0cffd3dbbb2304da2da168fd6ab5e75d28543e7e40ad8472dac631d879f0654d9bf33d2d26f10d5fbd3b7cda8ef33baf5a39f32929
+[kubernetes-client-linux-arm64.tar.gz](https://dl.k8s.io/v1.35.2/kubernetes-client-linux-arm64.tar.gz) | 93b001ffeb829b3984270686ad254f395a2c87b0ff9c07a60ed86c47286de721b786983f199d3ea375c87f801d68cc397a8efa4b4d4bd816576102dd0d157fa3
+[kubernetes-client-linux-ppc64le.tar.gz](https://dl.k8s.io/v1.35.2/kubernetes-client-linux-ppc64le.tar.gz) | 33920d2f3bf811a67281190dbe9d6efd7164d8aa4e6a26453330663b6e281ce69b464ed95214d354eee91d8804d7027a020acd84e1436ea8a00828ca0b4a1062
+[kubernetes-client-linux-s390x.tar.gz](https://dl.k8s.io/v1.35.2/kubernetes-client-linux-s390x.tar.gz) | e0410769c2a7054eac0f80c620bef093ea01231ed978bbc94688319c19b6d6b107d9a0bdef5d45f987eaa295658aa143bdb833910ba6e84c9d138dd275d7c7a0
+[kubernetes-client-windows-386.tar.gz](https://dl.k8s.io/v1.35.2/kubernetes-client-windows-386.tar.gz) | 480270e7bb0bf8912b193c6f884e516c6182e64a0e08720992e876f104ee21840ba726dd5ba785bed1c097740ba8414f7f444a028bb1fab4c7a502911c2b4400
+[kubernetes-client-windows-amd64.tar.gz](https://dl.k8s.io/v1.35.2/kubernetes-client-windows-amd64.tar.gz) | cfe1f65379dc52628fd6c1b2b75b13a7f1000bf6b9992ad689620157eb783ca8622a94e0b2a13343b05acd561952228956bb5e45411d135af9004717d97de259
+[kubernetes-client-windows-arm64.tar.gz](https://dl.k8s.io/v1.35.2/kubernetes-client-windows-arm64.tar.gz) | 13085cb4bf3c99276b4bece38cc17824020ca7708df35ae0d3e81feae01a416794088d36688958b8bbfdd8942c5b15d70dde234e1af4757c75a940818abaf71d
+
+### Server Binaries
+
+filename | sha512 hash
+-------- | -----------
+[kubernetes-server-linux-amd64.tar.gz](https://dl.k8s.io/v1.35.2/kubernetes-server-linux-amd64.tar.gz) | 73b7e15267995f488159628f27b1742199de97a673e0728bf9c539a06d9454d3e9725516bf5d6c05cea7d4c8b847fe44fe835d39e0d7eeedc453833918022296
+[kubernetes-server-linux-arm64.tar.gz](https://dl.k8s.io/v1.35.2/kubernetes-server-linux-arm64.tar.gz) | 4a8e10c02e3667494bd9d73e5d8ecc30e3015ff3c95c97c68523c2a8cf87f3d735ae7448e172d0125d9692b26254ae4e9a394178b01d83b7d37781e8f0ee2e34
+[kubernetes-server-linux-ppc64le.tar.gz](https://dl.k8s.io/v1.35.2/kubernetes-server-linux-ppc64le.tar.gz) | 962b8d37eef1a267bc42196d7198bb4fa9b87f506b344af8c8a86c7e1480d26dcfa0d78f0c206379d293314d304c94a20218ed44fad763ea7c2667689f79d05b
+[kubernetes-server-linux-s390x.tar.gz](https://dl.k8s.io/v1.35.2/kubernetes-server-linux-s390x.tar.gz) | 5d283e8d153892d124580aebfb7730d92435e7052ed8679d8f4ba7bdf7f04e4e300e5c8d54d8eb55db650fe1a70bb3e9d1167a4c96acf2c0581148f93238e6ce
+
+### Node Binaries
+
+filename | sha512 hash
+-------- | -----------
+[kubernetes-node-linux-amd64.tar.gz](https://dl.k8s.io/v1.35.2/kubernetes-node-linux-amd64.tar.gz) | 499a61b38dbcddb7105a89cac0f63e1d9a08178c051d693a8095de65939deb4e12ff4a11116d69ec69e14da0d929c8344bbb8ea8ad06cc65d749d327ee0c7c55
+[kubernetes-node-linux-arm64.tar.gz](https://dl.k8s.io/v1.35.2/kubernetes-node-linux-arm64.tar.gz) | 91cbbb1002d78a5c49a17c3492e8e3f933856e6e008c74ec0853a3183349f4fb7b093b40424df457890989eaf10752a3337dad3a2bf89db7b5fb02978f3ffb7d
+[kubernetes-node-linux-ppc64le.tar.gz](https://dl.k8s.io/v1.35.2/kubernetes-node-linux-ppc64le.tar.gz) | 1dcef6733b943b8fd76011c98af680f27249a3d28a663d52c8ddd54f1ac847e068c84d10115683322ce55aed314f2af8f489fed63907d035713f40bb4e5b61a5
+[kubernetes-node-linux-s390x.tar.gz](https://dl.k8s.io/v1.35.2/kubernetes-node-linux-s390x.tar.gz) | cab84f226e8cc4d77f4b92c7a768115485705476783aa290606116aa1008dce62918ccda6c153f0ba14487c58c8b3dfffdeb67932e8d5a19d36831404f575cf4
+[kubernetes-node-windows-amd64.tar.gz](https://dl.k8s.io/v1.35.2/kubernetes-node-windows-amd64.tar.gz) | 0b6092275cb6027086909f871f64bac876a22c8d714b50d8250e16fa1d9afbcda32c22bec47f83b99716dcb902e210fc22976e7b8f42b7a7b24e7e9409ef876f
+
+### Container Images
+
+All container images are available as manifest lists and support the described
+architectures. It is also possible to pull a specific architecture directly by
+adding the "-$ARCH" suffix  to the container image name.
+
+name | architectures
+---- | -------------
+[registry.k8s.io/conformance:v1.35.2](https://console.cloud.google.com/artifacts/docker/k8s-artifacts-prod/southamerica-east1/images/conformance) | [amd64](https://console.cloud.google.com/artifacts/docker/k8s-artifacts-prod/southamerica-east1/images/conformance-amd64), [arm64](https://console.cloud.google.com/artifacts/docker/k8s-artifacts-prod/southamerica-east1/images/conformance-arm64), [ppc64le](https://console.cloud.google.com/artifacts/docker/k8s-artifacts-prod/southamerica-east1/images/conformance-ppc64le), [s390x](https://console.cloud.google.com/artifacts/docker/k8s-artifacts-prod/southamerica-east1/images/conformance-s390x)
+[registry.k8s.io/kube-apiserver:v1.35.2](https://console.cloud.google.com/artifacts/docker/k8s-artifacts-prod/southamerica-east1/images/kube-apiserver) | [amd64](https://console.cloud.google.com/artifacts/docker/k8s-artifacts-prod/southamerica-east1/images/kube-apiserver-amd64), [arm64](https://console.cloud.google.com/artifacts/docker/k8s-artifacts-prod/southamerica-east1/images/kube-apiserver-arm64), [ppc64le](https://console.cloud.google.com/artifacts/docker/k8s-artifacts-prod/southamerica-east1/images/kube-apiserver-ppc64le), [s390x](https://console.cloud.google.com/artifacts/docker/k8s-artifacts-prod/southamerica-east1/images/kube-apiserver-s390x)
+[registry.k8s.io/kube-controller-manager:v1.35.2](https://console.cloud.google.com/artifacts/docker/k8s-artifacts-prod/southamerica-east1/images/kube-controller-manager) | [amd64](https://console.cloud.google.com/artifacts/docker/k8s-artifacts-prod/southamerica-east1/images/kube-controller-manager-amd64), [arm64](https://console.cloud.google.com/artifacts/docker/k8s-artifacts-prod/southamerica-east1/images/kube-controller-manager-arm64), [ppc64le](https://console.cloud.google.com/artifacts/docker/k8s-artifacts-prod/southamerica-east1/images/kube-controller-manager-ppc64le), [s390x](https://console.cloud.google.com/artifacts/docker/k8s-artifacts-prod/southamerica-east1/images/kube-controller-manager-s390x)
+[registry.k8s.io/kube-proxy:v1.35.2](https://console.cloud.google.com/artifacts/docker/k8s-artifacts-prod/southamerica-east1/images/kube-proxy) | [amd64](https://console.cloud.google.com/artifacts/docker/k8s-artifacts-prod/southamerica-east1/images/kube-proxy-amd64), [arm64](https://console.cloud.google.com/artifacts/docker/k8s-artifacts-prod/southamerica-east1/images/kube-proxy-arm64), [ppc64le](https://console.cloud.google.com/artifacts/docker/k8s-artifacts-prod/southamerica-east1/images/kube-proxy-ppc64le), [s390x](https://console.cloud.google.com/artifacts/docker/k8s-artifacts-prod/southamerica-east1/images/kube-proxy-s390x)
+[registry.k8s.io/kube-scheduler:v1.35.2](https://console.cloud.google.com/artifacts/docker/k8s-artifacts-prod/southamerica-east1/images/kube-scheduler) | [amd64](https://console.cloud.google.com/artifacts/docker/k8s-artifacts-prod/southamerica-east1/images/kube-scheduler-amd64), [arm64](https://console.cloud.google.com/artifacts/docker/k8s-artifacts-prod/southamerica-east1/images/kube-scheduler-arm64), [ppc64le](https://console.cloud.google.com/artifacts/docker/k8s-artifacts-prod/southamerica-east1/images/kube-scheduler-ppc64le), [s390x](https://console.cloud.google.com/artifacts/docker/k8s-artifacts-prod/southamerica-east1/images/kube-scheduler-s390x)
+[registry.k8s.io/kubectl:v1.35.2](https://console.cloud.google.com/artifacts/docker/k8s-artifacts-prod/southamerica-east1/images/kubectl) | [amd64](https://console.cloud.google.com/artifacts/docker/k8s-artifacts-prod/southamerica-east1/images/kubectl-amd64), [arm64](https://console.cloud.google.com/artifacts/docker/k8s-artifacts-prod/southamerica-east1/images/kubectl-arm64), [ppc64le](https://console.cloud.google.com/artifacts/docker/k8s-artifacts-prod/southamerica-east1/images/kubectl-ppc64le), [s390x](https://console.cloud.google.com/artifacts/docker/k8s-artifacts-prod/southamerica-east1/images/kubectl-s390x)
+
+## Changelog since v1.35.1
+
+## Changes by Kind
+
+### Feature
+
+- Kubernetes is now built using Go 1.25.7 ([#136985](https://github.com/kubernetes/kubernetes/pull/136985), [@cpanato](https://github.com/cpanato)) [SIG Release and Testing]
+
+## Dependencies
+
+### Added
+_Nothing has changed._
+
+### Changed
+_Nothing has changed._
+
+### Removed
+_Nothing has changed._
+
+
+
 # v1.35.1
 
 
diff --git a/deps/github.com/openshift/kubernetes/build/common.sh b/deps/github.com/openshift/kubernetes/build/common.sh
index ebe6d35458..fca3077811 100755
--- a/deps/github.com/openshift/kubernetes/build/common.sh
+++ b/deps/github.com/openshift/kubernetes/build/common.sh
@@ -348,6 +348,9 @@ function kube::build::clean() {
     if [[ -d "${LOCAL_OUTPUT_ROOT}/local/go/cache" ]]; then
       chmod -R +w "${LOCAL_OUTPUT_ROOT}/local/go/cache"
     fi
+    if [[ -d "${LOCAL_OUTPUT_ROOT}/dockerized/go/cache" ]]; then
+      chmod -R +w "${LOCAL_OUTPUT_ROOT}/dockerized/go/cache"
+    fi
     rm -rf "${LOCAL_OUTPUT_ROOT}"
   fi
 }
diff --git a/deps/github.com/openshift/kubernetes/build/dependencies.yaml b/deps/github.com/openshift/kubernetes/build/dependencies.yaml
index f048200f01..5db5b3c4da 100644
--- a/deps/github.com/openshift/kubernetes/build/dependencies.yaml
+++ b/deps/github.com/openshift/kubernetes/build/dependencies.yaml
@@ -114,15 +114,6 @@ dependencies:
     - path: cluster/images/etcd/Makefile
       match: 'GOLANG_VERSION := \d+.\d+(alpha|beta|rc)?\.?(\d+)?'
 
-  # Golang
-  # TODO: this should really be eliminated and controlled by .go-version
-  - name: "golang: upstream version"
-    version: 1.25.7
-    refPaths:
-    - path: .go-version
-    - path: staging/publishing/rules.yaml
-      match: 'default-go-version\: \d+.\d+(alpha|beta|rc)?\.?(\d+)?'
-
   # This should ideally be updated to match the golang version
   # but we can dynamically fetch go if the base image is out of date.
   # This allows us to ship go updates more quickly.
diff --git a/deps/github.com/openshift/kubernetes/cmd/kubeadm/app/cmd/phases/reset/unmount_linux.go b/deps/github.com/openshift/kubernetes/cmd/kubeadm/app/cmd/phases/reset/unmount_linux.go
index dc16209afb..7cab7a6431 100644
--- a/deps/github.com/openshift/kubernetes/cmd/kubeadm/app/cmd/phases/reset/unmount_linux.go
+++ b/deps/github.com/openshift/kubernetes/cmd/kubeadm/app/cmd/phases/reset/unmount_linux.go
@@ -70,6 +70,12 @@ func unmountKubeletDirectory(kubeletRunDirectory string, flags []string) error {
 		}
 		klog.V(5).Infof("[reset] Unmounting %q", m[1])
 		if err := syscall.Unmount(m[1], flagsInt); err != nil {
+			// EINVAL is expected here if a duplicate mount entry
+			// was already unmounted via its shared peer.
+			if err == syscall.EINVAL {
+				klog.Warningf("[reset] Ignoring EINVAL error while unmounting %q", m[1])
+				continue
+			}
 			errList = append(errList, errors.WithMessagef(err, "failed to unmount %q", m[1]))
 		}
 	}
diff --git a/deps/github.com/openshift/kubernetes/cmd/kubeadm/app/util/etcd/etcd.go b/deps/github.com/openshift/kubernetes/cmd/kubeadm/app/util/etcd/etcd.go
index d89e648a93..3ac966c70b 100644
--- a/deps/github.com/openshift/kubernetes/cmd/kubeadm/app/util/etcd/etcd.go
+++ b/deps/github.com/openshift/kubernetes/cmd/kubeadm/app/util/etcd/etcd.go
@@ -533,8 +533,10 @@ func (c *Client) addMember(name string, peerAddrs string, isLearner bool) ([]Mem
 		ret = append(ret, Member{Name: memberName, PeerURL: m.PeerURLs[0]})
 	}
 
-	// Add the new member client address to the list of endpoints
-	c.Endpoints = append(c.Endpoints, GetClientURLByIP(parsedPeerAddrs.Hostname()))
+	if !isLearner {
+		// Add the new member client address to the list of endpoints
+		c.Endpoints = append(c.Endpoints, GetClientURLByIP(parsedPeerAddrs.Hostname()))
+	}
 
 	return ret, nil
 }
diff --git a/deps/github.com/openshift/kubernetes/openshift-hack/cmd/k8s-tests-ext/provider.go b/deps/github.com/openshift/kubernetes/openshift-hack/cmd/k8s-tests-ext/provider.go
index e64c46fbb7..6de10f937d 100644
--- a/deps/github.com/openshift/kubernetes/openshift-hack/cmd/k8s-tests-ext/provider.go
+++ b/deps/github.com/openshift/kubernetes/openshift-hack/cmd/k8s-tests-ext/provider.go
@@ -32,6 +32,29 @@ import (
 	_ "k8s.io/kubernetes/test/e2e/lifecycle"
 )
 
+func init() {
+	// Register OpenShift-specific cloud providers that are not part of upstream
+	// Kubernetes. Without these registrations, k8s-tests-ext crashes with
+	// "Unknown provider" when openshift-tests passes a provider like "ibmcloud".
+	// These providers don't need any special setup for running upstream kube
+	// tests, so a NullProvider is sufficient.
+	for _, name := range []string{
+		"baremetal",
+		"ovirt",
+		"kubevirt",
+		"alibabacloud",
+		"nutanix",
+		"ibmcloud",
+		"external",
+	} {
+		func(n string) {
+			framework.RegisterProvider(n, func() (framework.ProviderInterface, error) {
+				return framework.NullProvider{}, nil
+			})
+		}(name)
+	}
+}
+
 // Initialize a good enough test context for generating e2e tests,
 // so they can be listed and filtered.
 func initializeCommonTestFramework() error {
diff --git a/deps/github.com/openshift/kubernetes/openshift-hack/images/hyperkube/Dockerfile.rhel b/deps/github.com/openshift/kubernetes/openshift-hack/images/hyperkube/Dockerfile.rhel
index 2a21d7169f..eb3aba07df 100644
--- a/deps/github.com/openshift/kubernetes/openshift-hack/images/hyperkube/Dockerfile.rhel
+++ b/deps/github.com/openshift/kubernetes/openshift-hack/images/hyperkube/Dockerfile.rhel
@@ -15,4 +15,4 @@ COPY --from=builder /tmp/build/* /usr/bin/
 LABEL io.k8s.display-name="OpenShift Kubernetes Server Commands" \
       io.k8s.description="OpenShift is a platform for developing, building, and deploying containerized applications." \
       io.openshift.tags="openshift,hyperkube" \
-      io.openshift.build.versions="kubernetes=1.35.2"
\ No newline at end of file
+      io.openshift.build.versions="kubernetes=1.35.3"
\ No newline at end of file
diff --git a/deps/github.com/openshift/kubernetes/pkg/controller/devicetainteviction/device_taint_eviction.go b/deps/github.com/openshift/kubernetes/pkg/controller/devicetainteviction/device_taint_eviction.go
index d6075e98b3..b80042080c 100644
--- a/deps/github.com/openshift/kubernetes/pkg/controller/devicetainteviction/device_taint_eviction.go
+++ b/deps/github.com/openshift/kubernetes/pkg/controller/devicetainteviction/device_taint_eviction.go
@@ -434,6 +434,7 @@ func (tc *Controller) maybeDeletePod(ctx context.Context, podRef tainteviction.N
 			// Doing this immediately is not useful because
 			// it would just race with the informers update
 			// (rule status reads from cache!).
+			tc.logger.V(5).Info("Adding delayed status update because of pod eviction", "deviceTaintRule", klog.KObj(reason.rule), "delay", ruleStatusPeriod)
 			tc.workqueue.AddAfter(workItemForRule(reason.rule), ruleStatusPeriod)
 		}
 	}
@@ -1016,7 +1017,14 @@ func (tc *Controller) Run(ctx context.Context, numWorkers int) error {
 func (tc *Controller) evictPod(podRef tainteviction.NamespacedObject, eviction evictionAndReason) {
 	tc.deletePodAt[podRef] = eviction
 	now := time.Now()
-	tc.workqueue.AddAfter(workItem{podRef: podRef}, eviction.when.Sub(now))
+	delay := eviction.when.Sub(now)
+	if delay <= 0 {
+		tc.logger.V(3).Info("Adding immediate pod eviction", "pod", podRef, "eviction", eviction)
+		tc.workqueue.Add(workItem{podRef: podRef})
+	} else {
+		tc.logger.V(3).Info("Adding delayed pod eviction", "pod", podRef, "eviction", eviction, "delay", delay)
+		tc.workqueue.AddAfter(workItem{podRef: podRef}, delay)
+	}
 
 	if tc.evictPodHook != nil {
 		tc.evictPodHook(podRef, eviction)
@@ -1275,7 +1283,8 @@ func (tc *Controller) handleRuleChange(oldRule, newRule *resourcealpha.DeviceTai
 	}
 
 	if oldRule == nil {
-		// Update the status at least once.
+		// Update the status at least once, immediately and before evicting any pods.
+		tc.logger.V(5).Info("Adding immediate status update because of new rule", "deviceTaintRule", klog.KObj(newRule))
 		tc.workqueue.Add(workItemForRule(newRule))
 	}
 
@@ -1289,9 +1298,13 @@ func (tc *Controller) handleRuleChange(oldRule, newRule *resourcealpha.DeviceTai
 
 	if oldRule != nil &&
 		newRule != nil &&
-		oldRule.UID == newRule.UID &&
-		apiequality.Semantic.DeepEqual(&oldRule.Spec, &newRule.Spec) {
-		return
+		oldRule.UID == newRule.UID {
+		if apiequality.Semantic.DeepEqual(&oldRule.Spec, &newRule.Spec) {
+			return
+		}
+		// Update the status at least once, immediately and before evicting any pods.
+		tc.logger.V(5).Info("Adding immediate status update because of modified rule spec", "deviceTaintRule", klog.KObj(newRule))
+		tc.workqueue.Add(workItemForRule(newRule))
 	}
 
 	// Rule spec changes should be rare. Simply do a brute-force re-evaluation of all allocated claims.
@@ -1475,13 +1488,14 @@ func (tc *Controller) handlePod(pod *v1.Pod) {
 		return
 	}
 
-	tc.logger.V(3).Info("Going to evict pod", "pod", podRef, "eviction", eviction)
 	tc.evictPod(podRef, *eviction)
 
 	// If any reason is because of a taint, then eviction is in progress and the status may need to be updated.
+	// But don't do it immediately because more pod changes may be coming in.
 	for _, reason := range eviction.reason {
 		if reason.rule != nil {
-			tc.workqueue.Add(workItemForRule(reason.rule))
+			tc.logger.V(5).Info("Adding delayed status update because of pod change", "deviceTaintRule", klog.KObj(reason.rule), "delay", ruleStatusPeriod)
+			tc.workqueue.AddAfter(workItemForRule(reason.rule), ruleStatusPeriod)
 		}
 	}
 }
diff --git a/deps/github.com/openshift/kubernetes/pkg/controller/devicetainteviction/device_taint_eviction_test.go b/deps/github.com/openshift/kubernetes/pkg/controller/devicetainteviction/device_taint_eviction_test.go
index 3549be58ab..3da7d197e8 100644
--- a/deps/github.com/openshift/kubernetes/pkg/controller/devicetainteviction/device_taint_eviction_test.go
+++ b/deps/github.com/openshift/kubernetes/pkg/controller/devicetainteviction/device_taint_eviction_test.go
@@ -854,7 +854,7 @@ func TestController(t *testing.T) {
 			finalState: state{
 				allocatedClaims: l(ac(inUseClaim, newEvictionTime(taintTime, ruleEvict))),
 				deletePodAt:     evictMap{newObject(podWithClaimName): *newEvictionTime(taintTime, ruleEvict)},
-				queued:          MockState[workItem]{Ready: newWorkItems(ruleEvict, podWithClaimName)},
+				queued:          MockState[workItem]{Ready: newWorkItems(ruleEvict, podWithClaimName), Later: newDelayedWorkItems(ruleEvict, ruleStatusPeriod)},
 			},
 			process: []step{
 				{
@@ -882,23 +882,31 @@ func TestController(t *testing.T) {
 			finalState: state{
 				allocatedClaims: l(ac(inUseClaimWithToleration, newEvictionTime(metav1Time(taintTime.Add(tolerationDuration)), ruleEvict))),
 				deletePodAt:     evictMap{newObject(podWithClaimName): *newEvictionTime(metav1Time(taintTime.Add(tolerationDuration)), ruleEvict)},
-				queued:          MockState[workItem]{Ready: newWorkItems(ruleEvict), Later: newDelayedWorkItems(podWithClaimName, tolerationDuration)},
+				queued:          MockState[workItem]{Ready: newWorkItems(ruleEvict), Later: newDelayedWorkItems(podWithClaimName, tolerationDuration, ruleEvict, ruleStatusPeriod)},
 			},
 			process: []step{
 				{
 					// Initial update.
-					deletePodAt: evictMap{newObject(podWithClaimName): *newEvictionTime(metav1Time(taintTime.Add(tolerationDuration)), ruleEvict)},
-					pods:        l(podWithClaimName),
-					rules:       l(inProgress(ruleEvict, true, "PodsPendingEviction", "1 pod needs to be evicted in 1 namespace.", taintTime)),
-
-					queuedProcessed: MockState[workItem]{Later: newDelayedWorkItems(podWithClaimName, tolerationDuration)},
-					advance:         tolerationDuration,
+					deletePodAt:     evictMap{newObject(podWithClaimName): *newEvictionTime(metav1Time(taintTime.Add(tolerationDuration)), ruleEvict)},
+					pods:            l(podWithClaimName),
+					rules:           l(inProgress(ruleEvict, true, "PodsPendingEviction", "1 pod needs to be evicted in 1 namespace.", taintTime)),
+					queuedProcessed: MockState[workItem]{Later: newDelayedWorkItems(podWithClaimName, tolerationDuration, ruleEvict, ruleStatusPeriod)},
+					advance:         ruleStatusPeriod,
+					queuedShifted:   MockState[workItem]{Ready: newWorkItems(ruleEvict), Later: newDelayedWorkItems(podWithClaimName, tolerationDuration-ruleStatusPeriod)},
+				},
+				{
+					// Process the pod eviction.
+					deletePodAt:     evictMap{newObject(podWithClaimName): *newEvictionTime(metav1Time(taintTime.Add(tolerationDuration)), ruleEvict)},
+					pods:            l(podWithClaimName),
+					rules:           l(inProgress(ruleEvict, true, "PodsPendingEviction", "1 pod needs to be evicted in 1 namespace.", metav1Time(taintTime.Add(ruleStatusPeriod)))),
+					queuedProcessed: MockState[workItem]{Later: newDelayedWorkItems(podWithClaimName, tolerationDuration-ruleStatusPeriod)},
+					advance:         tolerationDuration - ruleStatusPeriod,
 					queuedShifted:   MockState[workItem]{Ready: newWorkItems(podWithClaimName)},
 				},
 				{
 					// Deleted, but condition not updated yet.
 					ruleStats:       map[types.UID]taintRuleStats{ruleEvict.UID: {numEvictedPods: 1}},
-					rules:           l(inProgress(ruleEvict, true, "PodsPendingEviction", "1 pod needs to be evicted in 1 namespace.", taintTime)),
+					rules:           l(inProgress(ruleEvict, true, "PodsPendingEviction", "1 pod needs to be evicted in 1 namespace.", metav1Time(taintTime.Add(ruleStatusPeriod)))),
 					queuedProcessed: MockState[workItem]{Later: newDelayedWorkItems(ruleEvict, ruleStatusPeriod)},
 					advance:         ruleStatusPeriod,
 					queuedShifted:   MockState[workItem]{Ready: newWorkItems(ruleEvict)},
@@ -922,7 +930,7 @@ func TestController(t *testing.T) {
 			finalState: state{
 				allocatedClaims: l(ac(inUseClaim, newEvictionTime(taintTime, ruleEvict)), ac(inUseClaimOtherNamespace, newEvictionTime(taintTime, ruleEvict))),
 				deletePodAt:     evictMap{newObject(podWithClaimName): *newEvictionTime(taintTime, ruleEvict), newObject(podWithClaimNameOtherNamespace): *newEvictionTime(taintTime, ruleEvict)},
-				queued:          MockState[workItem]{Ready: newWorkItems(ruleEvict, podWithClaimName, podWithClaimNameOtherNamespace)},
+				queued:          MockState[workItem]{Ready: newWorkItems(ruleEvict, podWithClaimName, podWithClaimNameOtherNamespace), Later: newDelayedWorkItems(ruleEvict, ruleStatusPeriod)},
 			},
 			process: []step{
 				{
@@ -952,7 +960,7 @@ func TestController(t *testing.T) {
 			finalState: state{
 				allocatedClaims: l(ac(inUseClaim, newEvictionTime(taintTime, ruleEvict)), ac(inUseClaimOtherName, newEvictionTime(taintTime, ruleEvict))),
 				deletePodAt:     evictMap{newObject(podWithClaimName): *newEvictionTime(taintTime, ruleEvict), newObject(podWithClaimNameOtherName): *newEvictionTime(taintTime, ruleEvict)},
-				queued:          MockState[workItem]{Ready: newWorkItems(ruleEvict, podWithClaimName, podWithClaimNameOtherName)},
+				queued:          MockState[workItem]{Ready: newWorkItems(ruleEvict, podWithClaimName, podWithClaimNameOtherName), Later: newDelayedWorkItems(ruleEvict, ruleStatusPeriod)},
 			},
 			process: []step{
 				{
@@ -1038,7 +1046,7 @@ func TestController(t *testing.T) {
 			finalState: state{
 				allocatedClaims: l(ac(inUseClaim, newEvictionTime(taintTime, ruleEvict)), ac(inUseClaimOtherNameShared, newEvictionTime(taintTime, ruleEvict))),
 				deletePodAt:     evictMap{newObject(podWithTwoClaimNames): *newEvictionTime(taintTime, ruleEvict)},
-				queued:          MockState[workItem]{Ready: newWorkItems(ruleEvict, podWithTwoClaimNames)},
+				queued:          MockState[workItem]{Ready: newWorkItems(ruleEvict, podWithTwoClaimNames), Later: newDelayedWorkItems(ruleEvict, ruleStatusPeriod)},
 			},
 			process: []step{
 				{
@@ -1078,7 +1086,7 @@ func TestController(t *testing.T) {
 			finalState: state{
 				allocatedClaims: l(ac(inUseClaim, newEvictionTime(taintTime, ruleEvictInstance1)), ac(inUseClaimOtherNameShared, newEvictionTime(taintTimeLater, ruleEvictInstance2Later))),
 				deletePodAt:     evictMap{newObject(podWithTwoClaimNames): *newEvictionTime(taintTime, ruleEvictInstance1, ruleEvictInstance2Later)},
-				queued:          MockState[workItem]{Ready: newWorkItems(ruleEvictInstance1, ruleEvictInstance2Later, podWithTwoClaimNames)},
+				queued:          MockState[workItem]{Ready: newWorkItems(ruleEvictInstance1, ruleEvictInstance2Later, podWithTwoClaimNames), Later: newDelayedWorkItems(ruleEvictInstance1, ruleStatusPeriod, ruleEvictInstance2Later, ruleStatusPeriod)},
 			},
 			process: []step{
 				{
@@ -1110,7 +1118,7 @@ func TestController(t *testing.T) {
 			finalState: state{
 				allocatedClaims: l(ac(inUseClaim, newEvictionTime(taintTime, ruleEvictInstance1)), ac(inUseClaimOtherNameShared, newEvictionTime(taintTimeLater, ruleEvictInstance2Later))),
 				deletePodAt:     evictMap{newObject(podWithTwoClaimNames): *newEvictionTime(taintTime, ruleEvictInstance1, ruleEvictInstance2Later)},
-				queued:          MockState[workItem]{Ready: newWorkItems(ruleEvictInstance1, ruleEvictInstance2Later, podWithTwoClaimNames), Later: newDelayedWorkItems(podWithTwoClaimNames, ruleEvictInstance2Later.Spec.Taint.TimeAdded.Sub(taintTime.Time))},
+				queued:          MockState[workItem]{Ready: newWorkItems(ruleEvictInstance1, ruleEvictInstance2Later, podWithTwoClaimNames), Later: newDelayedWorkItems(podWithTwoClaimNames, ruleEvictInstance2Later.Spec.Taint.TimeAdded.Sub(taintTime.Time), ruleEvictInstance2Later, ruleStatusPeriod, ruleEvictInstance1, ruleStatusPeriod)},
 			},
 			process: []step{
 				// The pod is scheduled for much later and time needs to advance a few times before it gets processed.
@@ -1118,7 +1126,7 @@ func TestController(t *testing.T) {
 					ruleStats: map[types.UID]taintRuleStats{ruleEvictInstance1.UID: {numEvictedPods: 1}, ruleEvictInstance2Later.UID: {numEvictedPods: 1}},
 					// Initial update of both rules before eviction.
 					rules:           l(inProgress(ruleEvictInstance1, true, "PodsPendingEviction", "1 pod needs to be evicted in 1 namespace.", taintTime), inProgress(ruleEvictInstance2Later, true, "PodsPendingEviction", "1 pod needs to be evicted in 1 namespace.", taintTime)),
-					queuedProcessed: MockState[workItem]{Later: newDelayedWorkItems(podWithTwoClaimNames, ruleEvictInstance2Later.Spec.Taint.TimeAdded.Sub(taintTime.Time), ruleEvictInstance1, ruleStatusPeriod, ruleEvictInstance2Later, ruleStatusPeriod)},
+					queuedProcessed: MockState[workItem]{Later: newDelayedWorkItems(podWithTwoClaimNames, ruleEvictInstance2Later.Spec.Taint.TimeAdded.Sub(taintTime.Time), ruleEvictInstance2Later, ruleStatusPeriod, ruleEvictInstance1, ruleStatusPeriod)},
 					advance:         ruleStatusPeriod,
 					queuedShifted:   MockState[workItem]{Ready: newWorkItems(ruleEvictInstance1, ruleEvictInstance2Later), Later: newDelayedWorkItems(podWithTwoClaimNames, ruleEvictInstance2Later.Spec.Taint.TimeAdded.Sub(taintTime.Time)-ruleStatusPeriod)},
 				},
@@ -1495,22 +1503,30 @@ func TestController(t *testing.T) {
 					return claim
 				}(), newEvictionTime(metav1Time(taintTime.Add(30*time.Second)), ruleEvict, ruleEvictOther, sliceTaintedTwice, sliceTaintedTwice.Spec.Devices[0].Name, 0, sliceTaintedTwice, sliceTaintedTwice.Spec.Devices[0].Name, 1))),
 				deletePodAt: evictMap{newObject(podWithClaimName): *newEvictionTime(metav1Time(taintTime.Add(30*time.Second)), ruleEvict, ruleEvictOther, sliceTaintedTwice, sliceTaintedTwice.Spec.Devices[0].Name, 0, sliceTaintedTwice, sliceTaintedTwice.Spec.Devices[0].Name, 1)},
-				queued:      MockState[workItem]{Ready: newWorkItems(ruleEvict, ruleEvictOther), Later: newDelayedWorkItems(podWithClaimName, 30*time.Second)},
+				queued:      MockState[workItem]{Ready: newWorkItems(ruleEvict, ruleEvictOther), Later: newDelayedWorkItems(podWithClaimName, 30*time.Second, ruleEvict, ruleStatusPeriod, ruleEvictOther, ruleStatusPeriod)},
 			},
 			process: []step{
-				// First advance time, then delete.
 				{
 					deletePodAt:     evictMap{newObject(podWithClaimName): *newEvictionTime(metav1Time(taintTime.Add(30*time.Second)), ruleEvict, ruleEvictOther, sliceTaintedTwice, sliceTaintedTwice.Spec.Devices[0].Name, 0, sliceTaintedTwice, sliceTaintedTwice.Spec.Devices[0].Name, 1)},
 					pods:            l(podWithClaimName),
 					rules:           l(inProgress(ruleEvict, true, "PodsPendingEviction", "1 pod needs to be evicted in 1 namespace.", taintTime), inProgress(ruleEvictOther, true, "PodsPendingEviction", "1 pod needs to be evicted in 1 namespace.", taintTime)),
-					queuedProcessed: MockState[workItem]{Later: newDelayedWorkItems(podWithClaimName, 30*time.Second)},
-					advance:         30 * time.Second,
+					queuedProcessed: MockState[workItem]{Later: newDelayedWorkItems(podWithClaimName, 30*time.Second, ruleEvict, ruleStatusPeriod, ruleEvictOther, ruleStatusPeriod)},
+					advance:         ruleStatusPeriod,
+					queuedShifted:   MockState[workItem]{Ready: newWorkItems(ruleEvict, ruleEvictOther), Later: newDelayedWorkItems(podWithClaimName, 30*time.Second-ruleStatusPeriod)},
+				},
+				// First advance time, then delete.
+				{
+					deletePodAt:     evictMap{newObject(podWithClaimName): *newEvictionTime(metav1Time(taintTime.Add(30*time.Second)), ruleEvict, ruleEvictOther, sliceTaintedTwice, sliceTaintedTwice.Spec.Devices[0].Name, 0, sliceTaintedTwice, sliceTaintedTwice.Spec.Devices[0].Name, 1)},
+					pods:            l(podWithClaimName),
+					rules:           l(inProgress(ruleEvict, true, "PodsPendingEviction", "1 pod needs to be evicted in 1 namespace.", metav1Time(taintTime.Add(ruleStatusPeriod))), inProgress(ruleEvictOther, true, "PodsPendingEviction", "1 pod needs to be evicted in 1 namespace.", metav1Time(taintTime.Add(ruleStatusPeriod)))),
+					queuedProcessed: MockState[workItem]{Later: newDelayedWorkItems(podWithClaimName, 20*time.Second)},
+					advance:         20 * time.Second,
 					queuedShifted:   MockState[workItem]{Ready: newWorkItems(podWithClaimName)},
 				},
 				{
 					ruleStats: map[types.UID]taintRuleStats{ruleEvict.UID: {numEvictedPods: 1}, ruleEvictOther.UID: {numEvictedPods: 1}},
 					// Not updated yet.
-					rules:           l(inProgress(ruleEvict, true, "PodsPendingEviction", "1 pod needs to be evicted in 1 namespace.", taintTime), inProgress(ruleEvictOther, true, "PodsPendingEviction", "1 pod needs to be evicted in 1 namespace.", taintTime)),
+					rules:           l(inProgress(ruleEvict, true, "PodsPendingEviction", "1 pod needs to be evicted in 1 namespace.", metav1Time(taintTime.Add(ruleStatusPeriod))), inProgress(ruleEvictOther, true, "PodsPendingEviction", "1 pod needs to be evicted in 1 namespace.", metav1Time(taintTime.Add(ruleStatusPeriod)))),
 					queuedProcessed: MockState[workItem]{Later: newDelayedWorkItems(ruleEvict, ruleStatusPeriod, ruleEvictOther, ruleStatusPeriod)},
 					advance:         ruleStatusPeriod,
 					queuedShifted:   MockState[workItem]{Ready: newWorkItems(ruleEvict, ruleEvictOther)},
@@ -1935,6 +1951,11 @@ func testHandlers(tContext *testContext, tc testCase) {
 		}
 	}
 
+	queueCmpOpts := []cmp.Option{
+		cmpopts.SortSlices(compareWorkItems),
+		cmpopts.SortSlices(compareDelayedWorkItems),
+	}
+
 	assertEqual(tContext, tc.finalState.ruleStats, tContext.taintRuleStats, "taintRuleStats")
 	assertEqual(tContext, tc.finalState.deletePodAt, tContext.deletePodAt, "deletePodAt")
 	assertEqual(tContext, tc.finalState.allocatedClaimsAsMap(), tContext.allocatedClaims, "allocated claims")
@@ -1943,7 +1964,7 @@ func testHandlers(tContext *testContext, tc testCase) {
 			assert.Equal(tContext, tc.finalState.slicesAsMap()[key], tContext.pools[key], "pool")
 		}
 	}
-	assertEqual(tContext, tc.finalState.queued, tContext.mockQueue.State(), "work queue after event handlers", cmpopts.SortSlices(compareWorkItems))
+	assertEqual(tContext, tc.finalState.queued, tContext.mockQueue.State(), "work queue after event handlers", queueCmpOpts...)
 	assert.Empty(tContext, tc.finalState.pods, "pods not checked for final state")
 	assert.Empty(tContext, tc.finalState.rules, "rules not checked for final state")
 
@@ -1972,13 +1993,14 @@ func testHandlers(tContext *testContext, tc testCase) {
 		assertEqual(tContext, state.rules, actualRules, prefix+"rules after flushing work queue")
 
 		// Advance time and potentially make pending work items ready.
-		assertEqual(tContext, state.queuedProcessed, tContext.mockQueue.State(), prefix+"work queue after processing", cmpopts.SortSlices(compareWorkItems))
+		assertEqual(tContext, state.queuedProcessed, tContext.mockQueue.State(), prefix+"work queue after processing", queueCmpOpts...)
 		time.Sleep(state.advance)
 		for _, item := range tContext.mockQueue.State().Later {
+			fmt.Println(item.Item, item.Duration)
 			tContext.mockQueue.CancelAfter(item.Item)
 			tContext.mockQueue.AddAfter(item.Item, item.Duration-state.advance)
 		}
-		assertEqual(tContext, state.queuedShifted, tContext.mockQueue.State(), prefix+"work queue after moving time forward", cmpopts.SortSlices(compareWorkItems))
+		assertEqual(tContext, state.queuedShifted, tContext.mockQueue.State(), prefix+"work queue after moving time forward", queueCmpOpts...)
 	}
 
 	assertEqual(tContext, tc.wantEvents, tContext.recorder.Events, "overall events",
@@ -2002,6 +2024,17 @@ func compareWorkItems(a, b workItem) int {
 	return strings.Compare(string(a.ruleRef.UID), string(b.ruleRef.UID))
 }
 
+func compareDelayedWorkItems(a, b MockDelayedItem[workItem]) int {
+	delta := a.Duration - b.Duration
+	if delta > 0 {
+		return 1
+	}
+	if delta < 0 {
+		return -1
+	}
+	return compareWorkItems(a.Item, b.Item)
+}
+
 func applyEventPair(tContext *testContext, event any) {
 	switch pair := event.(type) {
 	case [2]*resourceapi.ResourceSlice:
@@ -2393,7 +2426,9 @@ func testDeviceTaintRule(tCtx ktesting.TContext) {
 		wg.Wait()
 	}()
 	wg.Go(func() {
-		assert.NoError(tCtx, controller.Run(tCtx, 10 /* workers */), "eviction controller failed")
+		// Run with 1 worker to ensure sequential execution. Concurrent workers cause
+		// non-deterministic ordering of status updates, leading to flakes in Status assertions.
+		assert.NoError(tCtx, controller.Run(tCtx, 1 /* workers */), "eviction controller failed")
 	})
 
 	// Eventually the controller should have synced it's informers.
@@ -2425,10 +2460,11 @@ func testDeviceTaintRule(tCtx ktesting.TContext) {
 	rule, err := tCtx.Client().ResourceV1alpha3().DeviceTaintRules().Update(tCtx, rule, metav1.UpdateOptions{})
 	tCtx.ExpectNoError(err, "update rule")
 
-	// Wait for eviction. The rule gets updated with another delay.
+	// Wait for eviction.
 	tCtx.Wait()
 	evicted := metav1.Now()
 	tCtx.Logf("TIME: eviction done at %s", evicted)
+	// The rule status got updated once before evicting pods, but not yet after evicting it.
 	check(tCtx, "evict: ", l(inProgress(rule, true, "PodsPendingEviction", "1 pod needs to be evicted in 1 namespace.", &evicted)), nil)
 
 	// AddAfter does not move time forward. Do it ourselves...
@@ -2438,7 +2474,7 @@ func testDeviceTaintRule(tCtx ktesting.TContext) {
 	tCtx.Wait()
 	done := metav1.Now()
 	tCtx.Logf("TIME: done at %s", done)
-	check(tCtx, "done: ", l(inProgress(rule, false, "Completed", "1 pod evicted since starting the controller.", &slept)), nil)
+	check(tCtx, "done: ", l(inProgress(rule, false, "Completed", "1 pod evicted since starting the controller.", &done)), nil)
 	assertEqual(tCtx, map[types.UID]taintRuleStats{rule.UID: {numEvictedPods: 1}}, controller.taintRuleStats, "taint rule statistics should have counted the pod")
 
 	// Delete the rule and verify that we don't leak memory by still tracking it.
diff --git a/deps/github.com/openshift/kubernetes/pkg/features/kube_features.go b/deps/github.com/openshift/kubernetes/pkg/features/kube_features.go
index 5a6ee84351..bff6faf524 100644
--- a/deps/github.com/openshift/kubernetes/pkg/features/kube_features.go
+++ b/deps/github.com/openshift/kubernetes/pkg/features/kube_features.go
@@ -1514,7 +1514,7 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate
 
 	MaxUnavailableStatefulSet: {
 		{Version: version.MustParse("1.24"), Default: false, PreRelease: featuregate.Alpha},
-		{Version: version.MustParse("1.35"), Default: true, PreRelease: featuregate.Beta},
+		{Version: version.MustParse("1.35"), Default: false, PreRelease: featuregate.Beta},
 	},
 
 	MemoryManager: {
diff --git a/deps/github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver/examples/client-go/pkg/client/clientset/versioned/fake/clientset_generated.go b/deps/github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver/examples/client-go/pkg/client/clientset/versioned/fake/clientset_generated.go
index cfddc15ac9..07601ef8e6 100644
--- a/deps/github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver/examples/client-go/pkg/client/clientset/versioned/fake/clientset_generated.go
+++ b/deps/github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver/examples/client-go/pkg/client/clientset/versioned/fake/clientset_generated.go
@@ -35,10 +35,6 @@ import (
 // It's backed by a very simple object tracker that processes creates, updates and deletions as-is,
 // without applying any field management, validations and/or defaults. It shouldn't be considered a replacement
 // for a real clientset and is mostly useful in simple unit tests.
-//
-// Deprecated: NewClientset replaces this with support for field management, which significantly improves
-// server side apply testing. NewClientset is only available when apply configurations are generated (e.g.
-// via --with-applyconfig).
 func NewSimpleClientset(objects ...runtime.Object) *Clientset {
 	o := testing.NewObjectTracker(scheme, codecs.UniversalDecoder())
 	for _, obj := range objects {
@@ -99,6 +95,10 @@ func (c *Clientset) IsWatchListSemanticsUnSupported() bool {
 // It's backed by a very simple object tracker that processes creates, updates and deletions as-is,
 // without applying any validations and/or defaults. It shouldn't be considered a replacement
 // for a real clientset and is mostly useful in simple unit tests.
+//
+// Compared to NewSimpleClientset, the Clientset returned here supports field tracking and thus
+// server-side apply. Beware though that support in that for CRDs is missing
+// (https://github.com/kubernetes/kubernetes/issues/126850).
 func NewClientset(objects ...runtime.Object) *Clientset {
 	o := testing.NewFieldManagedObjectTracker(
 		scheme,
diff --git a/deps/github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/fake/clientset_generated.go b/deps/github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/fake/clientset_generated.go
index 76295e745e..88f7f242b6 100644
--- a/deps/github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/fake/clientset_generated.go
+++ b/deps/github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver/pkg/client/clientset/clientset/fake/clientset_generated.go
@@ -37,10 +37,6 @@ import (
 // It's backed by a very simple object tracker that processes creates, updates and deletions as-is,
 // without applying any field management, validations and/or defaults. It shouldn't be considered a replacement
 // for a real clientset and is mostly useful in simple unit tests.
-//
-// Deprecated: NewClientset replaces this with support for field management, which significantly improves
-// server side apply testing. NewClientset is only available when apply configurations are generated (e.g.
-// via --with-applyconfig).
 func NewSimpleClientset(objects ...runtime.Object) *Clientset {
 	o := testing.NewObjectTracker(scheme, codecs.UniversalDecoder())
 	for _, obj := range objects {
@@ -101,6 +97,10 @@ func (c *Clientset) IsWatchListSemanticsUnSupported() bool {
 // It's backed by a very simple object tracker that processes creates, updates and deletions as-is,
 // without applying any validations and/or defaults. It shouldn't be considered a replacement
 // for a real clientset and is mostly useful in simple unit tests.
+//
+// Compared to NewSimpleClientset, the Clientset returned here supports field tracking and thus
+// server-side apply. Beware though that support in that for CRDs is missing
+// (https://github.com/kubernetes/kubernetes/issues/126850).
 func NewClientset(objects ...runtime.Object) *Clientset {
 	o := testing.NewFieldManagedObjectTracker(
 		scheme,
diff --git a/deps/github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver/test/integration/finalization_test.go b/deps/github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver/test/integration/finalization_test.go
index 11435f45c2..a440b33284 100644
--- a/deps/github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver/test/integration/finalization_test.go
+++ b/deps/github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver/test/integration/finalization_test.go
@@ -23,6 +23,7 @@ import (
 
 	"github.com/stretchr/testify/require"
 
+	apiextensionshelpers "k8s.io/apiextensions-apiserver/pkg/apihelpers"
 	apiextensionsv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
 	"k8s.io/apiextensions-apiserver/test/integration/fixtures"
 	"k8s.io/apimachinery/pkg/api/errors"
@@ -30,6 +31,11 @@ import (
 	"k8s.io/apimachinery/pkg/util/wait"
 )
 
+const (
+	testNamespace = "not-the-default"
+	testFinalizer = "noxu.example.com/finalizer"
+)
+
 func TestFinalization(t *testing.T) {
 	tearDown, apiExtensionClient, dynamicClient, err := fixtures.StartDefaultServerWithClients(t)
 	require.NoError(t, err)
@@ -39,12 +45,12 @@ func TestFinalization(t *testing.T) {
 	noxuDefinition, err = fixtures.CreateNewV1CustomResourceDefinition(noxuDefinition, apiExtensionClient, dynamicClient)
 	require.NoError(t, err)
 
-	ns := "not-the-default"
+	ns := testNamespace
 	name := "foo123"
 	noxuResourceClient := newNamespacedCustomResourceClient(ns, dynamicClient, noxuDefinition)
 
 	instance := fixtures.NewNoxuInstance(ns, name)
-	instance.SetFinalizers([]string{"noxu.example.com/finalizer"})
+	instance.SetFinalizers([]string{testFinalizer})
 	createdNoxuInstance, err := instantiateCustomResource(t, instance, noxuResourceClient, noxuDefinition)
 	require.NoError(t, err)
 
@@ -104,12 +110,12 @@ func TestFinalizationAndDeletion(t *testing.T) {
 	require.NoError(t, err)
 
 	// Create a CR with a finalizer.
-	ns := "not-the-default"
+	ns := testNamespace
 	name := "foo123"
 	noxuResourceClient := newNamespacedCustomResourceClient(ns, dynamicClient, noxuDefinition)
 
 	instance := fixtures.NewNoxuInstance(ns, name)
-	instance.SetFinalizers([]string{"noxu.example.com/finalizer"})
+	instance.SetFinalizers([]string{testFinalizer})
 	createdNoxuInstance, err := instantiateCustomResource(t, instance, noxuResourceClient, noxuDefinition)
 	require.NoError(t, err)
 
@@ -171,7 +177,7 @@ func TestApplyCRDuringCRDFinalization(t *testing.T) {
 
 	// Create a CRD with a finalizer which will stall deletion
 	noxuDefinition := fixtures.NewNoxuV1CustomResourceDefinition(apiextensionsv1.ClusterScoped)
-	noxuDefinition.SetFinalizers([]string{"noxu.example.com/finalizer"})
+	noxuDefinition.SetFinalizers([]string{testFinalizer})
 	noxuDefinition, err = fixtures.CreateNewV1CustomResourceDefinition(noxuDefinition, apiExtensionClient, dynamicClient)
 	require.NoError(t, err)
 
@@ -179,20 +185,27 @@ func TestApplyCRDuringCRDFinalization(t *testing.T) {
 	err = apiExtensionClient.ApiextensionsV1().CustomResourceDefinitions().Delete(t.Context(), noxuDefinition.Name, metav1.DeleteOptions{})
 	require.NoError(t, err)
 
+	// Wait for the CRD to have the Terminating condition set to True.
+	// The handler checks IsCRDConditionTrue(crd, apiextensionsv1.Terminating) to block
+	// CR creation, and this condition is set asynchronously by the CRD finalizer controller
+	// after it observes the DeletionTimestamp. Without this wait, the Apply could succeed
+	// if it races ahead of the controller setting the condition.
+	err = wait.PollUntilContextTimeout(t.Context(), 100*time.Millisecond, wait.ForeverTestTimeout, true, func(ctx context.Context) (bool, error) {
+		crd, err := apiExtensionClient.ApiextensionsV1().CustomResourceDefinitions().Get(ctx, noxuDefinition.Name, metav1.GetOptions{})
+		if err != nil {
+			return false, err
+		}
+		return apiextensionshelpers.IsCRDConditionTrue(crd, apiextensionsv1.Terminating), nil
+	})
+	require.NoError(t, err, "timed out waiting for CRD Terminating condition to be set")
+
 	// Try to create a CR using SSA. This should fail due to the CRD validation
-	ns := "not-the-default"
+	ns := testNamespace
 	name := "foo123"
 	noxuResourceClient := newNamespacedCustomResourceClient(ns, dynamicClient, noxuDefinition)
 
-	err = wait.PollUntilContextTimeout(t.Context(), 100*time.Millisecond, wait.ForeverTestTimeout, true, func(ctx context.Context) (bool, error) {
-		instance := fixtures.NewNoxuInstance(ns, name)
-		_, err := noxuResourceClient.Apply(ctx, name, instance, metav1.ApplyOptions{DryRun: []string{"All"}, FieldManager: "manager"})
-		if err == nil {
-			t.Log("apply was not blocked, retrying...")
-			return false, nil
-		}
-		return true, err
-	})
+	instance := fixtures.NewNoxuInstance(ns, name)
+	_, err = noxuResourceClient.Apply(t.Context(), name, instance, metav1.ApplyOptions{DryRun: []string{"All"}, FieldManager: "manager"})
 	wantErr := `create not allowed while custom resource definition is terminating`
 	require.ErrorContains(t, err, wantErr)
 }
diff --git a/deps/github.com/openshift/kubernetes/staging/src/k8s.io/client-go/kubernetes/fake/clientset_generated.go b/deps/github.com/openshift/kubernetes/staging/src/k8s.io/client-go/kubernetes/fake/clientset_generated.go
index f729718bfb..c101c28306 100644
--- a/deps/github.com/openshift/kubernetes/staging/src/k8s.io/client-go/kubernetes/fake/clientset_generated.go
+++ b/deps/github.com/openshift/kubernetes/staging/src/k8s.io/client-go/kubernetes/fake/clientset_generated.go
@@ -143,10 +143,6 @@ import (
 // It's backed by a very simple object tracker that processes creates, updates and deletions as-is,
 // without applying any field management, validations and/or defaults. It shouldn't be considered a replacement
 // for a real clientset and is mostly useful in simple unit tests.
-//
-// Deprecated: NewClientset replaces this with support for field management, which significantly improves
-// server side apply testing. NewClientset is only available when apply configurations are generated (e.g.
-// via --with-applyconfig).
 func NewSimpleClientset(objects ...runtime.Object) *Clientset {
 	o := testing.NewObjectTracker(scheme, codecs.UniversalDecoder())
 	for _, obj := range objects {
@@ -207,6 +203,10 @@ func (c *Clientset) IsWatchListSemanticsUnSupported() bool {
 // It's backed by a very simple object tracker that processes creates, updates and deletions as-is,
 // without applying any validations and/or defaults. It shouldn't be considered a replacement
 // for a real clientset and is mostly useful in simple unit tests.
+//
+// Compared to NewSimpleClientset, the Clientset returned here supports field tracking and thus
+// server-side apply. Beware though that support in that for CRDs is missing
+// (https://github.com/kubernetes/kubernetes/issues/126850).
 func NewClientset(objects ...runtime.Object) *Clientset {
 	o := testing.NewFieldManagedObjectTracker(
 		scheme,
diff --git a/deps/github.com/openshift/kubernetes/staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake/generator_fake_for_clientset.go b/deps/github.com/openshift/kubernetes/staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake/generator_fake_for_clientset.go
index c5df71d666..9391908f23 100644
--- a/deps/github.com/openshift/kubernetes/staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake/generator_fake_for_clientset.go
+++ b/deps/github.com/openshift/kubernetes/staging/src/k8s.io/code-generator/cmd/client-gen/generators/fake/generator_fake_for_clientset.go
@@ -124,6 +124,10 @@ var managedFieldsClientset = `
 // It's backed by a very simple object tracker that processes creates, updates and deletions as-is,
 // without applying any validations and/or defaults. It shouldn't be considered a replacement
 // for a real clientset and is mostly useful in simple unit tests.
+//
+// Compared to NewSimpleClientset, the Clientset returned here supports field tracking and thus
+// server-side apply. Beware though that support in that for CRDs is missing
+// (https://github.com/kubernetes/kubernetes/issues/126850).
 func NewClientset(objects ...runtime.Object) *Clientset {
 	o := testing.NewFieldManagedObjectTracker(
 		scheme,
@@ -162,10 +166,6 @@ var common = `
 // It's backed by a very simple object tracker that processes creates, updates and deletions as-is,
 // without applying any field management, validations and/or defaults. It shouldn't be considered a replacement
 // for a real clientset and is mostly useful in simple unit tests.
-//
-// Deprecated: NewClientset replaces this with support for field management, which significantly improves
-// server side apply testing. NewClientset is only available when apply configurations are generated (e.g.
-// via --with-applyconfig).
 func NewSimpleClientset(objects ...runtime.Object) *Clientset {
 	o := testing.NewObjectTracker(scheme, codecs.UniversalDecoder())
 	for _, obj := range objects {
diff --git a/deps/github.com/openshift/kubernetes/staging/src/k8s.io/code-generator/examples/HyphenGroup/clientset/versioned/fake/clientset_generated.go b/deps/github.com/openshift/kubernetes/staging/src/k8s.io/code-generator/examples/HyphenGroup/clientset/versioned/fake/clientset_generated.go
index e7219ba44e..4d7e13bb1c 100644
--- a/deps/github.com/openshift/kubernetes/staging/src/k8s.io/code-generator/examples/HyphenGroup/clientset/versioned/fake/clientset_generated.go
+++ b/deps/github.com/openshift/kubernetes/staging/src/k8s.io/code-generator/examples/HyphenGroup/clientset/versioned/fake/clientset_generated.go
@@ -35,10 +35,6 @@ import (
 // It's backed by a very simple object tracker that processes creates, updates and deletions as-is,
 // without applying any field management, validations and/or defaults. It shouldn't be considered a replacement
 // for a real clientset and is mostly useful in simple unit tests.
-//
-// Deprecated: NewClientset replaces this with support for field management, which significantly improves
-// server side apply testing. NewClientset is only available when apply configurations are generated (e.g.
-// via --with-applyconfig).
 func NewSimpleClientset(objects ...runtime.Object) *Clientset {
 	o := testing.NewObjectTracker(scheme, codecs.UniversalDecoder())
 	for _, obj := range objects {
@@ -99,6 +95,10 @@ func (c *Clientset) IsWatchListSemanticsUnSupported() bool {
 // It's backed by a very simple object tracker that processes creates, updates and deletions as-is,
 // without applying any validations and/or defaults. It shouldn't be considered a replacement
 // for a real clientset and is mostly useful in simple unit tests.
+//
+// Compared to NewSimpleClientset, the Clientset returned here supports field tracking and thus
+// server-side apply. Beware though that support in that for CRDs is missing
+// (https://github.com/kubernetes/kubernetes/issues/126850).
 func NewClientset(objects ...runtime.Object) *Clientset {
 	o := testing.NewFieldManagedObjectTracker(
 		scheme,
diff --git a/deps/github.com/openshift/kubernetes/staging/src/k8s.io/code-generator/examples/MixedCase/clientset/versioned/fake/clientset_generated.go b/deps/github.com/openshift/kubernetes/staging/src/k8s.io/code-generator/examples/MixedCase/clientset/versioned/fake/clientset_generated.go
index 7f3eae52a7..a152ce9f18 100644
--- a/deps/github.com/openshift/kubernetes/staging/src/k8s.io/code-generator/examples/MixedCase/clientset/versioned/fake/clientset_generated.go
+++ b/deps/github.com/openshift/kubernetes/staging/src/k8s.io/code-generator/examples/MixedCase/clientset/versioned/fake/clientset_generated.go
@@ -35,10 +35,6 @@ import (
 // It's backed by a very simple object tracker that processes creates, updates and deletions as-is,
 // without applying any field management, validations and/or defaults. It shouldn't be considered a replacement
 // for a real clientset and is mostly useful in simple unit tests.
-//
-// Deprecated: NewClientset replaces this with support for field management, which significantly improves
-// server side apply testing. NewClientset is only available when apply configurations are generated (e.g.
-// via --with-applyconfig).
 func NewSimpleClientset(objects ...runtime.Object) *Clientset {
 	o := testing.NewObjectTracker(scheme, codecs.UniversalDecoder())
 	for _, obj := range objects {
@@ -99,6 +95,10 @@ func (c *Clientset) IsWatchListSemanticsUnSupported() bool {
 // It's backed by a very simple object tracker that processes creates, updates and deletions as-is,
 // without applying any validations and/or defaults. It shouldn't be considered a replacement
 // for a real clientset and is mostly useful in simple unit tests.
+//
+// Compared to NewSimpleClientset, the Clientset returned here supports field tracking and thus
+// server-side apply. Beware though that support in that for CRDs is missing
+// (https://github.com/kubernetes/kubernetes/issues/126850).
 func NewClientset(objects ...runtime.Object) *Clientset {
 	o := testing.NewFieldManagedObjectTracker(
 		scheme,
diff --git a/deps/github.com/openshift/kubernetes/staging/src/k8s.io/code-generator/examples/apiserver/clientset/versioned/fake/clientset_generated.go b/deps/github.com/openshift/kubernetes/staging/src/k8s.io/code-generator/examples/apiserver/clientset/versioned/fake/clientset_generated.go
index 0ac684823a..9ae0dd7c14 100644
--- a/deps/github.com/openshift/kubernetes/staging/src/k8s.io/code-generator/examples/apiserver/clientset/versioned/fake/clientset_generated.go
+++ b/deps/github.com/openshift/kubernetes/staging/src/k8s.io/code-generator/examples/apiserver/clientset/versioned/fake/clientset_generated.go
@@ -40,10 +40,6 @@ import (
 // It's backed by a very simple object tracker that processes creates, updates and deletions as-is,
 // without applying any field management, validations and/or defaults. It shouldn't be considered a replacement
 // for a real clientset and is mostly useful in simple unit tests.
-//
-// Deprecated: NewClientset replaces this with support for field management, which significantly improves
-// server side apply testing. NewClientset is only available when apply configurations are generated (e.g.
-// via --with-applyconfig).
 func NewSimpleClientset(objects ...runtime.Object) *Clientset {
 	o := testing.NewObjectTracker(scheme, codecs.UniversalDecoder())
 	for _, obj := range objects {
diff --git a/deps/github.com/openshift/kubernetes/staging/src/k8s.io/code-generator/examples/crd/clientset/versioned/fake/clientset_generated.go b/deps/github.com/openshift/kubernetes/staging/src/k8s.io/code-generator/examples/crd/clientset/versioned/fake/clientset_generated.go
index 982ffd605c..c14bdff76d 100644
--- a/deps/github.com/openshift/kubernetes/staging/src/k8s.io/code-generator/examples/crd/clientset/versioned/fake/clientset_generated.go
+++ b/deps/github.com/openshift/kubernetes/staging/src/k8s.io/code-generator/examples/crd/clientset/versioned/fake/clientset_generated.go
@@ -41,10 +41,6 @@ import (
 // It's backed by a very simple object tracker that processes creates, updates and deletions as-is,
 // without applying any field management, validations and/or defaults. It shouldn't be considered a replacement
 // for a real clientset and is mostly useful in simple unit tests.
-//
-// Deprecated: NewClientset replaces this with support for field management, which significantly improves
-// server side apply testing. NewClientset is only available when apply configurations are generated (e.g.
-// via --with-applyconfig).
 func NewSimpleClientset(objects ...runtime.Object) *Clientset {
 	o := testing.NewObjectTracker(scheme, codecs.UniversalDecoder())
 	for _, obj := range objects {
@@ -105,6 +101,10 @@ func (c *Clientset) IsWatchListSemanticsUnSupported() bool {
 // It's backed by a very simple object tracker that processes creates, updates and deletions as-is,
 // without applying any validations and/or defaults. It shouldn't be considered a replacement
 // for a real clientset and is mostly useful in simple unit tests.
+//
+// Compared to NewSimpleClientset, the Clientset returned here supports field tracking and thus
+// server-side apply. Beware though that support in that for CRDs is missing
+// (https://github.com/kubernetes/kubernetes/issues/126850).
 func NewClientset(objects ...runtime.Object) *Clientset {
 	o := testing.NewFieldManagedObjectTracker(
 		scheme,
diff --git a/deps/github.com/openshift/kubernetes/staging/src/k8s.io/code-generator/examples/single/clientset/versioned/fake/clientset_generated.go b/deps/github.com/openshift/kubernetes/staging/src/k8s.io/code-generator/examples/single/clientset/versioned/fake/clientset_generated.go
index 14c4a2df62..f30bfa095e 100644
--- a/deps/github.com/openshift/kubernetes/staging/src/k8s.io/code-generator/examples/single/clientset/versioned/fake/clientset_generated.go
+++ b/deps/github.com/openshift/kubernetes/staging/src/k8s.io/code-generator/examples/single/clientset/versioned/fake/clientset_generated.go
@@ -35,10 +35,6 @@ import (
 // It's backed by a very simple object tracker that processes creates, updates and deletions as-is,
 // without applying any field management, validations and/or defaults. It shouldn't be considered a replacement
 // for a real clientset and is mostly useful in simple unit tests.
-//
-// Deprecated: NewClientset replaces this with support for field management, which significantly improves
-// server side apply testing. NewClientset is only available when apply configurations are generated (e.g.
-// via --with-applyconfig).
 func NewSimpleClientset(objects ...runtime.Object) *Clientset {
 	o := testing.NewObjectTracker(scheme, codecs.UniversalDecoder())
 	for _, obj := range objects {
@@ -99,6 +95,10 @@ func (c *Clientset) IsWatchListSemanticsUnSupported() bool {
 // It's backed by a very simple object tracker that processes creates, updates and deletions as-is,
 // without applying any validations and/or defaults. It shouldn't be considered a replacement
 // for a real clientset and is mostly useful in simple unit tests.
+//
+// Compared to NewSimpleClientset, the Clientset returned here supports field tracking and thus
+// server-side apply. Beware though that support in that for CRDs is missing
+// (https://github.com/kubernetes/kubernetes/issues/126850).
 func NewClientset(objects ...runtime.Object) *Clientset {
 	o := testing.NewFieldManagedObjectTracker(
 		scheme,
diff --git a/deps/github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/fake/clientset_generated.go b/deps/github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/fake/clientset_generated.go
index 534d62d119..4ea47bd4c8 100644
--- a/deps/github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/fake/clientset_generated.go
+++ b/deps/github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator/pkg/client/clientset_generated/clientset/fake/clientset_generated.go
@@ -36,10 +36,6 @@ import (
 // It's backed by a very simple object tracker that processes creates, updates and deletions as-is,
 // without applying any field management, validations and/or defaults. It shouldn't be considered a replacement
 // for a real clientset and is mostly useful in simple unit tests.
-//
-// Deprecated: NewClientset replaces this with support for field management, which significantly improves
-// server side apply testing. NewClientset is only available when apply configurations are generated (e.g.
-// via --with-applyconfig).
 func NewSimpleClientset(objects ...runtime.Object) *Clientset {
 	o := testing.NewObjectTracker(scheme, codecs.UniversalDecoder())
 	for _, obj := range objects {
diff --git a/deps/github.com/openshift/kubernetes/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/fake/clientset_generated.go b/deps/github.com/openshift/kubernetes/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/fake/clientset_generated.go
index be4bb94e56..0748ac12ce 100644
--- a/deps/github.com/openshift/kubernetes/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/fake/clientset_generated.go
+++ b/deps/github.com/openshift/kubernetes/staging/src/k8s.io/metrics/pkg/client/clientset/versioned/fake/clientset_generated.go
@@ -36,10 +36,6 @@ import (
 // It's backed by a very simple object tracker that processes creates, updates and deletions as-is,
 // without applying any field management, validations and/or defaults. It shouldn't be considered a replacement
 // for a real clientset and is mostly useful in simple unit tests.
-//
-// Deprecated: NewClientset replaces this with support for field management, which significantly improves
-// server side apply testing. NewClientset is only available when apply configurations are generated (e.g.
-// via --with-applyconfig).
 func NewSimpleClientset(objects ...runtime.Object) *Clientset {
 	o := testing.NewObjectTracker(scheme, codecs.UniversalDecoder())
 	for _, obj := range objects {
diff --git a/deps/github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/fake/clientset_generated.go b/deps/github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/fake/clientset_generated.go
index a2a7930853..7b4403bf97 100644
--- a/deps/github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/fake/clientset_generated.go
+++ b/deps/github.com/openshift/kubernetes/staging/src/k8s.io/sample-apiserver/pkg/generated/clientset/versioned/fake/clientset_generated.go
@@ -37,10 +37,6 @@ import (
 // It's backed by a very simple object tracker that processes creates, updates and deletions as-is,
 // without applying any field management, validations and/or defaults. It shouldn't be considered a replacement
 // for a real clientset and is mostly useful in simple unit tests.
-//
-// Deprecated: NewClientset replaces this with support for field management, which significantly improves
-// server side apply testing. NewClientset is only available when apply configurations are generated (e.g.
-// via --with-applyconfig).
 func NewSimpleClientset(objects ...runtime.Object) *Clientset {
 	o := testing.NewObjectTracker(scheme, codecs.UniversalDecoder())
 	for _, obj := range objects {
@@ -101,6 +97,10 @@ func (c *Clientset) IsWatchListSemanticsUnSupported() bool {
 // It's backed by a very simple object tracker that processes creates, updates and deletions as-is,
 // without applying any validations and/or defaults. It shouldn't be considered a replacement
 // for a real clientset and is mostly useful in simple unit tests.
+//
+// Compared to NewSimpleClientset, the Clientset returned here supports field tracking and thus
+// server-side apply. Beware though that support in that for CRDs is missing
+// (https://github.com/kubernetes/kubernetes/issues/126850).
 func NewClientset(objects ...runtime.Object) *Clientset {
 	o := testing.NewFieldManagedObjectTracker(
 		scheme,
diff --git a/deps/github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller/pkg/generated/clientset/versioned/fake/clientset_generated.go b/deps/github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller/pkg/generated/clientset/versioned/fake/clientset_generated.go
index 4fe43173e3..23aba26f37 100644
--- a/deps/github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller/pkg/generated/clientset/versioned/fake/clientset_generated.go
+++ b/deps/github.com/openshift/kubernetes/staging/src/k8s.io/sample-controller/pkg/generated/clientset/versioned/fake/clientset_generated.go
@@ -34,10 +34,6 @@ import (
 // It's backed by a very simple object tracker that processes creates, updates and deletions as-is,
 // without applying any field management, validations and/or defaults. It shouldn't be considered a replacement
 // for a real clientset and is mostly useful in simple unit tests.
-//
-// Deprecated: NewClientset replaces this with support for field management, which significantly improves
-// server side apply testing. NewClientset is only available when apply configurations are generated (e.g.
-// via --with-applyconfig).
 func NewSimpleClientset(objects ...runtime.Object) *Clientset {
 	o := testing.NewObjectTracker(scheme, codecs.UniversalDecoder())
 	for _, obj := range objects {
diff --git a/deps/github.com/openshift/kubernetes/test/compatibility_lifecycle/reference/versioned_feature_list.yaml b/deps/github.com/openshift/kubernetes/test/compatibility_lifecycle/reference/versioned_feature_list.yaml
index 8cbe2d3425..a803c87a98 100644
--- a/deps/github.com/openshift/kubernetes/test/compatibility_lifecycle/reference/versioned_feature_list.yaml
+++ b/deps/github.com/openshift/kubernetes/test/compatibility_lifecycle/reference/versioned_feature_list.yaml
@@ -1053,7 +1053,7 @@
     lockToDefault: false
     preRelease: Alpha
     version: "1.24"
-  - default: true
+  - default: false
     lockToDefault: false
     preRelease: Beta
     version: "1.35"
diff --git a/deps/github.com/openshift/kubernetes/test/e2e/node/pods.go b/deps/github.com/openshift/kubernetes/test/e2e/node/pods.go
index 2cbf75c654..c3f78eb8f4 100644
--- a/deps/github.com/openshift/kubernetes/test/e2e/node/pods.go
+++ b/deps/github.com/openshift/kubernetes/test/e2e/node/pods.go
@@ -695,7 +695,7 @@ var _ = SIGDescribe("Pods Extended (pod generation)", func() {
 			// Set the pod image to something that doesn't exist to induce a pull error
 			// to start with.
 			agnImage := pod.Spec.Containers[0].Image
-			pod.Spec.Containers[0].Image = "some-image-that-doesnt-exist"
+			pod.Spec.Containers[0].Image = "localhost/some-image-that-doesnt-exist"
 
 			ginkgo.By("submitting the pod to kubernetes")
 			pod, err := f.ClientSet.CoreV1().Pods(f.Namespace.Name).Create(ctx, pod, metav1.CreateOptions{})
diff --git a/deps/github.com/openshift/kubernetes/test/integration/dra/binding_conditions_test.go b/deps/github.com/openshift/kubernetes/test/integration/dra/binding_conditions_test.go
index 35041c685d..2f1b00fd18 100644
--- a/deps/github.com/openshift/kubernetes/test/integration/dra/binding_conditions_test.go
+++ b/deps/github.com/openshift/kubernetes/test/integration/dra/binding_conditions_test.go
@@ -60,7 +60,6 @@ func testDeviceBindingConditions(tCtx ktesting.TContext, enabled bool) {
 func testDeviceBindingConditionsBasicFlow(tCtx ktesting.TContext, enabled bool) {
 	namespace := createTestNamespace(tCtx, nil)
 	class, driverName := createTestClass(tCtx, namespace)
-	startScheduler(tCtx)
 
 	slice := &resourceapi.ResourceSlice{
 		ObjectMeta: metav1.ObjectMeta{
@@ -117,6 +116,7 @@ func testDeviceBindingConditionsBasicFlow(tCtx ktesting.TContext, enabled bool)
 	_, err = tCtx.Client().ResourceV1().ResourceSlices().Create(tCtx, sliceWithoutBinding, metav1.CreateOptions{FieldValidation: "Strict"})
 	tCtx.ExpectNoError(err, "create slice without binding conditions")
 
+	startScheduler(tCtx)
 	// Schedule first pod and wait for the scheduler to reach the binding phase, which marks the claim as allocated.
 	start := time.Now()
 	claim1 := createClaim(tCtx, namespace, "-a", class, claim)
diff --git a/etcd/go.mod b/etcd/go.mod
index 87e070fb3d..cb42395582 100644
--- a/etcd/go.mod
+++ b/etcd/go.mod
@@ -10,11 +10,11 @@ require (
 	github.com/openshift/microshift v0.0.0-00010101000000-000000000000
 	github.com/spf13/cobra v1.10.2
 	go.etcd.io/etcd/server/v3 v3.6.5
-	k8s.io/apimachinery v1.35.2
-	k8s.io/cli-runtime v1.35.2
-	k8s.io/component-base v1.35.2
+	k8s.io/apimachinery v1.35.3
+	k8s.io/cli-runtime v1.35.3
+	k8s.io/component-base v1.35.3
 	k8s.io/klog/v2 v2.140.0
-	k8s.io/kubectl v1.35.2
+	k8s.io/kubectl v1.35.3
 	sigs.k8s.io/yaml v1.6.0
 )
 
@@ -98,11 +98,11 @@ require (
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171 // indirect
 	gopkg.in/evanphx/json-patch.v4 v4.13.0 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
-	k8s.io/api v1.35.2 // indirect
-	k8s.io/apiserver v1.35.2 // indirect
-	k8s.io/client-go v1.35.2 // indirect
+	k8s.io/api v1.35.3 // indirect
+	k8s.io/apiserver v1.35.3 // indirect
+	k8s.io/client-go v1.35.3 // indirect
 	k8s.io/kube-openapi v0.0.0-20260304202019-5b3e3fdb0acf // indirect
-	k8s.io/kubelet v1.35.2 // indirect
+	k8s.io/kubelet v1.35.3 // indirect
 	k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2 // indirect
 	sigs.k8s.io/kustomize/api v0.20.1 // indirect
 	sigs.k8s.io/kustomize/kyaml v0.20.1 // indirect
diff --git a/etcd/vendor/modules.txt b/etcd/vendor/modules.txt
index 2991cb9472..13d96b16ec 100644
--- a/etcd/vendor/modules.txt
+++ b/etcd/vendor/modules.txt
@@ -664,7 +664,7 @@ gopkg.in/inf.v0
 # gopkg.in/natefinch/lumberjack.v2 v2.2.1
 ## explicit; go 1.13
 gopkg.in/natefinch/lumberjack.v2
-# k8s.io/api v1.35.2 => ../deps/github.com/openshift/kubernetes/staging/src/k8s.io/api
+# k8s.io/api v1.35.3 => ../deps/github.com/openshift/kubernetes/staging/src/k8s.io/api
 ## explicit; go 1.25.0
 k8s.io/api/admission/v1
 k8s.io/api/admission/v1beta1
@@ -726,7 +726,7 @@ k8s.io/api/storage/v1
 k8s.io/api/storage/v1alpha1
 k8s.io/api/storage/v1beta1
 k8s.io/api/storagemigration/v1beta1
-# k8s.io/apimachinery v1.35.2 => ../deps/github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery
+# k8s.io/apimachinery v1.35.3 => ../deps/github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery
 ## explicit; go 1.25.0
 k8s.io/apimachinery/pkg/api/equality
 k8s.io/apimachinery/pkg/api/errors
@@ -785,18 +785,18 @@ k8s.io/apimachinery/pkg/version
 k8s.io/apimachinery/pkg/watch
 k8s.io/apimachinery/third_party/forked/golang/json
 k8s.io/apimachinery/third_party/forked/golang/reflect
-# k8s.io/apiserver v1.35.2 => ../deps/github.com/openshift/kubernetes/staging/src/k8s.io/apiserver
+# k8s.io/apiserver v1.35.3 => ../deps/github.com/openshift/kubernetes/staging/src/k8s.io/apiserver
 ## explicit; go 1.25.0
 k8s.io/apiserver/pkg/apis/audit
 k8s.io/apiserver/pkg/apis/audit/v1
 k8s.io/apiserver/pkg/authentication/user
-# k8s.io/cli-runtime v1.35.2 => ../deps/github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime
+# k8s.io/cli-runtime v1.35.3 => ../deps/github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime
 ## explicit; go 1.25.0
 k8s.io/cli-runtime/pkg/genericclioptions
 k8s.io/cli-runtime/pkg/genericiooptions
 k8s.io/cli-runtime/pkg/printers
 k8s.io/cli-runtime/pkg/resource
-# k8s.io/client-go v1.35.2 => ../deps/github.com/openshift/kubernetes/staging/src/k8s.io/client-go
+# k8s.io/client-go v1.35.3 => ../deps/github.com/openshift/kubernetes/staging/src/k8s.io/client-go
 ## explicit; go 1.25.0
 k8s.io/client-go/applyconfigurations/admissionregistration/v1
 k8s.io/client-go/applyconfigurations/admissionregistration/v1alpha1
@@ -951,7 +951,7 @@ k8s.io/client-go/util/homedir
 k8s.io/client-go/util/jsonpath
 k8s.io/client-go/util/keyutil
 k8s.io/client-go/util/workqueue
-# k8s.io/component-base v1.35.2 => ../deps/github.com/openshift/kubernetes/staging/src/k8s.io/component-base
+# k8s.io/component-base v1.35.3 => ../deps/github.com/openshift/kubernetes/staging/src/k8s.io/component-base
 ## explicit; go 1.25.0
 k8s.io/component-base/cli
 k8s.io/component-base/cli/flag
@@ -989,7 +989,7 @@ k8s.io/kube-openapi/pkg/util
 k8s.io/kube-openapi/pkg/util/proto
 k8s.io/kube-openapi/pkg/util/proto/validation
 k8s.io/kube-openapi/pkg/validation/spec
-# k8s.io/kubectl v1.35.2 => ../deps/github.com/openshift/kubernetes/staging/src/k8s.io/kubectl
+# k8s.io/kubectl v1.35.3 => ../deps/github.com/openshift/kubernetes/staging/src/k8s.io/kubectl
 ## explicit; go 1.25.0
 k8s.io/kubectl/pkg/cmd/util
 k8s.io/kubectl/pkg/scheme
@@ -999,7 +999,7 @@ k8s.io/kubectl/pkg/util/openapi
 k8s.io/kubectl/pkg/util/templates
 k8s.io/kubectl/pkg/util/term
 k8s.io/kubectl/pkg/validation
-# k8s.io/kubelet v1.35.2 => ../deps/github.com/openshift/kubernetes/staging/src/k8s.io/kubelet
+# k8s.io/kubelet v1.35.3 => ../deps/github.com/openshift/kubernetes/staging/src/k8s.io/kubelet
 ## explicit; go 1.25.0
 k8s.io/kubelet/pkg/apis/deviceplugin/v1beta1
 # k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2
diff --git a/go.mod b/go.mod
index 2d1e2bd8c9..7ba2a10a32 100644
--- a/go.mod
+++ b/go.mod
@@ -38,17 +38,17 @@ require (
 	github.com/prometheus/prometheus v0.302.1
 	github.com/squat/generic-device-plugin v0.0.0-20251019101956-043a51e18f31
 	gopkg.in/yaml.v2 v2.4.0
-	k8s.io/api v1.35.2
-	k8s.io/apiextensions-apiserver v1.35.2
-	k8s.io/apimachinery v1.35.2
-	k8s.io/apiserver v1.35.2
-	k8s.io/cli-runtime v1.35.2
-	k8s.io/client-go v1.35.2
-	k8s.io/cloud-provider v1.35.2
-	k8s.io/component-base v1.35.2
-	k8s.io/kube-aggregator v1.35.2
-	k8s.io/kubectl v1.35.2
-	k8s.io/kubelet v1.35.2
+	k8s.io/api v1.35.3
+	k8s.io/apiextensions-apiserver v1.35.3
+	k8s.io/apimachinery v1.35.3
+	k8s.io/apiserver v1.35.3
+	k8s.io/cli-runtime v1.35.3
+	k8s.io/client-go v1.35.3
+	k8s.io/cloud-provider v1.35.3
+	k8s.io/component-base v1.35.3
+	k8s.io/kube-aggregator v1.35.3
+	k8s.io/kubectl v1.35.3
+	k8s.io/kubelet v1.35.3
 	k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2
 	sigs.k8s.io/kube-storage-version-migrator v0.0.6-0.20230721195810-5c8923c5ff96
 	sigs.k8s.io/kustomize/api v0.20.1
@@ -171,22 +171,22 @@ require (
 	gopkg.in/go-jose/go-jose.v2 v2.6.3 // indirect
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/natefinch/lumberjack.v2 v2.2.1 // indirect
-	k8s.io/cluster-bootstrap v1.35.2 // indirect
-	k8s.io/component-helpers v1.35.2 // indirect
-	k8s.io/controller-manager v1.35.2 // indirect
-	k8s.io/cri-api v1.35.2 // indirect
-	k8s.io/cri-client v1.35.2 // indirect
-	k8s.io/csi-translation-lib v1.35.2 // indirect
-	k8s.io/dynamic-resource-allocation v1.35.2 // indirect
-	k8s.io/endpointslice v1.35.2 // indirect
-	k8s.io/externaljwt v1.35.2 // indirect
-	k8s.io/kms v1.35.2 // indirect
-	k8s.io/kube-controller-manager v1.35.2 // indirect
-	k8s.io/kube-proxy v1.35.2 // indirect
-	k8s.io/kube-scheduler v1.35.2 // indirect
-	k8s.io/metrics v1.35.2 // indirect
-	k8s.io/mount-utils v1.35.2 // indirect
-	k8s.io/pod-security-admission v1.35.2 // indirect
+	k8s.io/cluster-bootstrap v1.35.3 // indirect
+	k8s.io/component-helpers v1.35.3 // indirect
+	k8s.io/controller-manager v1.35.3 // indirect
+	k8s.io/cri-api v1.35.3 // indirect
+	k8s.io/cri-client v1.35.3 // indirect
+	k8s.io/csi-translation-lib v1.35.3 // indirect
+	k8s.io/dynamic-resource-allocation v1.35.3 // indirect
+	k8s.io/endpointslice v1.35.3 // indirect
+	k8s.io/externaljwt v1.35.3 // indirect
+	k8s.io/kms v1.35.3 // indirect
+	k8s.io/kube-controller-manager v1.35.3 // indirect
+	k8s.io/kube-proxy v1.35.3 // indirect
+	k8s.io/kube-scheduler v1.35.3 // indirect
+	k8s.io/metrics v1.35.3 // indirect
+	k8s.io/mount-utils v1.35.3 // indirect
+	k8s.io/pod-security-admission v1.35.3 // indirect
 	sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.34.0 // indirect
 	sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 // indirect
 	sigs.k8s.io/randfill v1.0.0 // indirect
@@ -226,7 +226,7 @@ require (
 	google.golang.org/protobuf v1.36.11 // indirect
 	k8s.io/gengo/v2 v2.0.0-20250922181213-ec3ebc5fd46b // indirect
 	k8s.io/klog/v2 v2.140.0
-	k8s.io/kubernetes v1.35.2
+	k8s.io/kubernetes v1.35.3
 )
 
 replace (
diff --git a/packaging/crio.conf.d/10-microshift_amd64.conf b/packaging/crio.conf.d/10-microshift_amd64.conf
index 066438aa8d..78afa1834d 100644
--- a/packaging/crio.conf.d/10-microshift_amd64.conf
+++ b/packaging/crio.conf.d/10-microshift_amd64.conf
@@ -2,6 +2,6 @@
 # for community builds on top of OKD, this setting has no effect
 [crio.image]
 global_auth_file="/etc/crio/openshift-pull-secret"
-pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:99e3448beed2df93641fced98f2cfd9e1ffe02901da9e7fae2ea54b5ce63cf16"
+pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fb8d06e3e46118e7921331871891a4bea62ff086e084781b6c772569314bd45f"
 pause_image_auth_file = "/etc/crio/openshift-pull-secret"
 pause_command = "/usr/bin/pod"
diff --git a/packaging/crio.conf.d/10-microshift_arm64.conf b/packaging/crio.conf.d/10-microshift_arm64.conf
index 89c5e1b0a5..39826fb65b 100644
--- a/packaging/crio.conf.d/10-microshift_arm64.conf
+++ b/packaging/crio.conf.d/10-microshift_arm64.conf
@@ -2,6 +2,6 @@
 # for community builds on top of OKD, this setting has no effect
 [crio.image]
 global_auth_file="/etc/crio/openshift-pull-secret"
-pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ac628fe7cc2515e11d50b708fc69a77258640fc44cd073ad2891e997030c4d35"
+pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0eee7f97711c71d3a4c559c0063d9752ccddc563e196b6a876a5184402495a86"
 pause_image_auth_file = "/etc/crio/openshift-pull-secret"
 pause_command = "/usr/bin/pod"
diff --git a/rebase.log b/rebase.log
index ad1d7ad190..3339e74534 100644
--- a/rebase.log
+++ b/rebase.log
@@ -1,139 +1,135 @@
 rebase.sh:
-# Rebasing to registry.ci.openshift.org/ocp/release:4.21.0-0.nightly-2025-10-22-123727 and registry.ci.openshift.org/ocp-arm64/release-arm64:4.21.0-0.nightly-arm64-2025-10-22-190453
-# Fetching release info for registry.ci.openshift.org/ocp/release:4.21.0-0.nightly-2025-10-22-123727 (amd64)
-# Fetching release info for registry.ci.openshift.org/ocp-arm64/release-arm64:4.21.0-0.nightly-arm64-2025-10-22-190453 (arm64)
-# Extracting registry.ci.openshift.org/ocp/release:4.21.0-0.nightly-2025-10-22-123727 manifest content
-# Cloning registry.ci.openshift.org/ocp/release:4.21.0-0.nightly-2025-10-22-123727 component repos
+# Rebasing to registry.ci.openshift.org/ocp/release:4.22.0-0.nightly-2026-04-01-151631 and registry.ci.openshift.org/ocp-arm64/release-arm64:4.22.0-0.nightly-arm64-2026-04-02-033117
+# Fetching release info for registry.ci.openshift.org/ocp/release:4.22.0-0.nightly-2026-04-01-151631 (amd64)
+# Fetching release info for registry.ci.openshift.org/ocp-arm64/release-arm64:4.22.0-0.nightly-arm64-2026-04-02-033117 (arm64)
+# Extracting registry.ci.openshift.org/ocp/release:4.22.0-0.nightly-2026-04-01-151631 manifest content
+# Cloning registry.ci.openshift.org/ocp/release:4.22.0-0.nightly-2026-04-01-151631 component repos
 Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/api/.git/
-HEAD is now at 8c9accaf Merge pull request #2502 from jsafrane/MutableCSINodeAllocatableCount-tp
+HEAD is now at 80fcf457 Merge pull request #2774 from sadasu/azureClusterHostedDNS-default
 
 Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-csi-snapshot-controller-operator/.git/
-HEAD is now at b022cf7 Merge pull request #245 from openshift-bot/art-consistency-openshift-4.21-ose-cluster-csi-snapshot-controller-operator
+HEAD is now at 98d8223 Merge pull request #270 from rhrmo/STOR-2762-origin-main
 
 Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-dns-operator/.git/
-HEAD is now at 2ec8a3d Merge pull request #448 from davidesalerno/NE-2138
+HEAD is now at 3d21411 Merge pull request #467 from bentito/fix-dns-service-dual-stack
 
 Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-ingress-operator/.git/
-HEAD is now at 0cac97a Merge pull request #1291 from rhamini3/ci-cluster-ossm
+HEAD is now at dfec6c0 Merge pull request #1406 from rhamini3/ocpbugs-79376
 
 Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-kube-apiserver-operator/.git/
-HEAD is now at adc82f6 Merge pull request #1939 from bertinatto/rebase-1.34
+HEAD is now at de2a3eb Merge pull request #2080 from gangwgr/fix-bound-token-test-stability
 
 Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-kube-controller-manager-operator/.git/
-HEAD is now at ffe5113 Merge pull request #888 from bertinatto/rebase-1.34
+HEAD is now at 7df2876 Merge pull request #915 from vincentdephily/vdp-retstart-on-tls-inject
 
 Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-kube-scheduler-operator/.git/
-HEAD is now at 10d89b5 Merge pull request #583 from bertinatto/rebase-1.34
+HEAD is now at ddbfddb Merge pull request #617 from vincentdephily/vdp-restart-on-tls-inject
 
 Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-network-operator/.git/
-HEAD is now at a587975 Merge pull request #2808 from maiqueb/api-l2udn-masked-subnets
+HEAD is now at 594de43 Merge pull request #2942 from kyrtapz/fix_managedstate_override
 
 Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-openshift-controller-manager-operator/.git/
-HEAD is now at f90be06 Merge pull request #399 from openshift-bot/art-consistency-openshift-4.21-ose-cluster-openshift-controller-manager-operator
+HEAD is now at e0d28ec Merge pull request #412 from vincentdephily/vdp-retstart-on-tls-inject
 
 Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/cluster-policy-controller/.git/
-HEAD is now at ef70396 Merge pull request #169 from openshift-bot/art-consistency-openshift-4.21-cluster-policy-controller
+HEAD is now at 44985a1 Merge pull request #174 from vincentdephily/vdp-bump-k8s-1.35
 
 Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/csi-external-snapshotter/.git/
-HEAD is now at 15313fb Merge pull request #188 from openshift-bot/art-consistency-openshift-4.21-ose-csi-snapshot-controller
+HEAD is now at d1bc3ff Merge pull request #202 from dfajmon/rebase-v8.5.0
 
 Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/etcd/.git/
-HEAD is now at e2b3dfdf Merge pull request #342 from openshift-bot/art-consistency-openshift-4.21-ose-etcd
+HEAD is now at d8d67b8c Merge pull request #356 from locriandev/openshift-4.22
 
 Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/kubernetes/.git/
-HEAD is now at 96593f323 Merge pull request #2484 from bertinatto/rebase-1.34
+HEAD is now at 9193b12ab Merge pull request #2633 from jubittajohn/rebase-v1.35.3
 
 Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/kubernetes-kube-storage-version-migrator/.git/
-HEAD is now at ce5ff17 Merge pull request #234 from openshift-bot/art-consistency-openshift-4.21-ose-kube-storage-version-migrator
+HEAD is now at 72835e4 Merge pull request #237 from sanchezl/leader-election-2026
 
 Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/machine-config-operator/.git/
-HEAD is now at 06e7b70a Merge pull request #5332 from djoshy/add-cpms-support
+HEAD is now at 39ca9838 Merge pull request #5825 from djoshy/add-skew-docs
 
 Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/openshift-controller-manager/.git/
-HEAD is now at 433bd50 Merge pull request #414 from openshift-bot/art-consistency-openshift-4.21-ose-openshift-controller-manager
+HEAD is now at 26d20fe Merge pull request #429 from ricardomaraschini/CNTRLPLANE-2769
 
 Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/operator-framework-olm/.git/
-HEAD is now at a0b88f9a Merge pull request #1126 from Xia-Zhao-rh/opm-cases
+HEAD is now at 438f0e60 Merge pull request #1271 from fgiudici/owners
 
 Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/route-controller-manager/.git/
-HEAD is now at c337cf4 Merge pull request #65 from openshift-bot/art-consistency-openshift-4.21-ose-route-controller-manager
+HEAD is now at 624742d Merge pull request #70 from jcmoraisjr/bump-library-go
 
 Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/service-ca-operator/.git/
-HEAD is now at e5d65c6 Merge pull request #276 from openshift-bot/art-consistency-openshift-4.21-ose-service-ca-operator
+HEAD is now at 951ea66 Merge pull request #326 from sanchezl/use-embed
 
-# Cloning registry.ci.openshift.org/ocp/release:4.21.0-0.nightly-2025-10-22-123727 image repos
+# Cloning registry.ci.openshift.org/ocp/release:4.22.0-0.nightly-2026-04-01-151631 image repos
 Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/oc/.git/
-HEAD is now at 8836b663 Merge pull request #2113 from wking/remove-obsolete-precheckEnabled
+HEAD is now at 12f8fce8 Merge pull request #2245 from tchap/code-reviewer-agent
 
 Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/coredns/.git/
-HEAD is now at 91ae57f Merge pull request #154 from openshift-bot/art-consistency-openshift-4.21-coredns
+HEAD is now at 0dded2d Merge pull request #170 from openshift-bot/art-consistency-openshift-4.22-coredns
 
 Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/csi-external-snapshotter/.git/
-HEAD is now at 15313fb Merge pull request #188 from openshift-bot/art-consistency-openshift-4.21-ose-csi-snapshot-controller
+HEAD is now at d1bc3ff Merge pull request #202 from dfajmon/rebase-v8.5.0
 
 Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/router/.git/
-HEAD is now at 526b4d0 Merge pull request #679 from openshift-bot/art-consistency-openshift-4.21-ose-haproxy-router-base
+HEAD is now at 8963907 Merge pull request #755 from richardsonnick/router-curves
 
 Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/kube-rbac-proxy/.git/
-HEAD is now at cd63668 Merge pull request #126 from openshift-bot/art-consistency-openshift-4.21-kube-rbac-proxy
+HEAD is now at d12e274 Merge pull request #133 from ibihim/merge-v0.21.1-downstream
 
 lvms_operator not from release payload, skipping
 
 Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/ovn-kubernetes/.git/
-HEAD is now at a573f44e Merge pull request #2772 from openshift-bot/art-consistency-openshift-4.21-ovn-kubernetes-microshift
+HEAD is now at ee514f9f Merge pull request #3084 from jluhrsen/d/s-merge-03-24-2026
 
 Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/kubernetes/.git/
-HEAD is now at 96593f323 Merge pull request #2484 from bertinatto/rebase-1.34
+HEAD is now at 9193b12ab Merge pull request #2633 from jubittajohn/rebase-v1.35.3
 
 Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/amd64/service-ca-operator/.git/
-HEAD is now at e5d65c6 Merge pull request #276 from openshift-bot/art-consistency-openshift-4.21-ose-service-ca-operator
+HEAD is now at 951ea66 Merge pull request #326 from sanchezl/use-embed
 
 Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/oc/.git/
-HEAD is now at 8836b663 Merge pull request #2113 from wking/remove-obsolete-precheckEnabled
+HEAD is now at f835dae3 Merge pull request #2248 from hongkailiu/upgrade-cmd-ctx
 
 Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/coredns/.git/
-HEAD is now at 91ae57f Merge pull request #154 from openshift-bot/art-consistency-openshift-4.21-coredns
+HEAD is now at 0dded2d Merge pull request #170 from openshift-bot/art-consistency-openshift-4.22-coredns
 
 Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/csi-external-snapshotter/.git/
-HEAD is now at 15313fb Merge pull request #188 from openshift-bot/art-consistency-openshift-4.21-ose-csi-snapshot-controller
+HEAD is now at d1bc3ff Merge pull request #202 from dfajmon/rebase-v8.5.0
 
 Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/router/.git/
-HEAD is now at 526b4d0 Merge pull request #679 from openshift-bot/art-consistency-openshift-4.21-ose-haproxy-router-base
+HEAD is now at 8963907 Merge pull request #755 from richardsonnick/router-curves
 
 Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/kube-rbac-proxy/.git/
-HEAD is now at cd63668 Merge pull request #126 from openshift-bot/art-consistency-openshift-4.21-kube-rbac-proxy
+HEAD is now at d12e274 Merge pull request #133 from ibihim/merge-v0.21.1-downstream
 
 lvms_operator not from release payload, skipping
 
 Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/ovn-kubernetes/.git/
-HEAD is now at a573f44e Merge pull request #2772 from openshift-bot/art-consistency-openshift-4.21-ovn-kubernetes-microshift
+HEAD is now at ee514f9f Merge pull request #3084 from jluhrsen/d/s-merge-03-24-2026
 
 Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/kubernetes/.git/
-HEAD is now at 96593f323 Merge pull request #2484 from bertinatto/rebase-1.34
+HEAD is now at 9193b12ab Merge pull request #2633 from jubittajohn/rebase-v1.35.3
 
 Initialized empty Git repository in /go/src/github.com/openshift/microshift/_output/staging/arm64/service-ca-operator/.git/
-HEAD is now at e5d65c6 Merge pull request #276 from openshift-bot/art-consistency-openshift-4.21-ose-service-ca-operator
+HEAD is now at 951ea66 Merge pull request #326 from sanchezl/use-embed
 
 Warning: env var PULL_BASE_REF not found or empty, falling back to local active branch.
-error: branch 'rebase-release-4.21-4.21.0-0.nightly-2025-10-22-123727_amd64-2025-10-22_arm64-2025-10-22' not found
-Switched to a new branch 'rebase-release-4.21-4.21.0-0.nightly-2025-10-22-123727_amd64-2025-10-22_arm64-2025-10-22'
+error: branch 'rebase-release-4.22-4.22.0-0.nightly-2026-04-01-151631_amd64-2026-04-01_arm64-2026-04-02' not found
+Switched to a new branch 'rebase-release-4.22-4.22.0-0.nightly-2026-04-01-151631_amd64-2026-04-01_arm64-2026-04-02'
 ## Updating last_rebase.sh
 ## Committing changes to last_rebase.sh
-[rebase-release-4.21-4.21.0-0.nightly-2025-10-22-123727_amd64-2025-10-22_arm64-2025-10-22 c63c22945] update last_rebase.sh
+[rebase-release-4.22-4.22.0-0.nightly-2026-04-01-151631_amd64-2026-04-01_arm64-2026-04-02 3ac3455f2] update last_rebase.sh
  1 file changed, 1 insertion(+), 1 deletion(-)
 cluster-csi-snapshot-controller-operator embedded-component no change
 
 cluster-dns-operator embedded-component no change
 
-cluster-ingress-operator embedded-component no change
-
-cluster-kube-apiserver-operator embedded-component no change
-
 cluster-kube-controller-manager-operator embedded-component no change
 
 cluster-kube-scheduler-operator embedded-component no change
 
-cluster-network-operator embedded-component no change
+cluster-openshift-controller-manager-operator embedded-component no change
 
 cluster-policy-controller embedded-component no change
 
@@ -141,299 +137,480 @@ csi-external-snapshotter embedded-component no change
 
 etcd embedded-component no change
 
-kubernetes embedded-component no change
-
 kubernetes-kube-storage-version-migrator embedded-component no change
 
-route-controller-manager embedded-component no change
+openshift-controller-manager embedded-component no change
 
-service-ca-operator embedded-component no change
+route-controller-manager embedded-component no change
 
 coredns image-amd64 no change
 
 csi-external-snapshotter image-amd64 no change
 
-router image-amd64 no change
-
-kubernetes image-amd64 no change
-
-service-ca-operator image-amd64 no change
+kube-rbac-proxy image-amd64 no change
 
 coredns image-arm64 no change
 
 csi-external-snapshotter image-arm64 no change
 
-router image-arm64 no change
+kube-rbac-proxy image-arm64 no change
 
-kubernetes image-arm64 no change
+ovn-kubernetes image-arm64 no change
 
 service-ca-operator image-arm64 no change
 
 ## Committing changes to changelog
-[rebase-release-4.21-4.21.0-0.nightly-2025-10-22-123727_amd64-2025-10-22_arm64-2025-10-22 aa31d603e] update changelog
- 2 files changed, 68 insertions(+), 5138 deletions(-)
+[rebase-release-4.22-4.22.0-0.nightly-2026-04-01-151631_amd64-2026-04-01_arm64-2026-04-02 7a8000d38] update changelog
+ 2 files changed, 156 insertions(+), 18 deletions(-)
 # Updating microshift/go.mod
-go mod edit -require github.com/openshift/cluster-policy-controller@ef703966fe6e82f5f255b06bc5c758f105bf8b28
+go mod edit -require github.com/openshift/cluster-policy-controller@44985a1306411101c84dd5081598fc928b432321
 go: downloading github.com/stretchr/testify v1.11.1
-go: downloading github.com/openshift/api v0.0.0-20251015095338-264e80a2b6e7
-go: downloading github.com/openshift/client-go v0.0.0-20251015124057-db0dee36e235
-go: downloading github.com/openshift/library-go v0.0.0-20251015151611-6fc7a74b67c5
-go: downloading k8s.io/utils v0.0.0-20250604170112-4c0f3b243397
 go: downloading sigs.k8s.io/yaml v1.6.0
-go: downloading github.com/fsnotify/fsnotify v1.9.0
-go: downloading github.com/vishvananda/netlink v1.3.1
-go: downloading github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e
+go: downloading github.com/openshift/api v0.0.0-20260309155933-45fd88d185dd
+go: downloading github.com/openshift/client-go v0.0.0-20260306160707-3935d929fc7d
+go: downloading github.com/openshift/library-go v0.0.0-20260303171201-5d9eb6295ff6
 go: downloading sigs.k8s.io/kustomize/kyaml v0.20.1
-go: downloading github.com/spf13/cobra v1.9.1
+go: downloading k8s.io/utils v0.0.0-20260210185600-b8788abfbbc2
 go: downloading github.com/apparentlymart/go-cidr v1.1.0
-go: downloading go.etcd.io/etcd/client/pkg/v3 v3.6.4
 go: downloading github.com/evanphx/json-patch v4.12.0+incompatible
-go: downloading go.etcd.io/etcd/client/v3 v3.6.4
 go: downloading github.com/spf13/pflag v1.0.10
-go: downloading github.com/openshift/build-machinery-go v0.0.0-20250602125535-1b6d00b8c37c
 go: downloading github.com/squat/generic-device-plugin v0.0.0-20251019101956-043a51e18f31
+go: downloading github.com/vishvananda/netlink v1.3.1
+go: downloading github.com/spf13/cobra v1.10.2
 go: downloading gopkg.in/yaml.v3 v3.0.1
 go: downloading github.com/go-kit/kit v0.9.0
-go: downloading github.com/coreos/go-systemd/v22 v22.5.0
-go: downloading github.com/openshift/cluster-policy-controller v0.0.0-20251007100337-ef703966fe6e
+go: downloading github.com/coreos/go-systemd v0.0.0-20190321100706-95778dfbb74e
+go: downloading github.com/fsnotify/fsnotify v1.9.0
+go: downloading go.etcd.io/etcd/client/pkg/v3 v3.6.8
+go: downloading go.etcd.io/etcd/client/v3 v3.6.8
+go: downloading github.com/openshift/cluster-policy-controller v0.0.0-20260311142746-44985a130641
+go: downloading github.com/openshift/route-controller-manager v0.0.0-20260211095309-624742d93f3a
+go: downloading github.com/coreos/go-systemd/v22 v22.7.0
+go: downloading github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20260304192652-72835e43c775
+go: downloading github.com/google/go-cmp v0.7.0
 go: downloading github.com/miekg/dns v1.1.63
-go: downloading sigs.k8s.io/kustomize/api v0.20.1
-go: downloading github.com/openshift/route-controller-manager v0.0.0-20251008111043-c337cf413bbb
 go: downloading gopkg.in/yaml.v2 v2.4.0
-go: downloading golang.org/x/sys v0.36.0
-go: downloading k8s.io/kube-openapi v0.0.0-20250710124328-f3f2b991d03b
+go: downloading golang.org/x/sys v0.42.0
+go: downloading sigs.k8s.io/kustomize/api v0.20.1
 go: downloading github.com/gogo/protobuf v1.3.2
+go: downloading github.com/openshift/build-machinery-go v0.0.0-20251023084048-5d77c1a5e5af
+go: downloading k8s.io/kube-openapi v0.0.0-20260304202019-5b3e3fdb0acf
 go: downloading github.com/golang/snappy v0.0.4
-go: downloading github.com/openshift/kubernetes-kube-storage-version-migrator v0.0.3-0.20251007192956-ce5ff17e9a81
 go: downloading github.com/prometheus/client_model v0.6.2
-go: downloading github.com/prometheus/common v0.66.1
-go: downloading github.com/google/go-cmp v0.7.0
+go: downloading github.com/prometheus/common v0.67.5
 go: downloading github.com/prometheus/prometheus v0.302.1
 go: downloading github.com/go-logr/logr v1.4.3
-go: downloading github.com/fxamacker/cbor/v2 v2.9.0
 go: downloading sigs.k8s.io/randfill v1.0.0
+go: downloading go.yaml.in/yaml/v2 v2.4.4
+go: downloading go.yaml.in/yaml/v3 v3.0.4
 go: downloading github.com/davecgh/go-spew v1.1.2-0.20180830191138-d8f796af33cc
 go: downloading github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2
-go: downloading sigs.k8s.io/structured-merge-diff/v6 v6.3.0
-go: downloading github.com/google/gnostic-models v0.7.0
-go: downloading google.golang.org/protobuf v1.36.8
+go: downloading github.com/fxamacker/cbor/v2 v2.9.0
+go: downloading sigs.k8s.io/structured-merge-diff/v6 v6.3.2
+go: downloading github.com/google/gnostic-models v0.7.1
+go: downloading google.golang.org/protobuf v1.36.11
 go: downloading github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822
-go: downloading golang.org/x/net v0.43.0
-go: downloading golang.org/x/term v0.35.0
-go: downloading go.yaml.in/yaml/v2 v2.4.2
-go: downloading go.yaml.in/yaml/v3 v3.0.4
-go: downloading github.com/vishvananda/netns v0.0.5
-go: downloading gopkg.in/evanphx/json-patch.v4 v4.12.0
-go: downloading github.com/inconshreveable/mousetrap v1.1.0
+go: downloading golang.org/x/net v0.51.0
+go: downloading golang.org/x/term v0.40.0
 go: downloading github.com/pkg/errors v0.9.1
+go: downloading gopkg.in/evanphx/json-patch.v4 v4.13.0
 go: downloading github.com/google/uuid v1.6.0
-go: downloading go.uber.org/zap v1.27.0
-go: downloading github.com/coreos/go-semver v0.3.1
-go: downloading go.etcd.io/etcd/api/v3 v3.6.4
-go: downloading google.golang.org/grpc v1.76.0
-go: downloading github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.74.0
-go: downloading gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c
-go: downloading sigs.k8s.io/json v0.0.0-20241014173422-cfa47c3a1cc8
-go: downloading github.com/moby/term v0.5.0
+go: downloading github.com/inconshreveable/mousetrap v1.1.0
+go: downloading github.com/vishvananda/netns v0.0.5
+go: downloading google.golang.org/grpc v1.79.2
 go: downloading github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de
-go: downloading go.uber.org/goleak v1.3.0
+go: downloading github.com/moby/term v0.5.0
+go: downloading github.com/go-kit/log v0.2.1
+go: downloading github.com/oklog/run v1.2.0
+go: downloading github.com/prometheus/client_golang v1.23.2
 go: downloading github.com/jonboulle/clockwork v0.5.0
-go: downloading go.opentelemetry.io/otel/trace v1.37.0
-go: downloading golang.org/x/time v0.9.0
-go: downloading github.com/go-logfmt/logfmt v0.5.1
-go: downloading github.com/go-stack/stack v1.8.1
+go: downloading github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.74.0
+go: downloading gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c
 go: downloading github.com/MakeNowJust/heredoc v1.0.0
 go: downloading github.com/mitchellh/go-wordwrap v1.0.1
 go: downloading github.com/russross/blackfriday/v2 v2.1.0
-go: downloading go.opentelemetry.io/otel v1.37.0
+go: downloading go.uber.org/zap v1.27.1
+go: downloading github.com/go-logfmt/logfmt v0.5.1
+go: downloading github.com/go-stack/stack v1.8.1
+go: downloading github.com/coreos/go-semver v0.3.1
+go: downloading go.etcd.io/etcd/api/v3 v3.6.8
+go: downloading sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730
+go: downloading go.opentelemetry.io/otel/trace v1.42.0
+go: downloading go.opentelemetry.io/otel v1.42.0
+go: downloading go.uber.org/goleak v1.3.0
 go: downloading github.com/godbus/dbus/v5 v5.1.0
-go: downloading golang.org/x/tools v0.36.0
-go: downloading golang.org/x/sync v0.17.0
+go: downloading golang.org/x/time v0.15.0
 go: downloading github.com/blang/semver/v4 v4.0.0
-go: downloading github.com/google/cadvisor v0.52.1
-go: downloading go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.34.0
-go: downloading go.opentelemetry.io/otel/metric v1.37.0
-go: downloading go.opentelemetry.io/otel/sdk v1.37.0
-go: downloading go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.34.0
-go: downloading github.com/go-kit/log v0.2.1
-go: downloading github.com/oklog/run v1.2.0
-go: downloading github.com/prometheus/client_golang v1.23.2
+go: downloading github.com/google/cadvisor v0.53.0
+go: downloading go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.42.0
+go: downloading go.opentelemetry.io/otel/metric v1.42.0
+go: downloading go.opentelemetry.io/otel/sdk v1.42.0
+go: downloading go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.42.0
 go: downloading github.com/Microsoft/go-winio v0.6.2
-go: downloading k8s.io/gengo/v2 v2.0.0-20250604051438-85fd79dbfd9f
+go: downloading golang.org/x/tools v0.42.0
+go: downloading golang.org/x/sync v0.20.0
 go: downloading gopkg.in/inf.v0 v0.9.1
+go: downloading github.com/go-errors/errors v1.4.2
 go: downloading github.com/x448/float16 v0.8.4
-go: downloading github.com/go-openapi/swag v0.23.0
 go: downloading github.com/json-iterator/go v1.1.12
-go: downloading golang.org/x/oauth2 v0.30.0
+go: downloading k8s.io/gengo/v2 v2.0.0-20250922181213-ec3ebc5fd46b
+go: downloading github.com/go-openapi/jsonreference v0.21.5
+go: downloading github.com/go-openapi/swag v0.25.5
+go: downloading golang.org/x/oauth2 v0.36.0
 go: downloading github.com/stretchr/objx v0.5.2
-go: downloading github.com/prometheus/procfs v0.16.1
-go: downloading golang.org/x/text v0.29.0
+go: downloading github.com/prometheus/procfs v0.20.1
 go: downloading github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79
 go: downloading github.com/peterbourgon/diskv v2.0.1+incompatible
-go: downloading go.uber.org/multierr v1.11.0
-go: downloading github.com/golang/protobuf v1.5.4
-go: downloading github.com/grpc-ecosystem/grpc-gateway/v2 v2.26.3
-go: downloading google.golang.org/genproto/googleapis/api v0.0.0-20250804133106-a7a43d27e69b
-go: downloading google.golang.org/genproto/googleapis/rpc v0.0.0-20250826171959-ef028d996bc1
-go: downloading github.com/go-errors/errors v1.4.2
-go: downloading github.com/go-openapi/jsonreference v0.21.0
+go: downloading golang.org/x/text v0.34.0
+go: downloading github.com/creack/pty v1.1.18
+go: downloading github.com/beorn7/perks v1.0.1
+go: downloading github.com/cespare/xxhash/v2 v2.3.0
 go: downloading github.com/kr/pretty v0.3.1
 go: downloading github.com/chai2010/gettext-go v1.0.2
-go: downloading github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20251001123353-fd5b1fb35db1
-go: downloading github.com/onsi/gomega v1.35.1
+go: downloading github.com/openshift/onsi-ginkgo/v2 v2.6.1-0.20251120221002-696928a6a0d7
+go: downloading github.com/onsi/gomega v1.38.2
 go: downloading github.com/exponent-io/jsonpath v0.0.0-20210407135951-1de76d718b3f
-go: downloading github.com/creack/pty v1.1.18
-go: downloading gopkg.in/natefinch/lumberjack.v2 v2.2.1
-go: downloading gopkg.in/go-jose/go-jose.v2 v2.6.3
-go: downloading github.com/emicklei/go-restful/v3 v3.12.2
+go: downloading google.golang.org/genproto/googleapis/rpc v0.0.0-20260226221140-a57be14db171
+go: downloading github.com/golang/protobuf v1.5.4
+go: downloading github.com/grpc-ecosystem/grpc-gateway/v2 v2.28.0
+go: downloading google.golang.org/genproto/googleapis/api v0.0.0-20260226221140-a57be14db171
 go: downloading github.com/pkg/profile v1.7.0
 go: downloading github.com/sirupsen/logrus v1.9.3
-go: downloading go.etcd.io/etcd/server/v3 v3.6.4
+go: downloading github.com/emicklei/go-restful/v3 v3.13.0
 go: downloading go.uber.org/atomic v1.11.0
-go: downloading golang.org/x/crypto v0.42.0
-go: downloading go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.59.0
-go: downloading sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.31.2
+go: downloading golang.org/x/crypto v0.48.0
+go: downloading go.uber.org/multierr v1.11.0
+go: downloading gopkg.in/natefinch/lumberjack.v2 v2.2.1
+go: downloading gopkg.in/go-jose/go-jose.v2 v2.6.3
+go: downloading go.etcd.io/etcd/server/v3 v3.6.5
+go: downloading sigs.k8s.io/apiserver-network-proxy/konnectivity-client v0.34.0
+go: downloading github.com/onsi/ginkgo v1.16.5
 go: downloading github.com/gorilla/websocket v1.5.4-0.20250319132907-e064f32e3674
 go: downloading github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f
-go: downloading github.com/openshift/apiserver-library-go v0.0.0-20251015164739-79d04067059d
-go: downloading github.com/onsi/ginkgo v1.16.5
-go: downloading github.com/google/cel-go v0.26.0
+go: downloading go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.67.0
+go: downloading github.com/openshift/apiserver-library-go v0.0.0-20260303173613-cd3676268d31
+go: downloading github.com/google/cel-go v0.27.0
 go: downloading github.com/robfig/cron/v3 v3.0.1
 go: downloading github.com/robfig/cron v1.2.0
-go: downloading github.com/opencontainers/selinux v1.11.1
+go: downloading github.com/opencontainers/selinux v1.13.0
 go: downloading github.com/container-storage-interface/spec v1.9.0
 go: downloading github.com/libopenstorage/openstorage v1.0.0
 go: downloading github.com/go-logr/stdr v1.2.2
-go: downloading go.opentelemetry.io/proto/otlp v1.5.0
+go: downloading go.opentelemetry.io/proto/otlp v1.9.0
+go: downloading go.opentelemetry.io/otel/sdk/metric v1.42.0
 go: downloading github.com/opencontainers/cgroups v0.0.3
-go: downloading github.com/cyphar/filepath-securejoin v0.4.1
-go: downloading github.com/moby/sys/userns v0.1.0
 go: downloading github.com/docker/go-units v0.5.0
-go: downloading github.com/opencontainers/runc v1.2.5
+go: downloading github.com/moby/sys/userns v0.1.0
+go: downloading github.com/cyphar/filepath-securejoin v0.6.0
 go: downloading go.opentelemetry.io/contrib/instrumentation/github.com/emicklei/go-restful/otelrestful v0.44.0
 go: downloading github.com/moby/sys/mountinfo v0.7.2
 go: downloading github.com/karrick/godirwalk v1.17.0
-go: downloading github.com/containerd/containerd/api v1.8.0
+go: downloading github.com/containerd/containerd/api v1.9.0
 go: downloading github.com/containerd/errdefs v1.0.0
 go: downloading github.com/containerd/errdefs/pkg v0.3.0
-go: downloading github.com/opencontainers/runtime-spec v1.2.0
-go: downloading github.com/containerd/typeurl/v2 v2.2.2
+go: downloading github.com/opencontainers/runtime-spec v1.2.1
+go: downloading github.com/containerd/typeurl/v2 v2.2.3
 go: downloading golang.org/x/tools/go/packages/packagestest v0.1.1-deprecated
-go: downloading github.com/mailru/easyjson v0.7.7
-go: downloading github.com/beorn7/perks v1.0.1
-go: downloading github.com/cespare/xxhash/v2 v2.3.0
-go: downloading github.com/klauspost/compress v1.18.0
-go: downloading github.com/kylelemons/godebug v1.1.0
+go: downloading github.com/go-openapi/jsonpointer v0.22.5
+go: downloading github.com/go-openapi/testify/v2 v2.4.0
+go: downloading github.com/go-openapi/swag/cmdutils v0.25.5
+go: downloading github.com/go-openapi/swag/conv v0.25.5
+go: downloading github.com/go-openapi/swag/fileutils v0.25.5
+go: downloading github.com/go-openapi/swag/jsonname v0.25.5
+go: downloading github.com/go-openapi/swag/jsonutils v0.25.5
+go: downloading github.com/go-openapi/swag/loading v0.25.5
+go: downloading github.com/go-openapi/swag/mangling v0.25.5
+go: downloading github.com/go-openapi/swag/netutils v0.25.5
+go: downloading github.com/go-openapi/swag/stringutils v0.25.5
+go: downloading github.com/go-openapi/swag/typeutils v0.25.5
+go: downloading github.com/go-openapi/swag/yamlutils v0.25.5
 go: downloading github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd
 go: downloading github.com/modern-go/reflect2 v1.0.3-0.20250322232337-35a7c28c31ee
-go: downloading github.com/google/btree v1.1.3
-go: downloading github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc
-go: downloading github.com/go-openapi/jsonpointer v0.21.0
-go: downloading github.com/kr/text v0.2.0
-go: downloading github.com/rogpeppe/go-internal v1.13.1
+go: downloading github.com/klauspost/compress v1.18.0
+go: downloading github.com/kylelemons/godebug v1.1.0
 go: downloading github.com/go-logr/zapr v1.3.0
 go: downloading github.com/Azure/go-ansiterm v0.0.0-20230124172434-306776ec8161
-go: downloading github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
-go: downloading go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.60.0
-go: downloading github.com/coreos/go-oidc v2.3.0+incompatible
+go: downloading github.com/google/btree v1.1.3
+go: downloading github.com/kr/text v0.2.0
+go: downloading github.com/rogpeppe/go-internal v1.14.1
+go: downloading github.com/grafana/regexp v0.0.0-20240518133315-a468a5bfb3bc
 go: downloading github.com/felixge/fgprof v0.9.4
 go: downloading github.com/NYTimes/gziphandler v1.1.1
-go: downloading github.com/felixge/httpsnoop v1.0.4
+go: downloading github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
+go: downloading go.opentelemetry.io/contrib/instrumentation/google.golang.org/grpc/otelgrpc v0.67.0
+go: downloading github.com/coreos/go-oidc v2.3.0+incompatible
 go: downloading github.com/moby/spdystream v0.5.0
 go: downloading github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5
+go: downloading github.com/felixge/httpsnoop v1.0.4
 go: downloading github.com/soheilhy/cmux v0.1.5
 go: downloading github.com/tmc/grpc-websocket-proxy v0.0.0-20220101234140-673ab2c3ae75
-go: downloading go.etcd.io/bbolt v1.4.2
-go: downloading go.etcd.io/etcd/pkg/v3 v3.6.4
-go: downloading cel.dev/expr v0.24.0
-go: downloading github.com/stoewer/go-strcase v1.3.0
-go: downloading github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826
-go: downloading go.opentelemetry.io/auto/sdk v1.1.0
-go: downloading github.com/cenkalti/backoff/v4 v4.3.0
+go: downloading go.etcd.io/bbolt v1.4.3
+go: downloading go.etcd.io/etcd/pkg/v3 v3.6.5
+go: downloading github.com/distribution/reference v0.6.0
+go: downloading cel.dev/expr v0.25.1
+go: downloading go.opentelemetry.io/auto/sdk v1.2.1
+go: downloading github.com/cenkalti/backoff/v5 v5.0.3
 go: downloading github.com/mistifyio/go-zfs v2.1.2-0.20190413222219-f784269be439+incompatible
+go: downloading github.com/mohae/deepcopy v0.0.0-20170929034955-c48cc78d4826
 go: downloading github.com/JeffAshton/win_pdh v0.0.0-20161109143554-76bb4ee9f0ab
-go: downloading github.com/distribution/reference v0.6.0
 go: downloading github.com/armon/circbuf v0.0.0-20190214190532-5111143e8da2
-go: downloading github.com/Microsoft/hnslib v0.1.1
+go: downloading github.com/Microsoft/hnslib v0.1.2
 go: downloading github.com/lithammer/dedent v1.1.0
-go: downloading go.opentelemetry.io/contrib/propagators/b3 v1.19.0
-go: downloading github.com/containerd/ttrpc v1.2.6
+go: downloading github.com/containerd/ttrpc v1.2.7
 go: downloading github.com/euank/go-kmsg-parser v2.0.0+incompatible
-go: downloading golang.org/x/mod v0.27.0
-go: downloading golang.org/x/tools/go/expect v0.1.0-deprecated
-go: downloading github.com/josharian/intern v1.0.0
+go: downloading golang.org/x/tools/go/expect v0.1.1-deprecated
+go: downloading github.com/go-openapi/testify/enable/yaml/v2 v2.4.0
+go: downloading github.com/go-openapi/swag/jsonutils/fixtures_test v0.25.5
 go: downloading github.com/sergi/go-diff v1.2.0
-go: downloading go.opentelemetry.io/otel/sdk/metric v1.37.0
+go: downloading go.opentelemetry.io/contrib/propagators/b3 v1.19.0
 go: downloading github.com/fatih/camelcase v1.0.0
+go: downloading golang.org/x/mod v0.33.0
 go: downloading github.com/pquerna/cachecontrol v0.1.0
-go: downloading github.com/google/pprof v0.0.0-20241210010833-40e02aabc2ad
+go: downloading github.com/google/pprof v0.0.0-20250403155104-27863c87afa6
+go: downloading github.com/Masterminds/semver/v3 v3.4.0
 go: downloading github.com/dustin/go-humanize v1.0.1
 go: downloading go.etcd.io/raft/v3 v3.6.0
 go: downloading github.com/xiang90/probing v0.0.0-20221125231312-a49e3df8f510
 go: downloading github.com/grpc-ecosystem/go-grpc-middleware/providers/prometheus v1.0.1
-go: downloading github.com/antlr4-go/antlr/v4 v4.13.0
 go: downloading github.com/opencontainers/go-digest v1.0.0
-go: downloading github.com/docker/docker v27.4.1+incompatible
+go: downloading github.com/antlr4-go/antlr/v4 v4.13.1
+go: downloading cyphar.com/go-pathrs v0.2.1
+go: downloading github.com/docker/docker v28.2.2+incompatible
 go: downloading github.com/docker/go-connections v0.5.0
 go: downloading github.com/opencontainers/image-spec v1.1.1
 go: downloading github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00
 go: downloading github.com/xlab/treeprint v1.2.0
 go: downloading github.com/containerd/log v0.1.0
 go: downloading gonum.org/v1/gonum v0.16.0
-go: downloading github.com/golang-jwt/jwt/v5 v5.2.2
+go: downloading github.com/go-task/slim-sprig/v3 v3.0.0
 go: downloading github.com/go-ldap/ldap/v3 v3.4.11
+go: downloading github.com/golang-jwt/jwt/v5 v5.3.0
 go: downloading github.com/grpc-ecosystem/go-grpc-middleware/v2 v2.3.0
-go: downloading github.com/go-task/slim-sprig/v3 v3.0.0
-go: downloading golang.org/x/exp v0.0.0-20240719175910-8a7402abbf56
+go: downloading golang.org/x/exp v0.0.0-20260218203240-3dfff04db8fa
 go: downloading github.com/Azure/go-ntlmssp v0.0.0-20221128193559-754e69321358
 go: downloading github.com/go-asn1-ber/asn1-ber v1.5.8-0.20250403174932-29230038a667
 go: downloading github.com/alexbrainman/sspi v0.0.0-20231016080023-1a75b4708caa
 go: downloading github.com/jcmturner/gokrb5/v8 v8.4.4
-go: downloading github.com/jcmturner/gofork v1.7.6
 go: downloading github.com/hashicorp/go-uuid v1.0.3
+go: downloading github.com/jcmturner/gofork v1.7.6
 go: downloading github.com/jcmturner/dnsutils/v2 v2.0.0
 go: downloading github.com/jcmturner/goidentity/v6 v6.0.1
 go: downloading github.com/jcmturner/aescts/v2 v2.0.0
 go: downloading github.com/jcmturner/rpc/v2 v2.0.3
 go: downloading github.com/moby/docker-image-spec v1.3.1
-go mod edit -replace github.com/onsi/ginkgo/v2=github.com/openshift/onsi-ginkgo/v2@v2.6.1-0.20251001123353-fd5b1fb35db1
+go mod edit -replace github.com/onsi/ginkgo/v2=github.com/openshift/onsi-ginkgo/v2@v2.6.1-0.20251120221002-696928a6a0d7
 Handling 'k8s.io/klog/v2' dep: cloning 'https://github.com/kubernetes/klog' @ 'v2.130.1' to /go/src/github.com/openshift/microshift/./deps/k8s.io/klog
 Cloning into '/go/src/github.com/openshift/microshift/./deps/k8s.io/klog'...
 Handling 'k8s.io/kubernetes' dep: copying /go/src/github.com/openshift/microshift/_output/staging/kubernetes -> /go/src/github.com/openshift/microshift/./deps/github.com/openshift/kubernetes
-go mod edit -replace sigs.k8s.io/kube-storage-version-migrator=github.com/openshift/kubernetes-kube-storage-version-migrator@ce5ff17e9a81ce754567e6dd5053d13409c251e9
-Handling 'k8s.io/api' dep: updating required version to '1.34.1' (for information purposes)
-Handling 'k8s.io/apiextensions-apiserver' dep: updating required version to '1.34.1' (for information purposes)
-Handling 'k8s.io/apimachinery' dep: updating required version to '1.34.1' (for information purposes)
-Handling 'k8s.io/apiserver' dep: updating required version to '1.34.1' (for information purposes)
-Handling 'k8s.io/cli-runtime' dep: updating required version to '1.34.1' (for information purposes)
-Handling 'k8s.io/client-go' dep: updating required version to '1.34.1' (for information purposes)
-Handling 'k8s.io/cloud-provider' dep: updating required version to '1.34.1' (for information purposes)
-Handling 'k8s.io/cluster-bootstrap' dep: updating required version to '1.34.1' (for information purposes)
-Handling 'k8s.io/code-generator' dep: updating required version to '1.34.1' (for information purposes)
-Handling 'k8s.io/component-base' dep: updating required version to '1.34.1' (for information purposes)
-Handling 'k8s.io/component-helpers' dep: updating required version to '1.34.1' (for information purposes)
-Handling 'k8s.io/controller-manager' dep: updating required version to '1.34.1' (for information purposes)
-Handling 'k8s.io/cri-api' dep: updating required version to '1.34.1' (for information purposes)
-Handling 'k8s.io/cri-client' dep: updating required version to '1.34.1' (for information purposes)
-Handling 'k8s.io/csi-translation-lib' dep: updating required version to '1.34.1' (for information purposes)
-Handling 'k8s.io/dynamic-resource-allocation' dep: updating required version to '1.34.1' (for information purposes)
-Handling 'k8s.io/endpointslice' dep: updating required version to '1.34.1' (for information purposes)
-Handling 'k8s.io/externaljwt' dep: updating required version to '1.34.1' (for information purposes)
-Handling 'k8s.io/kms' dep: updating required version to '1.34.1' (for information purposes)
-Handling 'k8s.io/kube-aggregator' dep: updating required version to '1.34.1' (for information purposes)
-Handling 'k8s.io/kube-controller-manager' dep: updating required version to '1.34.1' (for information purposes)
-Handling 'k8s.io/kube-proxy' dep: updating required version to '1.34.1' (for information purposes)
-Handling 'k8s.io/kube-scheduler' dep: updating required version to '1.34.1' (for information purposes)
-Handling 'k8s.io/kubectl' dep: updating required version to '1.34.1' (for information purposes)
-Handling 'k8s.io/kubelet' dep: updating required version to '1.34.1' (for information purposes)
-Handling 'k8s.io/metrics' dep: updating required version to '1.34.1' (for information purposes)
-Handling 'k8s.io/mount-utils' dep: updating required version to '1.34.1' (for information purposes)
-Handling 'k8s.io/pod-security-admission' dep: updating required version to '1.34.1' (for information purposes)
-Handling 'k8s.io/sample-apiserver' dep: updating required version to '1.34.1' (for information purposes)
-Handling 'k8s.io/sample-cli-plugin' dep: updating required version to '1.34.1' (for information purposes)
-Handling 'k8s.io/sample-controller' dep: updating required version to '1.34.1' (for information purposes)
-go mod edit -require github.com/openshift/route-controller-manager@c337cf413bbbfc2154dc1d3c1bf8007ea1edfbc8
-go mod edit -require github.com/openshift/cluster-policy-controller@ef703966fe6e82f5f255b06bc5c758f105bf8b28
+go mod edit -replace sigs.k8s.io/kube-storage-version-migrator=github.com/openshift/kubernetes-kube-storage-version-migrator@72835e43c7754356645e41031f3a99926b4d42e6
+Handling 'k8s.io/api' dep: updating required version to '1.35.3' (for information purposes)
+Handling 'k8s.io/apiextensions-apiserver' dep: updating required version to '1.35.3' (for information purposes)
+Handling 'k8s.io/apimachinery' dep: updating required version to '1.35.3' (for information purposes)
+Handling 'k8s.io/apiserver' dep: updating required version to '1.35.3' (for information purposes)
+Handling 'k8s.io/cli-runtime' dep: updating required version to '1.35.3' (for information purposes)
+Handling 'k8s.io/client-go' dep: updating required version to '1.35.3' (for information purposes)
+Handling 'k8s.io/cloud-provider' dep: updating required version to '1.35.3' (for information purposes)
+Handling 'k8s.io/cluster-bootstrap' dep: updating required version to '1.35.3' (for information purposes)
+Handling 'k8s.io/code-generator' dep: updating required version to '1.35.3' (for information purposes)
+Handling 'k8s.io/component-base' dep: updating required version to '1.35.3' (for information purposes)
+Handling 'k8s.io/component-helpers' dep: updating required version to '1.35.3' (for information purposes)
+Handling 'k8s.io/controller-manager' dep: updating required version to '1.35.3' (for information purposes)
+Handling 'k8s.io/cri-api' dep: updating required version to '1.35.3' (for information purposes)
+Handling 'k8s.io/cri-client' dep: updating required version to '1.35.3' (for information purposes)
+Handling 'k8s.io/csi-translation-lib' dep: updating required version to '1.35.3' (for information purposes)
+Handling 'k8s.io/dynamic-resource-allocation' dep: updating required version to '1.35.3' (for information purposes)
+Handling 'k8s.io/endpointslice' dep: updating required version to '1.35.3' (for information purposes)
+Handling 'k8s.io/externaljwt' dep: updating required version to '1.35.3' (for information purposes)
+Handling 'k8s.io/kms' dep: updating required version to '1.35.3' (for information purposes)
+Handling 'k8s.io/kube-aggregator' dep: updating required version to '1.35.3' (for information purposes)
+Handling 'k8s.io/kube-controller-manager' dep: updating required version to '1.35.3' (for information purposes)
+Handling 'k8s.io/kube-proxy' dep: updating required version to '1.35.3' (for information purposes)
+Handling 'k8s.io/kube-scheduler' dep: updating required version to '1.35.3' (for information purposes)
+Handling 'k8s.io/kubectl' dep: updating required version to '1.35.3' (for information purposes)
+Handling 'k8s.io/kubelet' dep: updating required version to '1.35.3' (for information purposes)
+Handling 'k8s.io/metrics' dep: updating required version to '1.35.3' (for information purposes)
+Handling 'k8s.io/mount-utils' dep: updating required version to '1.35.3' (for information purposes)
+Handling 'k8s.io/pod-security-admission' dep: updating required version to '1.35.3' (for information purposes)
+Handling 'k8s.io/sample-apiserver' dep: updating required version to '1.35.3' (for information purposes)
+Handling 'k8s.io/sample-cli-plugin' dep: updating required version to '1.35.3' (for information purposes)
+Handling 'k8s.io/sample-controller' dep: updating required version to '1.35.3' (for information purposes)
+go mod edit -require github.com/openshift/route-controller-manager@624742d93f3a7885cf7f70985f1e23ff60da580d
+go mod edit -require github.com/openshift/cluster-policy-controller@44985a1306411101c84dd5081598fc928b432321
+go: inconsistent vendoring in /go/src/github.com/openshift/microshift:
+	k8s.io/api@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/apiextensions-apiserver@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/apimachinery@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/apiserver@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/cli-runtime@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/client-go@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/cloud-provider@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/component-base@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/kube-aggregator@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/kubectl@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/kubelet@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/cluster-bootstrap@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/component-helpers@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/controller-manager@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/cri-api@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/cri-client@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/csi-translation-lib@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/dynamic-resource-allocation@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/endpointslice@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/externaljwt@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/kms@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/kube-controller-manager@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/kube-proxy@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/kube-scheduler@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/metrics@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/mount-utils@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/pod-security-admission@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/kubernetes@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/api@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/apiextensions-apiserver@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/apimachinery@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/apiserver@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/cli-runtime@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/client-go@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/cloud-provider@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/cluster-bootstrap@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/component-base@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/component-helpers@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/controller-manager@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/cri-api@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/cri-client@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/csi-translation-lib@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/dynamic-resource-allocation@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/endpointslice@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/externaljwt@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/kms@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/kube-aggregator@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/kube-controller-manager@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/kube-proxy@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/kube-scheduler@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/kubectl@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/kubelet@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/kubernetes@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/metrics@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/mount-utils@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/pod-security-admission@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+
+	To ignore the vendor directory, use -mod=readonly or -mod=mod.
+	To sync the vendor directory, run:
+		go mod vendor
+panic: runtime error: invalid memory address or nil pointer dereference
+[signal SIGSEGV: segmentation violation code=0x1 addr=0x10 pc=0x9e5bd0]
+
+goroutine 1 [running]:
+cmd/internal/doc.findCodeRoots()
+	cmd/internal/doc/dirs.go:234 +0x7b0
+cmd/internal/doc.codeRoots.func1()
+	cmd/internal/doc/dirs.go:175 +0xf
+sync.(*Once).doSlow(0xb8b660?, 0xc000014101?)
+	sync/once.go:78 +0xac
+sync.(*Once).Do(...)
+	sync/once.go:69
+cmd/internal/doc.codeRoots()
+	cmd/internal/doc/dirs.go:174 +0x2c
+cmd/internal/doc.dirsInit({0x0, 0x0, 0xbda640?})
+	cmd/internal/doc/dirs.go:58 +0x30e
+cmd/internal/doc.Main({0xc000120260, 0x1, 0x1})
+	cmd/internal/doc/main.go:60 +0x72
+cmd/go/internal/doc.runDoc({0xd2ad60?, 0x11be1e0?}, 0xc000162618?, {0xc000120260?, 0xb00700?, 0xb008c0?})
+	cmd/go/internal/doc/doc.go:139 +0x25
+main.invoke(0x113ff80, {0xc000120250, 0x2, 0x2})
+	cmd/go/main.go:341 +0x84a
+main.main()
+	cmd/go/main.go:220 +0xe8b
+Running `gofmt -s -l -w` on 856 file(s).
+./deps/github.com/openshift/kubernetes/staging/src/k8s.io/client-go/third_party/forked/golang/template/exec.go
+./deps/github.com/openshift/kubernetes/staging/src/k8s.io/client-go/third_party/forked/golang/template/funcs.go
+./deps/github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery/third_party/forked/golang/json/fields.go
+./deps/github.com/openshift/kubernetes/staging/src/k8s.io/code-generator/third_party/forked/golang/reflect/type.go
+go: inconsistent vendoring in /go/src/github.com/openshift/microshift:
+	k8s.io/api@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/apiextensions-apiserver@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/apimachinery@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/apiserver@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/cli-runtime@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/client-go@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/cloud-provider@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/component-base@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/kube-aggregator@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/kubectl@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/kubelet@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/cluster-bootstrap@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/component-helpers@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/controller-manager@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/cri-api@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/cri-client@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/csi-translation-lib@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/dynamic-resource-allocation@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/endpointslice@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/externaljwt@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/kms@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/kube-controller-manager@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/kube-proxy@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/kube-scheduler@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/metrics@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/mount-utils@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/pod-security-admission@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/kubernetes@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/api@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/apiextensions-apiserver@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/apimachinery@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/apiserver@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/cli-runtime@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/client-go@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/cloud-provider@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/cluster-bootstrap@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/component-base@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/component-helpers@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/controller-manager@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/cri-api@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/cri-client@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/csi-translation-lib@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/dynamic-resource-allocation@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/endpointslice@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/externaljwt@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/kms@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/kube-aggregator@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/kube-controller-manager@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/kube-proxy@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/kube-scheduler@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/kubectl@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/kubelet@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/kubernetes@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/metrics@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/mount-utils@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/pod-security-admission@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+
+	To ignore the vendor directory, use -mod=readonly or -mod=mod.
+	To sync the vendor directory, run:
+		go mod vendor
+panic: runtime error: invalid memory address or nil pointer dereference
+[signal SIGSEGV: segmentation violation code=0x1 addr=0x10 pc=0x9e5bd0]
+
+goroutine 1 [running]:
+cmd/internal/doc.findCodeRoots()
+	cmd/internal/doc/dirs.go:234 +0x7b0
+cmd/internal/doc.codeRoots.func1()
+	cmd/internal/doc/dirs.go:175 +0xf
+sync.(*Once).doSlow(0xb8b660?, 0xc000200001?)
+	sync/once.go:78 +0xac
+sync.(*Once).Do(...)
+	sync/once.go:69
+cmd/internal/doc.codeRoots()
+	cmd/internal/doc/dirs.go:174 +0x2c
+cmd/internal/doc.dirsInit({0x0, 0x0, 0xbda640?})
+	cmd/internal/doc/dirs.go:58 +0x30e
+cmd/internal/doc.Main({0xc000024290, 0x1, 0x1})
+	cmd/internal/doc/main.go:60 +0x72
+cmd/go/internal/doc.runDoc({0xd2ad60?, 0x11be1e0?}, 0xc0000287f8?, {0xc000024290?, 0xb00700?, 0xb008c0?})
+	cmd/go/internal/doc/doc.go:139 +0x25
+main.invoke(0x113ff80, {0xc000024280, 0x2, 0x2})
+	cmd/go/main.go:341 +0x84a
+main.main()
+	cmd/go/main.go:220 +0xe8b
 for p in scripts/auto-rebase/rebase_patches/0001-Fix-CSI-initialization-conflict.patch scripts/auto-rebase/rebase_patches/0002-disable-APIrequestcount-controller.patch scripts/auto-rebase/rebase_patches/0003-disable-clusterQuotaMapping-controller.patch scripts/auto-rebase/rebase_patches/0004-remove-config-informer-and-cpu-partitioning-admission-plugin.patch scripts/auto-rebase/rebase_patches/0005-remove-user-informer.patch scripts/auto-rebase/rebase_patches/0006-kcm-no-panic.patch scripts/auto-rebase/rebase_patches/0020-klog-component-names.patch scripts/auto-rebase/rebase_patches/0030-kube-controller-manager-command-context.patch; do \
 	echo "Applying patch $p"; \
 	git mailinfo /dev/null /dev/stderr 2<&1- < $p | git apply --reject || exit 1; \
@@ -466,6 +643,8 @@ Checking patch deps/github.com/openshift/kubernetes/openshift-kube-apiserver/ope
 Applied patch deps/github.com/openshift/kubernetes/openshift-kube-apiserver/openshiftkubeapiserver/patch.go cleanly.
 Applying patch scripts/auto-rebase/rebase_patches/0006-kcm-no-panic.patch
 Checking patch deps/github.com/openshift/kubernetes/cmd/kube-controller-manager/app/options/options.go...
+Hunk #1 succeeded at 48 (offset 2 lines).
+Hunk #2 succeeded at 319 (offset 13 lines).
 Applied patch deps/github.com/openshift/kubernetes/cmd/kube-controller-manager/app/options/options.go cleanly.
 Applying patch scripts/auto-rebase/rebase_patches/0020-klog-component-names.patch
 Checking patch deps/k8s.io/klog/goroutine_labels.go...
@@ -477,32 +656,25 @@ Applied patch deps/k8s.io/klog/internal/buffer/buffer.go cleanly.
 Applied patch deps/k8s.io/klog/internal/buffer/goroutine_labels.go cleanly.
 Applying patch scripts/auto-rebase/rebase_patches/0030-kube-controller-manager-command-context.patch
 Checking patch deps/github.com/openshift/kubernetes/cmd/kube-controller-manager/app/controllermanager.go...
+Hunk #2 succeeded at 156 (offset -2 lines).
 Applied patch deps/github.com/openshift/kubernetes/cmd/kube-controller-manager/app/controllermanager.go cleanly.
 # Updating etcd/go.mod
-go mod edit -require github.com/openshift/cluster-policy-controller@ef703966fe6e82f5f255b06bc5c758f105bf8b28
-go: downloading github.com/openshift/etcd/api/v3 v3.5.1-0.20251001062325-e2b3dfdf0379
-go: downloading github.com/openshift/etcd/server/v3 v3.5.1-0.20251001062325-e2b3dfdf0379
-go: downloading k8s.io/klog/v2 v2.130.1
-go: downloading google.golang.org/genproto v0.0.0-20240123012728-ef4313101c80
-go: downloading github.com/grpc-ecosystem/grpc-gateway v1.16.0
-go: downloading github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20251001062325-e2b3dfdf0379
-go: downloading github.com/openshift/etcd/client/v3 v3.5.1-0.20251001062325-e2b3dfdf0379
-go: downloading github.com/openshift/etcd/pkg/v3 v3.5.1-0.20251001062325-e2b3dfdf0379
-go: downloading github.com/openshift/etcd/raft/v3 v3.5.1-0.20251001062325-e2b3dfdf0379
-go: downloading github.com/grpc-ecosystem/go-grpc-middleware v1.3.0
-go: downloading github.com/golang-jwt/jwt/v4 v4.5.2
-go: downloading go.etcd.io/etcd/client/v2 v2.305.21
+go mod edit -require github.com/openshift/cluster-policy-controller@44985a1306411101c84dd5081598fc928b432321
+go: downloading github.com/openshift/api v0.0.0-20260317095243-5c75e62da3e7
+go: downloading github.com/openshift/etcd/api/v3 v3.5.0-alpha.0.0.20260312150232-d8d67b8ce849
+go: downloading github.com/openshift/etcd/server/v3 v3.5.0-alpha.0.0.20260312150232-d8d67b8ce849
+go: downloading k8s.io/klog/v2 v2.140.0
+go: downloading github.com/openshift/etcd/client/pkg/v3 v3.0.0-20260312150232-d8d67b8ce849
+go: downloading github.com/openshift/etcd/client/v3 v3.5.0-alpha.0.0.20260312150232-d8d67b8ce849
+go: downloading github.com/openshift/etcd/pkg/v3 v3.5.0-alpha.0.0.20260312150232-d8d67b8ce849
 go: downloading github.com/cockroachdb/datadriven v1.0.2
 skipping modulepath github.com/openshift/microshift: no or unknown command []
-skipping modulepath github.com/openshift/microshift/pkg/config: no or unknown command []
-skipping modulepath github.com/openshift/microshift/pkg/util/cryptomaterial: no or unknown command []
-go mod edit -replace github.com/onsi/ginkgo/v2=github.com/openshift/onsi-ginkgo/v2@v2.6.1-0.20251001123353-fd5b1fb35db1
-go mod edit -replace go.etcd.io/etcd/api/v3=github.com/openshift/etcd/api/v3@e2b3dfdf037938f7f0c489438eaa1138fd3fadba
-go mod edit -replace go.etcd.io/etcd/client/pkg/v3=github.com/openshift/etcd/client/pkg/v3@v3.5.1-0.20251001062325-e2b3dfdf0379
-go mod edit -replace go.etcd.io/etcd/client/v3=github.com/openshift/etcd/client/v3@v3.5.1-0.20251001062325-e2b3dfdf0379
-go mod edit -replace go.etcd.io/etcd/pkg/v3=github.com/openshift/etcd/pkg/v3@v3.5.1-0.20251001062325-e2b3dfdf0379
-go mod edit -replace go.etcd.io/etcd/raft/v3=github.com/openshift/etcd/raft/v3@v3.5.1-0.20251001062325-e2b3dfdf0379
-go mod edit -replace go.etcd.io/etcd/server/v3=github.com/openshift/etcd/server/v3@v3.5.1-0.20251001062325-e2b3dfdf0379
+go mod edit -replace github.com/onsi/ginkgo/v2=github.com/openshift/onsi-ginkgo/v2@v2.6.1-0.20251120221002-696928a6a0d7
+go mod edit -replace go.etcd.io/etcd/api/v3=github.com/openshift/etcd/api/v3@d8d67b8ce849f816d6d23c904098336632e2348f
+go mod edit -replace go.etcd.io/etcd/client/pkg/v3=github.com/openshift/etcd/client/pkg/v3@d8d67b8ce849f816d6d23c904098336632e2348f
+go mod edit -replace go.etcd.io/etcd/client/v3=github.com/openshift/etcd/client/v3@d8d67b8ce849f816d6d23c904098336632e2348f
+go mod edit -replace go.etcd.io/etcd/pkg/v3=github.com/openshift/etcd/pkg/v3@d8d67b8ce849f816d6d23c904098336632e2348f
+go mod edit -replace go.etcd.io/etcd/server/v3=github.com/openshift/etcd/server/v3@d8d67b8ce849f816d6d23c904098336632e2348f
 skipping modulepath k8s.io/api: no or unknown command []
 skipping modulepath k8s.io/apiextensions-apiserver: no or unknown command []
 skipping modulepath k8s.io/apimachinery: no or unknown command []
@@ -535,312 +707,321 @@ skipping modulepath k8s.io/pod-security-admission: no or unknown command []
 skipping modulepath k8s.io/sample-apiserver: no or unknown command []
 skipping modulepath k8s.io/sample-cli-plugin: no or unknown command []
 skipping modulepath k8s.io/sample-controller: no or unknown command []
-go mod edit -require github.com/openshift/route-controller-manager@c337cf413bbbfc2154dc1d3c1bf8007ea1edfbc8
-go mod edit -require github.com/openshift/cluster-policy-controller@ef703966fe6e82f5f255b06bc5c758f105bf8b28
+go mod edit -require github.com/openshift/route-controller-manager@624742d93f3a7885cf7f70985f1e23ff60da580d
+go mod edit -require github.com/openshift/cluster-policy-controller@44985a1306411101c84dd5081598fc928b432321
+Running `gofmt -s -l -w` on 4 file(s).
 ## Committing changes to microshift/go.mod
-[rebase-release-4.21-4.21.0-0.nightly-2025-10-22-123727_amd64-2025-10-22_arm64-2025-10-22 53ecde04e] update microshift/go.mod
- 2 files changed, 3 insertions(+), 66 deletions(-)
-## Updating deps/ directory
+[rebase-release-4.22-4.22.0-0.nightly-2026-04-01-151631_amd64-2026-04-01_arm64-2026-04-02 04e273843] update microshift/go.mod
+ 1 file changed, 28 insertions(+), 28 deletions(-)
 ## Commiting changes to microshift/deps directory
-warning: in the working copy of 'deps/github.com/openshift/kubernetes/vendor/github.com/MakeNowJust/heredoc/README.md', CRLF will be replaced by LF the next time Git touches it
-[rebase-release-4.21-4.21.0-0.nightly-2025-10-22-123727_amd64-2025-10-22_arm64-2025-10-22 c5799d054] update microshift/deps
- 4 files changed, 11 insertions(+), 12 deletions(-)
+[rebase-release-4.22-4.22.0-0.nightly-2026-04-01-151631_amd64-2026-04-01_arm64-2026-04-02 d17ab9fed] update microshift/deps
+ 27 files changed, 339 insertions(+), 168 deletions(-)
 ## Updating microshift/vendor directory
 /go/src/github.com/openshift/microshift /go/src/github.com/openshift/microshift
+go: inconsistent vendoring in /go/src/github.com/openshift/microshift:
+	k8s.io/api@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/apiextensions-apiserver@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/apimachinery@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/apiserver@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/cli-runtime@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/client-go@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/cloud-provider@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/component-base@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/kube-aggregator@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/kubectl@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/kubelet@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/cluster-bootstrap@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/component-helpers@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/controller-manager@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/cri-api@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/cri-client@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/csi-translation-lib@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/dynamic-resource-allocation@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/endpointslice@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/externaljwt@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/kms@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/kube-controller-manager@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/kube-proxy@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/kube-scheduler@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/metrics@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/mount-utils@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/pod-security-admission@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/kubernetes@v1.35.3: is explicitly required in go.mod, but not marked as explicit in vendor/modules.txt
+	k8s.io/api@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/apiextensions-apiserver@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/apimachinery@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/apiserver@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/cli-runtime@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/client-go@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/cloud-provider@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/cluster-bootstrap@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/component-base@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/component-helpers@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/controller-manager@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/cri-api@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/cri-client@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/csi-translation-lib@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/dynamic-resource-allocation@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/endpointslice@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/externaljwt@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/kms@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/kube-aggregator@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/kube-controller-manager@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/kube-proxy@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/kube-scheduler@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/kubectl@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/kubelet@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/kubernetes@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/metrics@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/mount-utils@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+	k8s.io/pod-security-admission@v1.35.2: is marked as explicit in vendor/modules.txt, but not explicitly required in go.mod
+
+	To ignore the vendor directory, use -mod=readonly or -mod=mod.
+	To sync the vendor directory, run:
+		go mod vendor
+panic: runtime error: invalid memory address or nil pointer dereference
+[signal SIGSEGV: segmentation violation code=0x1 addr=0x10 pc=0x9e5bd0]
+
+goroutine 1 [running]:
+cmd/internal/doc.findCodeRoots()
+	cmd/internal/doc/dirs.go:234 +0x7b0
+cmd/internal/doc.codeRoots.func1()
+	cmd/internal/doc/dirs.go:175 +0xf
+sync.(*Once).doSlow(0xb8b660?, 0xc000014c01?)
+	sync/once.go:78 +0xac
+sync.(*Once).Do(...)
+	sync/once.go:69
+cmd/internal/doc.codeRoots()
+	cmd/internal/doc/dirs.go:174 +0x2c
+cmd/internal/doc.dirsInit({0x0, 0x0, 0xbda640?})
+	cmd/internal/doc/dirs.go:58 +0x30e
+cmd/internal/doc.Main({0xc000024290, 0x1, 0x1})
+	cmd/internal/doc/main.go:60 +0x72
+cmd/go/internal/doc.runDoc({0xd2ad60?, 0x11be1e0?}, 0xc0000287f8?, {0xc000024290?, 0xb00700?, 0xb008c0?})
+	cmd/go/internal/doc/doc.go:139 +0x25
+main.invoke(0x113ff80, {0xc000024280, 0x2, 0x2})
+	cmd/go/main.go:341 +0x84a
+main.main()
+	cmd/go/main.go:220 +0xe8b
 go mod vendor
 /go/src/github.com/openshift/microshift
 ## Commiting changes to microshift/vendor directory
-[rebase-release-4.21-4.21.0-0.nightly-2025-10-22-123727_amd64-2025-10-22_arm64-2025-10-22 472937960] update microshift/vendor
- 4 files changed, 8 insertions(+), 29 deletions(-)
-Ensuring gofmt
-Running `gofmt -s -l -w` on 853 file(s).
-./deps/github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery/third_party/forked/golang/json/fields.go
-./deps/github.com/openshift/kubernetes/staging/src/k8s.io/client-go/third_party/forked/golang/template/exec.go
-./deps/github.com/openshift/kubernetes/staging/src/k8s.io/client-go/third_party/forked/golang/template/funcs.go
-./deps/github.com/openshift/kubernetes/staging/src/k8s.io/code-generator/third_party/forked/golang/reflect/type.go
-## Commiting gofmt changes to deps directory
-[rebase-release-4.21-4.21.0-0.nightly-2025-10-22-123727_amd64-2025-10-22_arm64-2025-10-22 02821965b] update deps gofmt
- 4 files changed, 12 insertions(+), 11 deletions(-)
+[rebase-release-4.22-4.22.0-0.nightly-2026-04-01-151631_amd64-2026-04-01_arm64-2026-04-02 8ecfcd8c8] update microshift/vendor
+ 4 files changed, 54 insertions(+), 40 deletions(-)
 ## Committing changes to etcd/go.mod
-[rebase-release-4.21-4.21.0-0.nightly-2025-10-22-123727_amd64-2025-10-22_arm64-2025-10-22 b4913d986] update etcd/go.mod
- 2 files changed, 6 insertions(+), 75 deletions(-)
-## Updating deps/ directory
+[rebase-release-4.22-4.22.0-0.nightly-2026-04-01-151631_amd64-2026-04-01_arm64-2026-04-02 12f9c0544] update etcd/go.mod
+ 1 file changed, 8 insertions(+), 8 deletions(-)
 ## Updating etcd/vendor directory
 /go/src/github.com/openshift/microshift/etcd /go/src/github.com/openshift/microshift
 go mod vendor
 /go/src/github.com/openshift/microshift
 ## Commiting changes to etcd/vendor directory
-[rebase-release-4.21-4.21.0-0.nightly-2025-10-22-123727_amd64-2025-10-22_arm64-2025-10-22 fb3d80983] update etcd/vendor
- 1 file changed, 26 deletions(-)
-Ensuring gofmt
-Running `gofmt -s -l -w` on 853 file(s).
+[rebase-release-4.22-4.22.0-0.nightly-2026-04-01-151631_amd64-2026-04-01_arm64-2026-04-02 7dbf527f1] update etcd/vendor
+ 1 file changed, 8 insertions(+), 8 deletions(-)
 Rebasing release_*.json
 ## Committing changes to pkg/release
-[rebase-release-4.21-4.21.0-0.nightly-2025-10-22-123727_amd64-2025-10-22_arm64-2025-10-22 a98b29d30] update component images
+[rebase-release-4.22-4.22.0-0.nightly-2026-04-01-151631_amd64-2026-04-01_arm64-2026-04-02 febf42175] update component images
  2 files changed, 2 insertions(+), 2 deletions(-)
 Copying manifests
-2025-10-23 04:18:02,339     INFO       Clearing directory assets/components/openshift-dns/dns/
-2025-10-23 04:18:02,340     DEBUG      Copying assets/components/openshift-dns/dns/cluster-role-binding.yaml <- _output/staging/cluster-dns-operator/pkg/manifests/assets/dns/cluster-role-binding.yaml
-2025-10-23 04:18:02,341     DEBUG      Copying assets/components/openshift-dns/dns/cluster-role.yaml <- _output/staging/cluster-dns-operator/pkg/manifests/assets/dns/cluster-role.yaml
-2025-10-23 04:18:02,341     INFO       Restoring assets/components/openshift-dns/dns/configmap.yaml
-2025-10-23 04:18:02,341     DEBUG      Executing 'git restore assets/components/openshift-dns/dns/configmap.yaml'
-2025-10-23 04:18:02,385     DEBUG      Copying assets/components/openshift-dns/dns/daemonset.yaml <- _output/staging/cluster-dns-operator/pkg/manifests/assets/dns/daemonset.yaml
-2025-10-23 04:18:02,386     DEBUG      Copying assets/components/openshift-dns/dns/namespace.yaml <- _output/staging/cluster-dns-operator/pkg/manifests/assets/dns/namespace.yaml
-2025-10-23 04:18:02,387     DEBUG      Copying assets/components/openshift-dns/dns/service-account.yaml <- _output/staging/cluster-dns-operator/pkg/manifests/assets/dns/service-account.yaml
-2025-10-23 04:18:02,388     DEBUG      Copying assets/components/openshift-dns/dns/service.yaml <- _output/staging/cluster-dns-operator/pkg/manifests/assets/dns/service.yaml
-2025-10-23 04:18:02,388     INFO       Clearing directory assets/components/openshift-dns/node-resolver
-2025-10-23 04:18:02,389     WARNING    Ignoring components/openshift-dns/node-resolver/daemonset.yaml because it's created by processing daemonset.yaml.tmpl
-2025-10-23 04:18:02,389     INFO       Restoring assets/components/openshift-dns/node-resolver/daemonset.yaml.tmpl
-2025-10-23 04:18:02,389     DEBUG      Executing 'git restore assets/components/openshift-dns/node-resolver/daemonset.yaml.tmpl'
-2025-10-23 04:18:02,429     DEBUG      Copying assets/components/openshift-dns/node-resolver/service-account.yaml <- _output/staging/cluster-dns-operator/pkg/manifests/assets/node-resolver/service-account.yaml
-2025-10-23 04:18:02,430     DEBUG      Copying assets/components/openshift-dns/node-resolver/update-node-resolver.sh <- _output/staging/cluster-dns-operator/pkg/manifests/assets/node-resolver/update-node-resolver.sh
-2025-10-23 04:18:02,431     INFO       Clearing directory assets/components/openshift-router/
-2025-10-23 04:18:02,432     DEBUG      Copying assets/components/openshift-router/cluster-role-binding.yaml <- _output/staging/cluster-ingress-operator/pkg/manifests/assets/router/cluster-role-binding.yaml
-2025-10-23 04:18:02,433     DEBUG      Copying assets/components/openshift-router/cluster-role.yaml <- _output/staging/cluster-ingress-operator/pkg/manifests/assets/router/cluster-role.yaml
-2025-10-23 04:18:02,434     INFO       Restoring assets/components/openshift-router/cluster-role-system-router.yaml
-2025-10-23 04:18:02,434     DEBUG      Executing 'git restore assets/components/openshift-router/cluster-role-system-router.yaml'
-2025-10-23 04:18:02,474     INFO       Restoring assets/components/openshift-router/configmap.yaml
-2025-10-23 04:18:02,474     DEBUG      Executing 'git restore assets/components/openshift-router/configmap.yaml'
-2025-10-23 04:18:02,514     INFO       Restoring assets/components/openshift-router/configmap-accesslog.yaml
-2025-10-23 04:18:02,515     DEBUG      Executing 'git restore assets/components/openshift-router/configmap-accesslog.yaml'
-2025-10-23 04:18:02,555     DEBUG      Copying assets/components/openshift-router/deployment.yaml <- _output/staging/cluster-ingress-operator/pkg/manifests/assets/router/deployment.yaml
-2025-10-23 04:18:02,556     DEBUG      Copying assets/components/openshift-router/namespace.yaml <- _output/staging/cluster-ingress-operator/pkg/manifests/assets/router/namespace.yaml
-2025-10-23 04:18:02,557     DEBUG      Copying assets/components/openshift-router/service-account.yaml <- _output/staging/cluster-ingress-operator/pkg/manifests/assets/router/service-account.yaml
-2025-10-23 04:18:02,558     DEBUG      Copying assets/components/openshift-router/service-internal.yaml <- _output/staging/cluster-ingress-operator/pkg/manifests/assets/router/service-internal.yaml
-2025-10-23 04:18:02,559     DEBUG      Copying assets/components/openshift-router/service-cloud.yaml <- _output/staging/cluster-ingress-operator/pkg/manifests/assets/router/service-cloud.yaml
-2025-10-23 04:18:02,560     INFO       Restoring assets/components/openshift-router/serving-certificate.yaml
-2025-10-23 04:18:02,560     DEBUG      Executing 'git restore assets/components/openshift-router/serving-certificate.yaml'
-2025-10-23 04:18:02,600     INFO       Restoring assets/components/openshift-router/cluster-role-aggregate-edit-route.yaml
-2025-10-23 04:18:02,600     DEBUG      Executing 'git restore assets/components/openshift-router/cluster-role-aggregate-edit-route.yaml'
-2025-10-23 04:18:02,642     INFO       Restoring assets/components/openshift-router/cluster-role-aggregate-admin-route.yaml
-2025-10-23 04:18:02,642     DEBUG      Executing 'git restore assets/components/openshift-router/cluster-role-aggregate-admin-route.yaml'
-2025-10-23 04:18:02,683     WARNING    Ignoring components/openshift-router/ingress-class.yaml because gets generated during image rebase
-2025-10-23 04:18:02,683     WARNING    Ignoring components/ovn/ because it's not covered by rebase script yet
-2025-10-23 04:18:02,683     INFO       Clearing directory assets/components/service-ca/
-2025-10-23 04:18:02,684     DEBUG      Copying assets/components/service-ca/clusterrole.yaml <- _output/staging/service-ca-operator/bindata/v4.0.0/controller/clusterrole.yaml
-2025-10-23 04:18:02,684     DEBUG      Copying assets/components/service-ca/clusterrolebinding.yaml <- _output/staging/service-ca-operator/bindata/v4.0.0/controller/clusterrolebinding.yaml
-2025-10-23 04:18:02,685     DEBUG      Copying assets/components/service-ca/deployment.yaml <- _output/staging/service-ca-operator/bindata/v4.0.0/controller/deployment.yaml
-2025-10-23 04:18:02,685     DEBUG      Copying assets/components/service-ca/ns.yaml <- _output/staging/service-ca-operator/bindata/v4.0.0/controller/ns.yaml
-2025-10-23 04:18:02,685     DEBUG      Copying assets/components/service-ca/role.yaml <- _output/staging/service-ca-operator/bindata/v4.0.0/controller/role.yaml
-2025-10-23 04:18:02,685     DEBUG      Copying assets/components/service-ca/rolebinding.yaml <- _output/staging/service-ca-operator/bindata/v4.0.0/controller/rolebinding.yaml
-2025-10-23 04:18:02,685     DEBUG      Copying assets/components/service-ca/sa.yaml <- _output/staging/service-ca-operator/bindata/v4.0.0/controller/sa.yaml
-2025-10-23 04:18:02,685     DEBUG      Copying assets/components/service-ca/signing-cabundle.yaml <- _output/staging/service-ca-operator/bindata/v4.0.0/controller/signing-cabundle.yaml
-2025-10-23 04:18:02,686     DEBUG      Copying assets/components/service-ca/signing-secret.yaml <- _output/staging/service-ca-operator/bindata/v4.0.0/controller/signing-secret.yaml
-2025-10-23 04:18:02,686     INFO       Not clearing dir components/csi-snapshot-controller/
-2025-10-23 04:18:02,686     DEBUG      Copying assets/components/csi-snapshot-controller/csi_controller_deployment.yaml <- _output/staging/cluster-csi-snapshot-controller-operator/assets/csi_controller_deployment.yaml
-2025-10-23 04:18:02,687     DEBUG      Copying assets/components/csi-snapshot-controller/serviceaccount.yaml <- _output/staging/cluster-csi-snapshot-controller-operator/assets/serviceaccount.yaml
-2025-10-23 04:18:02,688     DEBUG      Copying assets/components/csi-snapshot-controller/volumesnapshotclasses.yaml <- _output/staging/cluster-csi-snapshot-controller-operator/assets/volumesnapshotclasses.yaml
-2025-10-23 04:18:02,689     DEBUG      Copying assets/components/csi-snapshot-controller/volumesnapshotcontents.yaml <- _output/staging/cluster-csi-snapshot-controller-operator/assets/volumesnapshotcontents.yaml
-2025-10-23 04:18:02,690     DEBUG      Copying assets/components/csi-snapshot-controller/volumesnapshots.yaml <- _output/staging/cluster-csi-snapshot-controller-operator/assets/volumesnapshots.yaml
-2025-10-23 04:18:02,691     DEBUG      Copying assets/components/csi-snapshot-controller/05_operand_rbac.yaml <- _output/staging/cluster-csi-snapshot-controller-operator/assets/../manifests/05_operand_rbac.yaml
-2025-10-23 04:18:02,692     WARNING    Ignoring components/csi-snapshot-controller/clusterrole.yaml because extracted automatically from 05_operand_rbac.yaml
-2025-10-23 04:18:02,692     WARNING    Ignoring components/csi-snapshot-controller/clusterrolebinding.yaml because extracted automatically from 05_operand_rbac.yaml
-2025-10-23 04:18:02,692     INFO       Clearing directory assets/controllers/cluster-policy-controller/
-2025-10-23 04:18:02,693     DEBUG      Copying assets/controllers/cluster-policy-controller/namespace-security-allocation-controller-clusterrole.yaml <- _output/staging/cluster-kube-controller-manager-operator/bindata/assets/kube-controller-manager/namespace-security-allocation-controller-clusterrole.yaml
-2025-10-23 04:18:02,693     DEBUG      Copying assets/controllers/cluster-policy-controller/namespace-security-allocation-controller-clusterrolebinding.yaml <- _output/staging/cluster-kube-controller-manager-operator/bindata/assets/kube-controller-manager/namespace-security-allocation-controller-clusterrolebinding.yaml
-2025-10-23 04:18:02,694     DEBUG      Copying assets/controllers/cluster-policy-controller/podsecurity-admission-label-syncer-controller-clusterrole.yaml <- _output/staging/cluster-kube-controller-manager-operator/bindata/assets/kube-controller-manager/podsecurity-admission-label-syncer-controller-clusterrole.yaml
-2025-10-23 04:18:02,695     DEBUG      Copying assets/controllers/cluster-policy-controller/podsecurity-admission-label-syncer-controller-clusterrolebinding.yaml <- _output/staging/cluster-kube-controller-manager-operator/bindata/assets/kube-controller-manager/podsecurity-admission-label-syncer-controller-clusterrolebinding.yaml
-2025-10-23 04:18:02,696     DEBUG      Copying assets/controllers/cluster-policy-controller/podsecurity-admission-label-privileged-namespaces-syncer-controller-clusterrole.yaml <- _output/staging/cluster-kube-controller-manager-operator/bindata/assets/kube-controller-manager/podsecurity-admission-label-privileged-namespaces-syncer-controller-clusterrole.yaml
-2025-10-23 04:18:02,697     DEBUG      Copying assets/controllers/cluster-policy-controller/podsecurity-admission-label-privileged-namespaces-syncer-controller-clusterrolebinding.yaml <- _output/staging/cluster-kube-controller-manager-operator/bindata/assets/kube-controller-manager/podsecurity-admission-label-privileged-namespaces-syncer-controller-clusterrolebinding.yaml
-2025-10-23 04:18:02,698     INFO       Clearing directory assets/controllers/kube-apiserver/
-2025-10-23 04:18:02,698     DEBUG      Copying assets/controllers/kube-apiserver/config-overrides.yaml <- _output/staging/cluster-kube-apiserver-operator/bindata/assets/config/config-overrides.yaml
-2025-10-23 04:18:02,698     DEBUG      Copying assets/controllers/kube-apiserver/defaultconfig.yaml <- _output/staging/cluster-kube-apiserver-operator/bindata/assets/config/defaultconfig.yaml
-2025-10-23 04:18:02,698     INFO       Clearing directory assets/controllers/kube-controller-manager/
-2025-10-23 04:18:02,699     DEBUG      Copying assets/controllers/kube-controller-manager/defaultconfig.yaml <- _output/staging/cluster-kube-controller-manager-operator/bindata/assets/kube-controller-manager/../config/defaultconfig.yaml
-2025-10-23 04:18:02,700     DEBUG      Copying assets/controllers/kube-controller-manager/csr_approver_clusterrole.yaml <- _output/staging/cluster-kube-controller-manager-operator/bindata/assets/kube-controller-manager/csr_approver_clusterrole.yaml
-2025-10-23 04:18:02,700     DEBUG      Copying assets/controllers/kube-controller-manager/csr_approver_clusterrolebinding.yaml <- _output/staging/cluster-kube-controller-manager-operator/bindata/assets/kube-controller-manager/csr_approver_clusterrolebinding.yaml
-2025-10-23 04:18:02,701     DEBUG      Copying assets/controllers/kube-controller-manager/namespace-openshift-kube-controller-manager.yaml <- _output/staging/cluster-kube-controller-manager-operator/bindata/assets/kube-controller-manager/ns.yaml
-2025-10-23 04:18:02,702     INFO       Clearing directory assets/controllers/openshift-default-scc-manager/
-2025-10-23 04:18:02,703     DEBUG      Copying assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_cr-scc-anyuid.yaml <- _output/staging/release-manifests/0000_20_kube-apiserver-operator_00_cr-scc-anyuid.yaml
-2025-10-23 04:18:02,704     DEBUG      Copying assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_cr-scc-hostaccess.yaml <- _output/staging/release-manifests/0000_20_kube-apiserver-operator_00_cr-scc-hostaccess.yaml
-2025-10-23 04:18:02,705     DEBUG      Copying assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_cr-scc-hostmount-anyuid.yaml <- _output/staging/release-manifests/0000_20_kube-apiserver-operator_00_cr-scc-hostmount-anyuid.yaml
-2025-10-23 04:18:02,706     DEBUG      Copying assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_cr-scc-hostnetwork-v2.yaml <- _output/staging/release-manifests/0000_20_kube-apiserver-operator_00_cr-scc-hostnetwork-v2.yaml
-2025-10-23 04:18:02,707     DEBUG      Copying assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_cr-scc-hostnetwork.yaml <- _output/staging/release-manifests/0000_20_kube-apiserver-operator_00_cr-scc-hostnetwork.yaml
-2025-10-23 04:18:02,707     DEBUG      Copying assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_cr-scc-nonroot-v2.yaml <- _output/staging/release-manifests/0000_20_kube-apiserver-operator_00_cr-scc-nonroot-v2.yaml
-2025-10-23 04:18:02,708     DEBUG      Copying assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_cr-scc-nonroot.yaml <- _output/staging/release-manifests/0000_20_kube-apiserver-operator_00_cr-scc-nonroot.yaml
-2025-10-23 04:18:02,709     DEBUG      Copying assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_cr-scc-privileged.yaml <- _output/staging/release-manifests/0000_20_kube-apiserver-operator_00_cr-scc-privileged.yaml
-2025-10-23 04:18:02,710     DEBUG      Copying assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_cr-scc-restricted-v2.yaml <- _output/staging/release-manifests/0000_20_kube-apiserver-operator_00_cr-scc-restricted-v2.yaml
-2025-10-23 04:18:02,711     DEBUG      Copying assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_cr-scc-restricted.yaml <- _output/staging/release-manifests/0000_20_kube-apiserver-operator_00_cr-scc-restricted.yaml
-2025-10-23 04:18:02,712     DEBUG      Copying assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_crb-systemauthenticated-scc-restricted-v2.yaml <- _output/staging/release-manifests/0000_20_kube-apiserver-operator_00_crb-systemauthenticated-scc-restricted-v2.yaml
-2025-10-23 04:18:02,712     DEBUG      Copying assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_scc-anyuid.yaml <- _output/staging/release-manifests/0000_20_kube-apiserver-operator_00_scc-anyuid.yaml
-2025-10-23 04:18:02,713     DEBUG      Copying assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_scc-hostaccess.yaml <- _output/staging/release-manifests/0000_20_kube-apiserver-operator_00_scc-hostaccess.yaml
-2025-10-23 04:18:02,714     DEBUG      Copying assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_scc-hostmount-anyuid.yaml <- _output/staging/release-manifests/0000_20_kube-apiserver-operator_00_scc-hostmount-anyuid.yaml
-2025-10-23 04:18:02,714     DEBUG      Copying assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_scc-hostnetwork-v2.yaml <- _output/staging/release-manifests/0000_20_kube-apiserver-operator_00_scc-hostnetwork-v2.yaml
-2025-10-23 04:18:02,715     DEBUG      Copying assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_scc-hostnetwork.yaml <- _output/staging/release-manifests/0000_20_kube-apiserver-operator_00_scc-hostnetwork.yaml
-2025-10-23 04:18:02,716     DEBUG      Copying assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_scc-nonroot-v2.yaml <- _output/staging/release-manifests/0000_20_kube-apiserver-operator_00_scc-nonroot-v2.yaml
-2025-10-23 04:18:02,716     DEBUG      Copying assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_scc-nonroot.yaml <- _output/staging/release-manifests/0000_20_kube-apiserver-operator_00_scc-nonroot.yaml
-2025-10-23 04:18:02,717     DEBUG      Copying assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_scc-privileged.yaml <- _output/staging/release-manifests/0000_20_kube-apiserver-operator_00_scc-privileged.yaml
-2025-10-23 04:18:02,718     DEBUG      Copying assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_scc-restricted-v2.yaml <- _output/staging/release-manifests/0000_20_kube-apiserver-operator_00_scc-restricted-v2.yaml
-2025-10-23 04:18:02,719     DEBUG      Copying assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_scc-restricted.yaml <- _output/staging/release-manifests/0000_20_kube-apiserver-operator_00_scc-restricted.yaml
-2025-10-23 04:18:02,719     INFO       Clearing directory assets/controllers/route-controller-manager/
-2025-10-23 04:18:02,720     DEBUG      Copying assets/controllers/route-controller-manager/ns.yaml <- _output/staging/cluster-openshift-controller-manager-operator/bindata/assets/openshift-controller-manager/ns.yaml
-2025-10-23 04:18:02,720     DEBUG      Copying assets/controllers/route-controller-manager/sa.yaml <- _output/staging/cluster-openshift-controller-manager-operator/bindata/assets/openshift-controller-manager/sa.yaml
-2025-10-23 04:18:02,721     DEBUG      Copying assets/controllers/route-controller-manager/route-controller-manager-clusterrole.yaml <- _output/staging/cluster-openshift-controller-manager-operator/bindata/assets/openshift-controller-manager/route-controller-manager-clusterrole.yaml
-2025-10-23 04:18:02,721     DEBUG      Copying assets/controllers/route-controller-manager/route-controller-manager-clusterrolebinding.yaml <- _output/staging/cluster-openshift-controller-manager-operator/bindata/assets/openshift-controller-manager/route-controller-manager-clusterrolebinding.yaml
-2025-10-23 04:18:02,721     DEBUG      Copying assets/controllers/route-controller-manager/informer-clusterrolebinding.yaml <- _output/staging/cluster-openshift-controller-manager-operator/bindata/assets/openshift-controller-manager/informer-clusterrolebinding.yaml
-2025-10-23 04:18:02,721     DEBUG      Copying assets/controllers/route-controller-manager/informer-clusterrole.yaml <- _output/staging/cluster-openshift-controller-manager-operator/bindata/assets/openshift-controller-manager/informer-clusterrole.yaml
-2025-10-23 04:18:02,721     DEBUG      Copying assets/controllers/route-controller-manager/route-controller-manager-ingress-to-route-controller-clusterrolebinding.yaml <- _output/staging/cluster-openshift-controller-manager-operator/bindata/assets/openshift-controller-manager/route-controller-manager-ingress-to-route-controller-clusterrolebinding.yaml
-2025-10-23 04:18:02,721     DEBUG      Copying assets/controllers/route-controller-manager/route-controller-manager-ingress-to-route-controller-clusterrole.yaml <- _output/staging/cluster-openshift-controller-manager-operator/bindata/assets/openshift-controller-manager/route-controller-manager-ingress-to-route-controller-clusterrole.yaml
-2025-10-23 04:18:02,722     DEBUG      Copying assets/controllers/route-controller-manager/route-controller-manager-ns.yaml <- _output/staging/cluster-openshift-controller-manager-operator/bindata/assets/openshift-controller-manager/route-controller-manager-ns.yaml
-2025-10-23 04:18:02,722     DEBUG      Copying assets/controllers/route-controller-manager/route-controller-manager-sa.yaml <- _output/staging/cluster-openshift-controller-manager-operator/bindata/assets/openshift-controller-manager/route-controller-manager-sa.yaml
-2025-10-23 04:18:02,722     DEBUG      Copying assets/controllers/route-controller-manager/route-controller-manager-separate-sa-rolebinding.yaml <- _output/staging/cluster-openshift-controller-manager-operator/bindata/assets/openshift-controller-manager/route-controller-manager-separate-sa-rolebinding.yaml
-2025-10-23 04:18:02,722     DEBUG      Copying assets/controllers/route-controller-manager/route-controller-manager-separate-sa-role.yaml <- _output/staging/cluster-openshift-controller-manager-operator/bindata/assets/openshift-controller-manager/route-controller-manager-separate-sa-role.yaml
-2025-10-23 04:18:02,722     DEBUG      Copying assets/controllers/route-controller-manager/route-controller-manager-tokenreview-clusterrolebinding.yaml <- _output/staging/cluster-openshift-controller-manager-operator/bindata/assets/openshift-controller-manager/route-controller-manager-tokenreview-clusterrolebinding.yaml
-2025-10-23 04:18:02,722     DEBUG      Copying assets/controllers/route-controller-manager/route-controller-manager-tokenreview-clusterrole.yaml <- _output/staging/cluster-openshift-controller-manager-operator/bindata/assets/openshift-controller-manager/route-controller-manager-tokenreview-clusterrole.yaml
-2025-10-23 04:18:02,723     INFO       Restoring assets/controllers/route-controller-manager/route-controller-manager-authentication-reader-rolebinding.yaml
-2025-10-23 04:18:02,723     DEBUG      Executing 'git restore assets/controllers/route-controller-manager/route-controller-manager-authentication-reader-rolebinding.yaml'
-2025-10-23 04:18:02,764     INFO       Not clearing dir core/
-2025-10-23 04:18:02,764     DEBUG      Copying assets/core/0000_50_cluster-openshift-controller-manager_00_namespace.yaml <- _output/staging/cluster-openshift-controller-manager-operator/bindata/assets/openshift-controller-manager/ns.yaml
-2025-10-23 04:18:02,764     DEBUG      Copying assets/core/namespace-openshift-infra.yaml <- _output/staging/cluster-kube-controller-manager-operator/bindata/assets/kube-controller-manager/namespace-openshift-infra.yaml
-2025-10-23 04:18:02,765     WARNING    Ignoring core/priority-class-openshift-user-critical.yaml because it's a priority class needed for oc debug node command - not available in any repo that rebase is using
-2025-10-23 04:18:02,765     WARNING    Ignoring core/securityv1-local-apiservice.yaml because it's a local API service for security API group, needed if OpenShift API server is not present
-2025-10-23 04:18:02,765     DEBUG      Copying assets/core/kubelet.yaml <- _output/staging/machine-config-operator/templates/master/01-master-kubelet/_base/files/kubelet.yaml
-2025-10-23 04:18:02,766     WARNING    Ignoring core/kubelet-client-ca.yaml because it's a template for ConfigMap processed during runtime
-2025-10-23 04:18:02,766     INFO       Clearing directory assets/crd/
-2025-10-23 04:18:02,766     DEBUG      Copying assets/crd/0000_03_config-operator_01_securitycontextconstraints.crd.yaml <- _output/staging/release-manifests/0000_03_config-operator_01_securitycontextconstraints.crd.yaml
-2025-10-23 04:18:02,767     DEBUG      Copying assets/crd/0000_03_config-operator_02_rangeallocations.crd.yaml <- _output/staging/release-manifests/0000_03_config-operator_02_rangeallocations.crd.yaml
-2025-10-23 04:18:02,768     DEBUG      Copying assets/crd/storage_version_migration.crd.yaml <- _output/staging/release-manifests/0000_50_cluster-kube-storage-version-migrator-operator_01_storage_migration_crd.yaml
-2025-10-23 04:18:02,769     DEBUG      Copying assets/crd/route.crd.yaml <- _output/staging/api/route/v1/zz_generated.crd-manifests/routes.crd.yaml
-2025-10-23 04:18:02,770     WARNING    Ignoring release/ because it contains files generated during rebase procedure
-2025-10-23 04:18:02,770     INFO       Not clearing dir version/
-2025-10-23 04:18:02,771     WARNING    Ignoring version/microshift-version.yaml because it's a template for ConfigMap processed during runtime
-2025-10-23 04:18:02,771     WARNING    Ignoring embed.go because it's a MicroShift specific Go file that embeds into a binary
-2025-10-23 04:18:02,771     INFO       Clearing directory assets/optional/operator-lifecycle-manager/
-2025-10-23 04:18:02,772     DEBUG      Copying assets/optional/operator-lifecycle-manager/0000_50_olm_00-catalogsources.crd.yaml <- _output/staging/operator-framework-olm/microshift-manifests/0000_50_olm_00-catalogsources.crd.yaml
-2025-10-23 04:18:02,772     DEBUG      Copying assets/optional/operator-lifecycle-manager/0000_50_olm_00-clusterserviceversions.crd.yaml <- _output/staging/operator-framework-olm/microshift-manifests/0000_50_olm_00-clusterserviceversions.crd.yaml
-2025-10-23 04:18:02,773     DEBUG      Copying assets/optional/operator-lifecycle-manager/0000_50_olm_00-installplans.crd.yaml <- _output/staging/operator-framework-olm/microshift-manifests/0000_50_olm_00-installplans.crd.yaml
-2025-10-23 04:18:02,773     DEBUG      Copying assets/optional/operator-lifecycle-manager/0000_50_olm_00-namespace.yaml <- _output/staging/operator-framework-olm/microshift-manifests/0000_50_olm_00-namespace.yaml
-2025-10-23 04:18:02,773     DEBUG      Copying assets/optional/operator-lifecycle-manager/0000_50_olm_00-olmconfigs.crd.yaml <- _output/staging/operator-framework-olm/microshift-manifests/0000_50_olm_00-olmconfigs.crd.yaml
-2025-10-23 04:18:02,773     DEBUG      Copying assets/optional/operator-lifecycle-manager/0000_50_olm_00-operatorconditions.crd.yaml <- _output/staging/operator-framework-olm/microshift-manifests/0000_50_olm_00-operatorconditions.crd.yaml
-2025-10-23 04:18:02,774     DEBUG      Copying assets/optional/operator-lifecycle-manager/0000_50_olm_00-operatorgroups.crd.yaml <- _output/staging/operator-framework-olm/microshift-manifests/0000_50_olm_00-operatorgroups.crd.yaml
-2025-10-23 04:18:02,774     DEBUG      Copying assets/optional/operator-lifecycle-manager/0000_50_olm_00-operators.crd.yaml <- _output/staging/operator-framework-olm/microshift-manifests/0000_50_olm_00-operators.crd.yaml
-2025-10-23 04:18:02,774     DEBUG      Copying assets/optional/operator-lifecycle-manager/0000_50_olm_00-packageserver.pdb.yaml <- _output/staging/operator-framework-olm/microshift-manifests/0000_50_olm_00-packageserver.pdb.yaml
-2025-10-23 04:18:02,774     DEBUG      Copying assets/optional/operator-lifecycle-manager/0000_50_olm_00-pprof-config.yaml <- _output/staging/operator-framework-olm/microshift-manifests/0000_50_olm_00-pprof-config.yaml
-2025-10-23 04:18:02,774     DEBUG      Copying assets/optional/operator-lifecycle-manager/0000_50_olm_00-pprof-rbac.yaml <- _output/staging/operator-framework-olm/microshift-manifests/0000_50_olm_00-pprof-rbac.yaml
-2025-10-23 04:18:02,774     DEBUG      Copying assets/optional/operator-lifecycle-manager/0000_50_olm_00-pprof-secret.yaml <- _output/staging/operator-framework-olm/microshift-manifests/0000_50_olm_00-pprof-secret.yaml
-2025-10-23 04:18:02,775     DEBUG      Copying assets/optional/operator-lifecycle-manager/0000_50_olm_00-subscriptions.crd.yaml <- _output/staging/operator-framework-olm/microshift-manifests/0000_50_olm_00-subscriptions.crd.yaml
-2025-10-23 04:18:02,775     DEBUG      Copying assets/optional/operator-lifecycle-manager/0000_50_olm_01-networkpolicies.yaml <- _output/staging/operator-framework-olm/microshift-manifests/0000_50_olm_01-networkpolicies.yaml
-2025-10-23 04:18:02,775     DEBUG      Copying assets/optional/operator-lifecycle-manager/0000_50_olm_02-olm-operator.serviceaccount.yaml <- _output/staging/operator-framework-olm/microshift-manifests/0000_50_olm_02-olm-operator.serviceaccount.yaml
-2025-10-23 04:18:02,775     DEBUG      Copying assets/optional/operator-lifecycle-manager/0000_50_olm_03-olmconfig.yaml <- _output/staging/operator-framework-olm/microshift-manifests/0000_50_olm_03-olmconfig.yaml
-2025-10-23 04:18:02,776     DEBUG      Copying assets/optional/operator-lifecycle-manager/0000_50_olm_03-services.yaml <- _output/staging/operator-framework-olm/microshift-manifests/0000_50_olm_03-services.yaml
-2025-10-23 04:18:02,776     DEBUG      Copying assets/optional/operator-lifecycle-manager/0000_50_olm_07-olm-operator.deployment.yaml <- _output/staging/operator-framework-olm/microshift-manifests/0000_50_olm_07-olm-operator.deployment.yaml
-2025-10-23 04:18:02,776     DEBUG      Copying assets/optional/operator-lifecycle-manager/0000_50_olm_08-catalog-operator.deployment.yaml <- _output/staging/operator-framework-olm/microshift-manifests/0000_50_olm_08-catalog-operator.deployment.yaml
-2025-10-23 04:18:02,776     DEBUG      Copying assets/optional/operator-lifecycle-manager/0000_50_olm_09-aggregated.clusterrole.yaml <- _output/staging/operator-framework-olm/microshift-manifests/0000_50_olm_09-aggregated.clusterrole.yaml
-2025-10-23 04:18:02,776     DEBUG      Copying assets/optional/operator-lifecycle-manager/0000_50_olm_13-operatorgroup-default.yaml <- _output/staging/operator-framework-olm/microshift-manifests/0000_50_olm_13-operatorgroup-default.yaml
-2025-10-23 04:18:02,776     DEBUG      Copying assets/optional/operator-lifecycle-manager/0000_50_olm_15-csv-viewer.rbac.yaml <- _output/staging/operator-framework-olm/microshift-manifests/0000_50_olm_15-csv-viewer.rbac.yaml
-2025-10-23 04:18:02,777     DEBUG      Copying assets/optional/operator-lifecycle-manager/image-references <- _output/staging/operator-framework-olm/microshift-manifests/image-references
-2025-10-23 04:18:02,777     DEBUG      Copying assets/optional/operator-lifecycle-manager/kustomization.yaml <- _output/staging/operator-framework-olm/microshift-manifests/kustomization.yaml
-2025-10-23 04:18:02,777     WARNING    Ignoring optional/operator-lifecycle-manager/kustomization.x86_64.yaml because gets generated during image rebase
-2025-10-23 04:18:02,777     WARNING    Ignoring optional/operator-lifecycle-manager/kustomization.aarch64.yaml because gets generated during image rebase
-2025-10-23 04:18:02,777     WARNING    Ignoring optional/operator-lifecycle-manager/release-olm-aarch64.json because gets generated during image rebase
-2025-10-23 04:18:02,777     WARNING    Ignoring optional/operator-lifecycle-manager/release-olm-x86_64.json because gets generated during image rebase
-2025-10-23 04:18:02,777     WARNING    Ignoring components/multus/ because they don't exist in upstream repository - only in microshift
-2025-10-23 04:18:02,777     WARNING    Ignoring optional/observability/ because they don't exist in upstream repository - only in microshift
-Modifying OpenShift manifests
-/go/src/github.com/openshift/microshift /go/src/github.com/openshift/microshift/_output/staging /go/src/github.com/openshift/microshift
-Checking patch /go/src/github.com/openshift/microshift/scripts/auto-rebase/manifests_patches/010-ingress-deployment-clientCA.patch
-/go/src/github.com/openshift/microshift/scripts/auto-rebase/manifests_patches/010-ingress-deployment-clientCA.patch - Patch applied
-Checking patch /go/src/github.com/openshift/microshift/scripts/auto-rebase/manifests_patches/011-ingress-deployment-access-logging.patch
-/go/src/github.com/openshift/microshift/scripts/auto-rebase/manifests_patches/011-ingress-deployment-access-logging.patch - Patch applied
-Checking patch /go/src/github.com/openshift/microshift/scripts/auto-rebase/manifests_patches/012-ingress-class.patch
-/go/src/github.com/openshift/microshift/scripts/auto-rebase/manifests_patches/012-ingress-class.patch - Patch applied
-/go/src/github.com/openshift/microshift/_output/staging /go/src/github.com/openshift/microshift
-Rebasing operator-lifecycle-manager manifests
-Rebasing Multus images
-## Committing changes to assets and pkg/assets
-[rebase-release-4.21-4.21.0-0.nightly-2025-10-22-123727_amd64-2025-10-22_arm64-2025-10-22 a4b9f77c5] update manifests
- 11 files changed, 49 insertions(+), 47 deletions(-)
-Rebasing Makefile
-## Committing changes to buildfiles
-[rebase-release-4.21-4.21.0-0.nightly-2025-10-22-123727_amd64-2025-10-22_arm64-2025-10-22 bbc290cbe] update buildfiles
- 2 files changed, 2 insertions(+), 2 deletions(-)
-# Removing staging directory
+2026-04-02 04:23:12,331     INFO       Clearing directory assets/components/openshift-dns/dns/
+2026-04-02 04:23:12,332     DEBUG      Copying assets/components/openshift-dns/dns/cluster-role-binding.yaml <- _output/staging/cluster-dns-operator/pkg/manifests/assets/dns/cluster-role-binding.yaml
+2026-04-02 04:23:12,335     DEBUG      Copying assets/components/openshift-dns/dns/cluster-role.yaml <- _output/staging/cluster-dns-operator/pkg/manifests/assets/dns/cluster-role.yaml
+2026-04-02 04:23:12,335     INFO       Restoring assets/components/openshift-dns/dns/configmap.yaml
+2026-04-02 04:23:12,335     DEBUG      Executing 'git restore assets/components/openshift-dns/dns/configmap.yaml'
+2026-04-02 04:23:12,382     DEBUG      Copying assets/components/openshift-dns/dns/daemonset.yaml <- _output/staging/cluster-dns-operator/pkg/manifests/assets/dns/daemonset.yaml
+2026-04-02 04:23:12,384     DEBUG      Copying assets/components/openshift-dns/dns/namespace.yaml <- _output/staging/cluster-dns-operator/pkg/manifests/assets/dns/namespace.yaml
+2026-04-02 04:23:12,385     DEBUG      Copying assets/components/openshift-dns/dns/service-account.yaml <- _output/staging/cluster-dns-operator/pkg/manifests/assets/dns/service-account.yaml
+2026-04-02 04:23:12,390     DEBUG      Copying assets/components/openshift-dns/dns/service.yaml <- _output/staging/cluster-dns-operator/pkg/manifests/assets/dns/service.yaml
+2026-04-02 04:23:12,392     WARNING    Ignoring components/openshift-dns/dns/hosts-configmap-rolebinding.yaml because RBAC rules for hosts customization
+2026-04-02 04:23:12,393     WARNING    Ignoring components/openshift-dns/dns/hosts-configmap-role.yaml because RBAC rules for hosts customization
+2026-04-02 04:23:12,393     INFO       Clearing directory assets/components/openshift-dns/node-resolver
+2026-04-02 04:23:12,393     WARNING    Ignoring components/openshift-dns/node-resolver/daemonset.yaml because it's created by processing daemonset.yaml.tmpl
+2026-04-02 04:23:12,393     INFO       Restoring assets/components/openshift-dns/node-resolver/daemonset.yaml.tmpl
+2026-04-02 04:23:12,393     DEBUG      Executing 'git restore assets/components/openshift-dns/node-resolver/daemonset.yaml.tmpl'
+2026-04-02 04:23:12,468     DEBUG      Copying assets/components/openshift-dns/node-resolver/service-account.yaml <- _output/staging/cluster-dns-operator/pkg/manifests/assets/node-resolver/service-account.yaml
+2026-04-02 04:23:12,473     DEBUG      Copying assets/components/openshift-dns/node-resolver/update-node-resolver.sh <- _output/staging/cluster-dns-operator/pkg/manifests/assets/node-resolver/update-node-resolver.sh
+2026-04-02 04:23:12,482     INFO       Clearing directory assets/components/openshift-router/
+2026-04-02 04:23:12,483     DEBUG      Copying assets/components/openshift-router/cluster-role-binding.yaml <- _output/staging/cluster-ingress-operator/pkg/manifests/assets/router/cluster-role-binding.yaml
+2026-04-02 04:23:12,488     DEBUG      Copying assets/components/openshift-router/cluster-role.yaml <- _output/staging/cluster-ingress-operator/pkg/manifests/assets/router/cluster-role.yaml
+2026-04-02 04:23:12,497     INFO       Restoring assets/components/openshift-router/cluster-role-system-router.yaml
+2026-04-02 04:23:12,497     DEBUG      Executing 'git restore assets/components/openshift-router/cluster-role-system-router.yaml'
+2026-04-02 04:23:12,585     INFO       Restoring assets/components/openshift-router/configmap.yaml
+2026-04-02 04:23:12,585     DEBUG      Executing 'git restore assets/components/openshift-router/configmap.yaml'
+2026-04-02 04:23:12,693     INFO       Restoring assets/components/openshift-router/configmap-accesslog.yaml
+2026-04-02 04:23:12,693     DEBUG      Executing 'git restore assets/components/openshift-router/configmap-accesslog.yaml'
+2026-04-02 04:23:12,783     DEBUG      Copying assets/components/openshift-router/deployment.yaml <- _output/staging/cluster-ingress-operator/pkg/manifests/assets/router/deployment.yaml
+2026-04-02 04:23:12,792     DEBUG      Copying assets/components/openshift-router/namespace.yaml <- _output/staging/cluster-ingress-operator/pkg/manifests/assets/router/namespace.yaml
+2026-04-02 04:23:12,800     DEBUG      Copying assets/components/openshift-router/service-account.yaml <- _output/staging/cluster-ingress-operator/pkg/manifests/assets/router/service-account.yaml
+2026-04-02 04:23:12,812     DEBUG      Copying assets/components/openshift-router/service-internal.yaml <- _output/staging/cluster-ingress-operator/pkg/manifests/assets/router/service-internal.yaml
+2026-04-02 04:23:12,820     DEBUG      Copying assets/components/openshift-router/service-cloud.yaml <- _output/staging/cluster-ingress-operator/pkg/manifests/assets/router/service-cloud.yaml
+2026-04-02 04:23:12,827     INFO       Restoring assets/components/openshift-router/serving-certificate.yaml
+2026-04-02 04:23:12,827     DEBUG      Executing 'git restore assets/components/openshift-router/serving-certificate.yaml'
+2026-04-02 04:23:12,886     INFO       Restoring assets/components/openshift-router/cluster-role-aggregate-edit-route.yaml
+2026-04-02 04:23:12,886     DEBUG      Executing 'git restore assets/components/openshift-router/cluster-role-aggregate-edit-route.yaml'
+2026-04-02 04:23:12,959     INFO       Restoring assets/components/openshift-router/cluster-role-aggregate-admin-route.yaml
+2026-04-02 04:23:12,959     DEBUG      Executing 'git restore assets/components/openshift-router/cluster-role-aggregate-admin-route.yaml'
+2026-04-02 04:23:13,038     WARNING    Ignoring components/openshift-router/ingress-class.yaml because gets generated during image rebase
+2026-04-02 04:23:13,038     WARNING    Ignoring components/ovn/ because it's not covered by rebase script yet
+2026-04-02 04:23:13,038     INFO       Clearing directory assets/components/service-ca/
+2026-04-02 04:23:13,039     DEBUG      Copying assets/components/service-ca/clusterrole.yaml <- _output/staging/service-ca-operator/bindata/v4.0.0/controller/clusterrole.yaml
+Traceback (most recent call last):
+  File "/go/src/github.com/openshift/microshift/scripts/auto-rebase/handle_assets.py", line 162, in <module>
+    main()
+  File "/go/src/github.com/openshift/microshift/scripts/auto-rebase/handle_assets.py", line 155, in main
+    handle_dir(asset)
+  File "/go/src/github.com/openshift/microshift/scripts/auto-rebase/handle_assets.py", line 129, in handle_dir
+    handle_file(file, dst, new_src_prefix)
+  File "/go/src/github.com/openshift/microshift/scripts/auto-rebase/handle_assets.py", line 112, in handle_file
+    copy(src, dst)
+  File "/go/src/github.com/openshift/microshift/scripts/auto-rebase/handle_assets.py", line 71, in copy
+    shutil.copyfile(src, dst)
+  File "/usr/lib64/python3.9/shutil.py", line 264, in copyfile
+    with open(src, 'rb') as fsrc:
+FileNotFoundError: [Errno 2] No such file or directory: '_output/staging/service-ca-operator/bindata/v4.0.0/controller/clusterrole.yaml'
 ==================================================
 rebase_ai_model_serving.sh:
-Rebasing AI Model Serving for MicroShift to registry.redhat.io/rhoai/odh-operator-bundle:v2.22
+Rebasing AI Model Serving for MicroShift to registry.redhat.io/rhoai/odh-operator-bundle:v2.25
 Fetching RHOAI CSV
 Fetching RHOAI manifests
 Updating last_rebase_ai_model_serving.sh
 Updating rebase_job_entrypoint.sh
 Copying manifests from staging dir to assets/
-2025-10-23 04:18:23,086     INFO       Not clearing dir optional/ai-model-serving/
-2025-10-23 04:18:23,086     WARNING    Ignoring optional/ai-model-serving/release-ai-model-serving-x86_64.json because Release info file
-2025-10-23 04:18:23,086     INFO       Not clearing dir optional/ai-model-serving/kserve/
-2025-10-23 04:18:23,086     WARNING    Ignoring optional/ai-model-serving/kserve/kustomization.yaml because MicroShift specific overrides
-2025-10-23 04:18:23,086     WARNING    Ignoring optional/ai-model-serving/kserve/inferenceservice-config-microshift-patch.yaml because MicroShift specific overrides
-2025-10-23 04:18:23,086     WARNING    Ignoring optional/ai-model-serving/kserve/namespace.yaml because MicroShift specific overrides
-2025-10-23 04:18:23,086     INFO       Clearing directory assets/optional/ai-model-serving/kserve/overlays/odh/
-2025-10-23 04:18:23,087     DEBUG      Copying assets/optional/ai-model-serving/kserve/overlays/odh/inferenceservice-config-patch.yaml <- _output/staging/rhoai/operator/kserve/overlays/odh/inferenceservice-config-patch.yaml
-2025-10-23 04:18:23,087     DEBUG      Copying assets/optional/ai-model-serving/kserve/overlays/odh/kustomization.yaml <- _output/staging/rhoai/operator/kserve/overlays/odh/kustomization.yaml
-2025-10-23 04:18:23,087     DEBUG      Copying assets/optional/ai-model-serving/kserve/overlays/odh/params.env <- _output/staging/rhoai/operator/kserve/overlays/odh/params.env
-2025-10-23 04:18:23,087     DEBUG      Copying assets/optional/ai-model-serving/kserve/overlays/odh/params.yaml <- _output/staging/rhoai/operator/kserve/overlays/odh/params.yaml
-2025-10-23 04:18:23,087     DEBUG      Copying assets/optional/ai-model-serving/kserve/overlays/odh/remove-namespace.yaml <- _output/staging/rhoai/operator/kserve/overlays/odh/remove-namespace.yaml
-2025-10-23 04:18:23,088     DEBUG      Copying assets/optional/ai-model-serving/kserve/overlays/odh/set-resources-manager-patch.yaml <- _output/staging/rhoai/operator/kserve/overlays/odh/set-resources-manager-patch.yaml
-2025-10-23 04:18:23,088     DEBUG      Copying assets/optional/ai-model-serving/kserve/overlays/odh/user-cluster-roles.yaml <- _output/staging/rhoai/operator/kserve/overlays/odh/user-cluster-roles.yaml
-2025-10-23 04:18:23,088     INFO       Clearing directory assets/optional/ai-model-serving/kserve/default/
-2025-10-23 04:18:23,089     DEBUG      Copying assets/optional/ai-model-serving/kserve/default/cainjection_conversion_webhook.yaml <- _output/staging/rhoai/operator/kserve/default/cainjection_conversion_webhook.yaml
-2025-10-23 04:18:23,089     DEBUG      Copying assets/optional/ai-model-serving/kserve/default/clusterservingruntime_validatingwebhook_cainjection_patch.yaml <- _output/staging/rhoai/operator/kserve/default/clusterservingruntime_validatingwebhook_cainjection_patch.yaml
-2025-10-23 04:18:23,089     DEBUG      Copying assets/optional/ai-model-serving/kserve/default/inferencegraph_validatingwebhook_cainjection_patch.yaml <- _output/staging/rhoai/operator/kserve/default/inferencegraph_validatingwebhook_cainjection_patch.yaml
-2025-10-23 04:18:23,089     DEBUG      Copying assets/optional/ai-model-serving/kserve/default/isvc_mutatingwebhook_cainjection_patch.yaml <- _output/staging/rhoai/operator/kserve/default/isvc_mutatingwebhook_cainjection_patch.yaml
-2025-10-23 04:18:23,089     DEBUG      Copying assets/optional/ai-model-serving/kserve/default/isvc_validatingwebhook_cainjection_patch.yaml <- _output/staging/rhoai/operator/kserve/default/isvc_validatingwebhook_cainjection_patch.yaml
-2025-10-23 04:18:23,090     DEBUG      Copying assets/optional/ai-model-serving/kserve/default/kustomization.yaml <- _output/staging/rhoai/operator/kserve/default/kustomization.yaml
-2025-10-23 04:18:23,090     DEBUG      Copying assets/optional/ai-model-serving/kserve/default/localmodel_manager_image_patch.yaml <- _output/staging/rhoai/operator/kserve/default/localmodel_manager_image_patch.yaml
-2025-10-23 04:18:23,090     DEBUG      Copying assets/optional/ai-model-serving/kserve/default/manager_auth_proxy_patch.yaml <- _output/staging/rhoai/operator/kserve/default/manager_auth_proxy_patch.yaml
-2025-10-23 04:18:23,090     DEBUG      Copying assets/optional/ai-model-serving/kserve/default/manager_image_patch.yaml <- _output/staging/rhoai/operator/kserve/default/manager_image_patch.yaml
-2025-10-23 04:18:23,090     DEBUG      Copying assets/optional/ai-model-serving/kserve/default/manager_prometheus_metrics_patch.yaml <- _output/staging/rhoai/operator/kserve/default/manager_prometheus_metrics_patch.yaml
-2025-10-23 04:18:23,091     DEBUG      Copying assets/optional/ai-model-serving/kserve/default/manager_resources_patch.yaml <- _output/staging/rhoai/operator/kserve/default/manager_resources_patch.yaml
-2025-10-23 04:18:23,091     DEBUG      Copying assets/optional/ai-model-serving/kserve/default/network-policies.yaml <- _output/staging/rhoai/operator/kserve/default/network-policies.yaml
-2025-10-23 04:18:23,091     DEBUG      Copying assets/optional/ai-model-serving/kserve/default/servingruntime_validationwebhook_cainjection_patch.yaml <- _output/staging/rhoai/operator/kserve/default/servingruntime_validationwebhook_cainjection_patch.yaml
-2025-10-23 04:18:23,091     DEBUG      Copying assets/optional/ai-model-serving/kserve/default/svc_webhook_cainjection_patch.yaml <- _output/staging/rhoai/operator/kserve/default/svc_webhook_cainjection_patch.yaml
-2025-10-23 04:18:23,091     DEBUG      Copying assets/optional/ai-model-serving/kserve/default/trainedmodel_validatingwebhook_cainjection_patch.yaml <- _output/staging/rhoai/operator/kserve/default/trainedmodel_validatingwebhook_cainjection_patch.yaml
-2025-10-23 04:18:23,091     INFO       Clearing directory assets/optional/ai-model-serving/kserve/crd/
-2025-10-23 04:18:23,092     DEBUG      Copying assets/optional/ai-model-serving/kserve/crd/kustomization.yaml <- _output/staging/rhoai/operator/kserve/crd/kustomization.yaml
-2025-10-23 04:18:23,093     DEBUG      Copying assets/optional/ai-model-serving/kserve/crd/full/serving.kserve.io_clusterlocalmodels.yaml <- _output/staging/rhoai/operator/kserve/crd/full/serving.kserve.io_clusterlocalmodels.yaml
-2025-10-23 04:18:23,093     DEBUG      Copying assets/optional/ai-model-serving/kserve/crd/full/serving.kserve.io_clusterservingruntimes.yaml <- _output/staging/rhoai/operator/kserve/crd/full/serving.kserve.io_clusterservingruntimes.yaml
-2025-10-23 04:18:23,093     DEBUG      Copying assets/optional/ai-model-serving/kserve/crd/full/serving.kserve.io_clusterstoragecontainers.yaml <- _output/staging/rhoai/operator/kserve/crd/full/serving.kserve.io_clusterstoragecontainers.yaml
-2025-10-23 04:18:23,093     DEBUG      Copying assets/optional/ai-model-serving/kserve/crd/full/serving.kserve.io_inferencegraphs.yaml <- _output/staging/rhoai/operator/kserve/crd/full/serving.kserve.io_inferencegraphs.yaml
-2025-10-23 04:18:23,093     DEBUG      Copying assets/optional/ai-model-serving/kserve/crd/full/serving.kserve.io_inferenceservices.yaml <- _output/staging/rhoai/operator/kserve/crd/full/serving.kserve.io_inferenceservices.yaml
-2025-10-23 04:18:23,094     DEBUG      Copying assets/optional/ai-model-serving/kserve/crd/full/serving.kserve.io_localmodelnodegroups.yaml <- _output/staging/rhoai/operator/kserve/crd/full/serving.kserve.io_localmodelnodegroups.yaml
-2025-10-23 04:18:23,094     DEBUG      Copying assets/optional/ai-model-serving/kserve/crd/full/serving.kserve.io_servingruntimes.yaml <- _output/staging/rhoai/operator/kserve/crd/full/serving.kserve.io_servingruntimes.yaml
-2025-10-23 04:18:23,095     DEBUG      Copying assets/optional/ai-model-serving/kserve/crd/full/serving.kserve.io_trainedmodels.yaml <- _output/staging/rhoai/operator/kserve/crd/full/serving.kserve.io_trainedmodels.yaml
-2025-10-23 04:18:23,095     DEBUG      Copying assets/optional/ai-model-serving/kserve/crd/patches/protocol.yaml <- _output/staging/rhoai/operator/kserve/crd/patches/protocol.yaml
-2025-10-23 04:18:23,095     INFO       Clearing directory assets/optional/ai-model-serving/kserve/configmap/
-2025-10-23 04:18:23,095     DEBUG      Copying assets/optional/ai-model-serving/kserve/configmap/kustomization.yaml <- _output/staging/rhoai/operator/kserve/configmap/kustomization.yaml
-2025-10-23 04:18:23,096     DEBUG      Copying assets/optional/ai-model-serving/kserve/configmap/inferenceservice.yaml <- _output/staging/rhoai/operator/kserve/configmap/inferenceservice.yaml
-2025-10-23 04:18:23,096     INFO       Clearing directory assets/optional/ai-model-serving/kserve/rbac/
-2025-10-23 04:18:23,097     DEBUG      Copying assets/optional/ai-model-serving/kserve/rbac/auth_proxy_role_binding.yaml <- _output/staging/rhoai/operator/kserve/rbac/auth_proxy_role_binding.yaml
-2025-10-23 04:18:23,097     DEBUG      Copying assets/optional/ai-model-serving/kserve/rbac/auth_proxy_role.yaml <- _output/staging/rhoai/operator/kserve/rbac/auth_proxy_role.yaml
-2025-10-23 04:18:23,097     DEBUG      Copying assets/optional/ai-model-serving/kserve/rbac/auth_proxy_service.yaml <- _output/staging/rhoai/operator/kserve/rbac/auth_proxy_service.yaml
-2025-10-23 04:18:23,097     DEBUG      Copying assets/optional/ai-model-serving/kserve/rbac/kustomization.yaml <- _output/staging/rhoai/operator/kserve/rbac/kustomization.yaml
-2025-10-23 04:18:23,097     DEBUG      Copying assets/optional/ai-model-serving/kserve/rbac/leader_election_role_binding.yaml <- _output/staging/rhoai/operator/kserve/rbac/leader_election_role_binding.yaml
-2025-10-23 04:18:23,098     DEBUG      Copying assets/optional/ai-model-serving/kserve/rbac/leader_election_role.yaml <- _output/staging/rhoai/operator/kserve/rbac/leader_election_role.yaml
-2025-10-23 04:18:23,098     DEBUG      Copying assets/optional/ai-model-serving/kserve/rbac/role_binding.yaml <- _output/staging/rhoai/operator/kserve/rbac/role_binding.yaml
-2025-10-23 04:18:23,098     DEBUG      Copying assets/optional/ai-model-serving/kserve/rbac/role.yaml <- _output/staging/rhoai/operator/kserve/rbac/role.yaml
-2025-10-23 04:18:23,098     DEBUG      Copying assets/optional/ai-model-serving/kserve/rbac/service_account.yaml <- _output/staging/rhoai/operator/kserve/rbac/service_account.yaml
-2025-10-23 04:18:23,098     DEBUG      Copying assets/optional/ai-model-serving/kserve/rbac/localmodel/role_binding.yaml <- _output/staging/rhoai/operator/kserve/rbac/localmodel/role_binding.yaml
-2025-10-23 04:18:23,099     DEBUG      Copying assets/optional/ai-model-serving/kserve/rbac/localmodel/role.yaml <- _output/staging/rhoai/operator/kserve/rbac/localmodel/role.yaml
-2025-10-23 04:18:23,099     DEBUG      Copying assets/optional/ai-model-serving/kserve/rbac/localmodel/service_account.yaml <- _output/staging/rhoai/operator/kserve/rbac/localmodel/service_account.yaml
-2025-10-23 04:18:23,099     INFO       Clearing directory assets/optional/ai-model-serving/kserve/manager/
-2025-10-23 04:18:23,099     DEBUG      Copying assets/optional/ai-model-serving/kserve/manager/kustomization.yaml <- _output/staging/rhoai/operator/kserve/manager/kustomization.yaml
-2025-10-23 04:18:23,100     DEBUG      Copying assets/optional/ai-model-serving/kserve/manager/manager.yaml <- _output/staging/rhoai/operator/kserve/manager/manager.yaml
-2025-10-23 04:18:23,100     DEBUG      Copying assets/optional/ai-model-serving/kserve/manager/service.yaml <- _output/staging/rhoai/operator/kserve/manager/service.yaml
-2025-10-23 04:18:23,100     INFO       Clearing directory assets/optional/ai-model-serving/kserve/webhook/
-2025-10-23 04:18:23,100     DEBUG      Copying assets/optional/ai-model-serving/kserve/webhook/kustomization.yaml <- _output/staging/rhoai/operator/kserve/webhook/kustomization.yaml
-2025-10-23 04:18:23,100     DEBUG      Copying assets/optional/ai-model-serving/kserve/webhook/manifests.yaml <- _output/staging/rhoai/operator/kserve/webhook/manifests.yaml
-2025-10-23 04:18:23,101     DEBUG      Copying assets/optional/ai-model-serving/kserve/webhook/service.yaml <- _output/staging/rhoai/operator/kserve/webhook/service.yaml
-2025-10-23 04:18:23,101     INFO       Clearing directory assets/optional/ai-model-serving/runtimes/
-2025-10-23 04:18:23,101     INFO       Restoring assets/optional/ai-model-serving/runtimes/kustomization.yaml
-2025-10-23 04:18:23,101     DEBUG      Executing 'git restore assets/optional/ai-model-serving/runtimes/kustomization.yaml'
-2025-10-23 04:18:23,140     WARNING    Ignoring optional/ai-model-serving/runtimes/kustomization.x86_64.yaml because Generated during rebase
-2025-10-23 04:18:23,140     DEBUG      Copying assets/optional/ai-model-serving/runtimes/caikit-standalone.yaml <- _output/staging/rhoai/operator/modelcontroller/runtimes/caikit-standalone-template.yaml
-2025-10-23 04:18:23,141     DEBUG      Copying assets/optional/ai-model-serving/runtimes/caikit-tgis.yaml <- _output/staging/rhoai/operator/modelcontroller/runtimes/caikit-tgis-template.yaml
-2025-10-23 04:18:23,141     DEBUG      Copying assets/optional/ai-model-serving/runtimes/hf-detector.yaml <- _output/staging/rhoai/operator/modelcontroller/runtimes/hf-detector-template.yaml
-2025-10-23 04:18:23,141     DEBUG      Copying assets/optional/ai-model-serving/runtimes/ovms-kserve.yaml <- _output/staging/rhoai/operator/modelcontroller/runtimes/ovms-kserve-template.yaml
-2025-10-23 04:18:23,141     DEBUG      Copying assets/optional/ai-model-serving/runtimes/vllm-cuda.yaml <- _output/staging/rhoai/operator/modelcontroller/runtimes/vllm-cuda-template.yaml
-2025-10-23 04:18:23,141     DEBUG      Copying assets/optional/ai-model-serving/runtimes/vllm-gaudi.yaml <- _output/staging/rhoai/operator/modelcontroller/runtimes/vllm-gaudi-template.yaml
-2025-10-23 04:18:23,141     DEBUG      Copying assets/optional/ai-model-serving/runtimes/vllm-rocm.yaml <- _output/staging/rhoai/operator/modelcontroller/runtimes/vllm-rocm-template.yaml
+2026-04-02 04:23:16,083     INFO       Not clearing dir optional/ai-model-serving/
+2026-04-02 04:23:16,084     WARNING    Ignoring optional/ai-model-serving/release-ai-model-serving-x86_64.json because Release info file
+2026-04-02 04:23:16,084     INFO       Not clearing dir optional/ai-model-serving/kserve/
+2026-04-02 04:23:16,084     WARNING    Ignoring optional/ai-model-serving/kserve/kustomization.yaml because MicroShift specific overrides
+2026-04-02 04:23:16,084     WARNING    Ignoring optional/ai-model-serving/kserve/inferenceservice-config-microshift-patch.yaml because MicroShift specific overrides
+2026-04-02 04:23:16,084     WARNING    Ignoring optional/ai-model-serving/kserve/namespace.yaml because MicroShift specific overrides
+2026-04-02 04:23:16,084     INFO       Clearing directory assets/optional/ai-model-serving/kserve/overlays/odh/
+2026-04-02 04:23:16,085     DEBUG      Copying assets/optional/ai-model-serving/kserve/overlays/odh/kustomization.yaml <- _output/staging/rhoai/operator/kserve/overlays/odh/kustomization.yaml
+2026-04-02 04:23:16,085     DEBUG      Copying assets/optional/ai-model-serving/kserve/overlays/odh/llm-svc-scc.yaml <- _output/staging/rhoai/operator/kserve/overlays/odh/llm-svc-scc.yaml
+2026-04-02 04:23:16,086     DEBUG      Copying assets/optional/ai-model-serving/kserve/overlays/odh/network-policies.yaml <- _output/staging/rhoai/operator/kserve/overlays/odh/network-policies.yaml
+2026-04-02 04:23:16,086     DEBUG      Copying assets/optional/ai-model-serving/kserve/overlays/odh/params.env <- _output/staging/rhoai/operator/kserve/overlays/odh/params.env
+2026-04-02 04:23:16,086     DEBUG      Copying assets/optional/ai-model-serving/kserve/overlays/odh/params.yaml <- _output/staging/rhoai/operator/kserve/overlays/odh/params.yaml
+2026-04-02 04:23:16,086     DEBUG      Copying assets/optional/ai-model-serving/kserve/overlays/odh/user-cluster-roles.yaml <- _output/staging/rhoai/operator/kserve/overlays/odh/user-cluster-roles.yaml
+2026-04-02 04:23:16,087     DEBUG      Copying assets/optional/ai-model-serving/kserve/overlays/odh/patches/patch-inferenceservice-config.yaml <- _output/staging/rhoai/operator/kserve/overlays/odh/patches/patch-inferenceservice-config.yaml
+2026-04-02 04:23:16,087     DEBUG      Copying assets/optional/ai-model-serving/kserve/overlays/odh/patches/patch-set-resources-manager.yaml <- _output/staging/rhoai/operator/kserve/overlays/odh/patches/patch-set-resources-manager.yaml
+2026-04-02 04:23:16,087     DEBUG      Copying assets/optional/ai-model-serving/kserve/overlays/odh/patches/patch-webhook-svc-openshift-cert-injection.yaml <- _output/staging/rhoai/operator/kserve/overlays/odh/patches/patch-webhook-svc-openshift-cert-injection.yaml
+2026-04-02 04:23:16,087     DEBUG      Copying assets/optional/ai-model-serving/kserve/overlays/odh/patches/remove-cert-manager.yaml <- _output/staging/rhoai/operator/kserve/overlays/odh/patches/remove-cert-manager.yaml
+2026-04-02 04:23:16,088     DEBUG      Copying assets/optional/ai-model-serving/kserve/overlays/odh/patches/remove-clusterservingruntime.yaml <- _output/staging/rhoai/operator/kserve/overlays/odh/patches/remove-clusterservingruntime.yaml
+2026-04-02 04:23:16,088     DEBUG      Copying assets/optional/ai-model-serving/kserve/overlays/odh/patches/remove-local-model.yaml <- _output/staging/rhoai/operator/kserve/overlays/odh/patches/remove-local-model.yaml
+2026-04-02 04:23:16,088     INFO       Clearing directory assets/optional/ai-model-serving/kserve/default/
+2026-04-02 04:23:16,089     DEBUG      Copying assets/optional/ai-model-serving/kserve/default/cainjection_conversion_webhook.yaml <- _output/staging/rhoai/operator/kserve/default/cainjection_conversion_webhook.yaml
+2026-04-02 04:23:16,089     DEBUG      Copying assets/optional/ai-model-serving/kserve/default/clusterservingruntime_validatingwebhook_cainjection_patch.yaml <- _output/staging/rhoai/operator/kserve/default/clusterservingruntime_validatingwebhook_cainjection_patch.yaml
+2026-04-02 04:23:16,089     DEBUG      Copying assets/optional/ai-model-serving/kserve/default/inferencegraph_validatingwebhook_cainjection_patch.yaml <- _output/staging/rhoai/operator/kserve/default/inferencegraph_validatingwebhook_cainjection_patch.yaml
+2026-04-02 04:23:16,090     DEBUG      Copying assets/optional/ai-model-serving/kserve/default/isvc_mutatingwebhook_cainjection_patch.yaml <- _output/staging/rhoai/operator/kserve/default/isvc_mutatingwebhook_cainjection_patch.yaml
+2026-04-02 04:23:16,090     DEBUG      Copying assets/optional/ai-model-serving/kserve/default/isvc_validatingwebhook_cainjection_patch.yaml <- _output/staging/rhoai/operator/kserve/default/isvc_validatingwebhook_cainjection_patch.yaml
+2026-04-02 04:23:16,090     DEBUG      Copying assets/optional/ai-model-serving/kserve/default/kustomization.yaml <- _output/staging/rhoai/operator/kserve/default/kustomization.yaml
+2026-04-02 04:23:16,090     DEBUG      Copying assets/optional/ai-model-serving/kserve/default/llmisvcconfig_validatingwebhook_cainjection_patch.yaml <- _output/staging/rhoai/operator/kserve/default/llmisvcconfig_validatingwebhook_cainjection_patch.yaml
+2026-04-02 04:23:16,090     DEBUG      Copying assets/optional/ai-model-serving/kserve/default/llmisvc_validatingwebhook_cainjection_patch.yaml <- _output/staging/rhoai/operator/kserve/default/llmisvc_validatingwebhook_cainjection_patch.yaml
+2026-04-02 04:23:16,091     DEBUG      Copying assets/optional/ai-model-serving/kserve/default/localmodelcache_validatingwebhook_cainjection_patch.yaml <- _output/staging/rhoai/operator/kserve/default/localmodelcache_validatingwebhook_cainjection_patch.yaml
+2026-04-02 04:23:16,091     DEBUG      Copying assets/optional/ai-model-serving/kserve/default/localmodel_manager_image_patch.yaml <- _output/staging/rhoai/operator/kserve/default/localmodel_manager_image_patch.yaml
+2026-04-02 04:23:16,091     DEBUG      Copying assets/optional/ai-model-serving/kserve/default/localmodelnode_agent_image_patch.yaml <- _output/staging/rhoai/operator/kserve/default/localmodelnode_agent_image_patch.yaml
+2026-04-02 04:23:16,091     DEBUG      Copying assets/optional/ai-model-serving/kserve/default/manager_auth_proxy_patch.yaml <- _output/staging/rhoai/operator/kserve/default/manager_auth_proxy_patch.yaml
+2026-04-02 04:23:16,091     DEBUG      Copying assets/optional/ai-model-serving/kserve/default/manager_image_patch.yaml <- _output/staging/rhoai/operator/kserve/default/manager_image_patch.yaml
+2026-04-02 04:23:16,091     DEBUG      Copying assets/optional/ai-model-serving/kserve/default/manager_prometheus_metrics_patch.yaml <- _output/staging/rhoai/operator/kserve/default/manager_prometheus_metrics_patch.yaml
+2026-04-02 04:23:16,092     DEBUG      Copying assets/optional/ai-model-serving/kserve/default/manager_resources_patch.yaml <- _output/staging/rhoai/operator/kserve/default/manager_resources_patch.yaml
+2026-04-02 04:23:16,092     DEBUG      Copying assets/optional/ai-model-serving/kserve/default/servingruntime_validationwebhook_cainjection_patch.yaml <- _output/staging/rhoai/operator/kserve/default/servingruntime_validationwebhook_cainjection_patch.yaml
+2026-04-02 04:23:16,092     DEBUG      Copying assets/optional/ai-model-serving/kserve/default/trainedmodel_validatingwebhook_cainjection_patch.yaml <- _output/staging/rhoai/operator/kserve/default/trainedmodel_validatingwebhook_cainjection_patch.yaml
+2026-04-02 04:23:16,092     INFO       Clearing directory assets/optional/ai-model-serving/kserve/crd/
+2026-04-02 04:23:16,094     DEBUG      Copying assets/optional/ai-model-serving/kserve/crd/kustomization.yaml <- _output/staging/rhoai/operator/kserve/crd/kustomization.yaml
+2026-04-02 04:23:16,095     DEBUG      Copying assets/optional/ai-model-serving/kserve/crd/external/gateway-inference-extension/kustomization.yaml <- _output/staging/rhoai/operator/kserve/crd/external/gateway-inference-extension/kustomization.yaml
+2026-04-02 04:23:16,095     DEBUG      Copying assets/optional/ai-model-serving/kserve/crd/external/gateway-inference-extension/gateway-inference-extension.yaml <- _output/staging/rhoai/operator/kserve/crd/external/gateway-inference-extension/gateway-inference-extension.yaml
+2026-04-02 04:23:16,095     DEBUG      Copying assets/optional/ai-model-serving/kserve/crd/external/opendatahub-operator/kustomization.yaml <- _output/staging/rhoai/operator/kserve/crd/external/opendatahub-operator/kustomization.yaml
+2026-04-02 04:23:16,095     DEBUG      Copying assets/optional/ai-model-serving/kserve/crd/external/opendatahub-operator/datasciencecluster.opendatahub.io_datascienceclusters.yaml <- _output/staging/rhoai/operator/kserve/crd/external/opendatahub-operator/datasciencecluster.opendatahub.io_datascienceclusters.yaml
+2026-04-02 04:23:16,095     DEBUG      Copying assets/optional/ai-model-serving/kserve/crd/external/opendatahub-operator/dscinitialization.opendatahub.io_dscinitializations.yaml <- _output/staging/rhoai/operator/kserve/crd/external/opendatahub-operator/dscinitialization.opendatahub.io_dscinitializations.yaml
+2026-04-02 04:23:16,096     DEBUG      Copying assets/optional/ai-model-serving/kserve/crd/full/kustomization.yaml <- _output/staging/rhoai/operator/kserve/crd/full/kustomization.yaml
+2026-04-02 04:23:16,096     DEBUG      Copying assets/optional/ai-model-serving/kserve/crd/full/serving.kserve.io_clusterservingruntimes.yaml <- _output/staging/rhoai/operator/kserve/crd/full/serving.kserve.io_clusterservingruntimes.yaml
+2026-04-02 04:23:16,096     DEBUG      Copying assets/optional/ai-model-serving/kserve/crd/full/serving.kserve.io_clusterstoragecontainers.yaml <- _output/staging/rhoai/operator/kserve/crd/full/serving.kserve.io_clusterstoragecontainers.yaml
+2026-04-02 04:23:16,096     DEBUG      Copying assets/optional/ai-model-serving/kserve/crd/full/serving.kserve.io_inferencegraphs.yaml <- _output/staging/rhoai/operator/kserve/crd/full/serving.kserve.io_inferencegraphs.yaml
+2026-04-02 04:23:16,097     DEBUG      Copying assets/optional/ai-model-serving/kserve/crd/full/serving.kserve.io_inferenceservices.yaml <- _output/staging/rhoai/operator/kserve/crd/full/serving.kserve.io_inferenceservices.yaml
+2026-04-02 04:23:16,097     DEBUG      Copying assets/optional/ai-model-serving/kserve/crd/full/serving.kserve.io_llminferenceserviceconfigs.yaml <- _output/staging/rhoai/operator/kserve/crd/full/serving.kserve.io_llminferenceserviceconfigs.yaml
+2026-04-02 04:23:16,098     DEBUG      Copying assets/optional/ai-model-serving/kserve/crd/full/serving.kserve.io_llminferenceservices.yaml <- _output/staging/rhoai/operator/kserve/crd/full/serving.kserve.io_llminferenceservices.yaml
+2026-04-02 04:23:16,099     DEBUG      Copying assets/optional/ai-model-serving/kserve/crd/full/serving.kserve.io_localmodelcaches.yaml <- _output/staging/rhoai/operator/kserve/crd/full/serving.kserve.io_localmodelcaches.yaml
+2026-04-02 04:23:16,099     DEBUG      Copying assets/optional/ai-model-serving/kserve/crd/full/serving.kserve.io_localmodelnodegroups.yaml <- _output/staging/rhoai/operator/kserve/crd/full/serving.kserve.io_localmodelnodegroups.yaml
+2026-04-02 04:23:16,099     DEBUG      Copying assets/optional/ai-model-serving/kserve/crd/full/serving.kserve.io_localmodelnodes.yaml <- _output/staging/rhoai/operator/kserve/crd/full/serving.kserve.io_localmodelnodes.yaml
+2026-04-02 04:23:16,100     DEBUG      Copying assets/optional/ai-model-serving/kserve/crd/full/serving.kserve.io_servingruntimes.yaml <- _output/staging/rhoai/operator/kserve/crd/full/serving.kserve.io_servingruntimes.yaml
+2026-04-02 04:23:16,100     DEBUG      Copying assets/optional/ai-model-serving/kserve/crd/full/serving.kserve.io_trainedmodels.yaml <- _output/staging/rhoai/operator/kserve/crd/full/serving.kserve.io_trainedmodels.yaml
+2026-04-02 04:23:16,100     DEBUG      Copying assets/optional/ai-model-serving/kserve/crd/patches/protocol.yaml <- _output/staging/rhoai/operator/kserve/crd/patches/protocol.yaml
+2026-04-02 04:23:16,100     INFO       Clearing directory assets/optional/ai-model-serving/kserve/configmap/
+2026-04-02 04:23:16,101     DEBUG      Copying assets/optional/ai-model-serving/kserve/configmap/kustomization.yaml <- _output/staging/rhoai/operator/kserve/configmap/kustomization.yaml
+2026-04-02 04:23:16,101     DEBUG      Copying assets/optional/ai-model-serving/kserve/configmap/inferenceservice.yaml <- _output/staging/rhoai/operator/kserve/configmap/inferenceservice.yaml
+2026-04-02 04:23:16,101     INFO       Clearing directory assets/optional/ai-model-serving/kserve/rbac/
+2026-04-02 04:23:16,102     DEBUG      Copying assets/optional/ai-model-serving/kserve/rbac/auth_proxy_role_binding.yaml <- _output/staging/rhoai/operator/kserve/rbac/auth_proxy_role_binding.yaml
+2026-04-02 04:23:16,103     DEBUG      Copying assets/optional/ai-model-serving/kserve/rbac/auth_proxy_role.yaml <- _output/staging/rhoai/operator/kserve/rbac/auth_proxy_role.yaml
+2026-04-02 04:23:16,103     DEBUG      Copying assets/optional/ai-model-serving/kserve/rbac/auth_proxy_service.yaml <- _output/staging/rhoai/operator/kserve/rbac/auth_proxy_service.yaml
+2026-04-02 04:23:16,103     DEBUG      Copying assets/optional/ai-model-serving/kserve/rbac/kustomization.yaml <- _output/staging/rhoai/operator/kserve/rbac/kustomization.yaml
+2026-04-02 04:23:16,103     DEBUG      Copying assets/optional/ai-model-serving/kserve/rbac/leader_election_role_binding.yaml <- _output/staging/rhoai/operator/kserve/rbac/leader_election_role_binding.yaml
+2026-04-02 04:23:16,103     DEBUG      Copying assets/optional/ai-model-serving/kserve/rbac/leader_election_role.yaml <- _output/staging/rhoai/operator/kserve/rbac/leader_election_role.yaml
+2026-04-02 04:23:16,104     DEBUG      Copying assets/optional/ai-model-serving/kserve/rbac/role_binding.yaml <- _output/staging/rhoai/operator/kserve/rbac/role_binding.yaml
+2026-04-02 04:23:16,104     DEBUG      Copying assets/optional/ai-model-serving/kserve/rbac/role.yaml <- _output/staging/rhoai/operator/kserve/rbac/role.yaml
+2026-04-02 04:23:16,104     DEBUG      Copying assets/optional/ai-model-serving/kserve/rbac/service_account.yaml <- _output/staging/rhoai/operator/kserve/rbac/service_account.yaml
+2026-04-02 04:23:16,105     DEBUG      Copying assets/optional/ai-model-serving/kserve/rbac/localmodel/role_binding.yaml <- _output/staging/rhoai/operator/kserve/rbac/localmodel/role_binding.yaml
+2026-04-02 04:23:16,105     DEBUG      Copying assets/optional/ai-model-serving/kserve/rbac/localmodel/role.yaml <- _output/staging/rhoai/operator/kserve/rbac/localmodel/role.yaml
+2026-04-02 04:23:16,105     DEBUG      Copying assets/optional/ai-model-serving/kserve/rbac/localmodel/service_account.yaml <- _output/staging/rhoai/operator/kserve/rbac/localmodel/service_account.yaml
+2026-04-02 04:23:16,105     DEBUG      Copying assets/optional/ai-model-serving/kserve/rbac/localmodelnode/role_binding.yaml <- _output/staging/rhoai/operator/kserve/rbac/localmodelnode/role_binding.yaml
+2026-04-02 04:23:16,105     DEBUG      Copying assets/optional/ai-model-serving/kserve/rbac/localmodelnode/role.yaml <- _output/staging/rhoai/operator/kserve/rbac/localmodelnode/role.yaml
+2026-04-02 04:23:16,106     DEBUG      Copying assets/optional/ai-model-serving/kserve/rbac/localmodelnode/service_account.yaml <- _output/staging/rhoai/operator/kserve/rbac/localmodelnode/service_account.yaml
+2026-04-02 04:23:16,106     INFO       Clearing directory assets/optional/ai-model-serving/kserve/manager/
+2026-04-02 04:23:16,106     DEBUG      Copying assets/optional/ai-model-serving/kserve/manager/kustomization.yaml <- _output/staging/rhoai/operator/kserve/manager/kustomization.yaml
+2026-04-02 04:23:16,106     DEBUG      Copying assets/optional/ai-model-serving/kserve/manager/manager.yaml <- _output/staging/rhoai/operator/kserve/manager/manager.yaml
+2026-04-02 04:23:16,107     DEBUG      Copying assets/optional/ai-model-serving/kserve/manager/service.yaml <- _output/staging/rhoai/operator/kserve/manager/service.yaml
+2026-04-02 04:23:16,107     INFO       Clearing directory assets/optional/ai-model-serving/kserve/webhook/
+2026-04-02 04:23:16,107     DEBUG      Copying assets/optional/ai-model-serving/kserve/webhook/kustomization.yaml <- _output/staging/rhoai/operator/kserve/webhook/kustomization.yaml
+2026-04-02 04:23:16,107     DEBUG      Copying assets/optional/ai-model-serving/kserve/webhook/manifests.yaml <- _output/staging/rhoai/operator/kserve/webhook/manifests.yaml
+2026-04-02 04:23:16,107     DEBUG      Copying assets/optional/ai-model-serving/kserve/webhook/service.yaml <- _output/staging/rhoai/operator/kserve/webhook/service.yaml
+2026-04-02 04:23:16,108     INFO       Clearing directory assets/optional/ai-model-serving/kserve/localmodels/
+2026-04-02 04:23:16,108     DEBUG      Copying assets/optional/ai-model-serving/kserve/localmodels/kustomization.yaml <- _output/staging/rhoai/operator/kserve/localmodels/kustomization.yaml
+2026-04-02 04:23:16,108     DEBUG      Copying assets/optional/ai-model-serving/kserve/localmodels/manager.yaml <- _output/staging/rhoai/operator/kserve/localmodels/manager.yaml
+2026-04-02 04:23:16,108     INFO       Clearing directory assets/optional/ai-model-serving/kserve/localmodelnodes/
+2026-04-02 04:23:16,109     DEBUG      Copying assets/optional/ai-model-serving/kserve/localmodelnodes/kustomization.yaml <- _output/staging/rhoai/operator/kserve/localmodelnodes/kustomization.yaml
+2026-04-02 04:23:16,109     DEBUG      Copying assets/optional/ai-model-serving/kserve/localmodelnodes/manager.yaml <- _output/staging/rhoai/operator/kserve/localmodelnodes/manager.yaml
+2026-04-02 04:23:16,109     INFO       Clearing directory assets/optional/ai-model-serving/kserve/llmisvc/
+2026-04-02 04:23:16,110     DEBUG      Copying assets/optional/ai-model-serving/kserve/llmisvc/config-llm-decode-template.yaml <- _output/staging/rhoai/operator/kserve/llmisvc/config-llm-decode-template.yaml
+2026-04-02 04:23:16,110     DEBUG      Copying assets/optional/ai-model-serving/kserve/llmisvc/config-llm-decode-worker-data-parallel.yaml <- _output/staging/rhoai/operator/kserve/llmisvc/config-llm-decode-worker-data-parallel.yaml
+2026-04-02 04:23:16,110     DEBUG      Copying assets/optional/ai-model-serving/kserve/llmisvc/config-llm-prefill-template.yaml <- _output/staging/rhoai/operator/kserve/llmisvc/config-llm-prefill-template.yaml
+2026-04-02 04:23:16,110     DEBUG      Copying assets/optional/ai-model-serving/kserve/llmisvc/config-llm-prefill-worker-data-parallel.yaml <- _output/staging/rhoai/operator/kserve/llmisvc/config-llm-prefill-worker-data-parallel.yaml
+2026-04-02 04:23:16,110     DEBUG      Copying assets/optional/ai-model-serving/kserve/llmisvc/config-llm-router-route.yaml <- _output/staging/rhoai/operator/kserve/llmisvc/config-llm-router-route.yaml
+2026-04-02 04:23:16,111     DEBUG      Copying assets/optional/ai-model-serving/kserve/llmisvc/config-llm-scheduler.yaml <- _output/staging/rhoai/operator/kserve/llmisvc/config-llm-scheduler.yaml
+2026-04-02 04:23:16,111     DEBUG      Copying assets/optional/ai-model-serving/kserve/llmisvc/config-llm-template.yaml <- _output/staging/rhoai/operator/kserve/llmisvc/config-llm-template.yaml
+2026-04-02 04:23:16,111     DEBUG      Copying assets/optional/ai-model-serving/kserve/llmisvc/config-llm-worker-data-parallel.yaml <- _output/staging/rhoai/operator/kserve/llmisvc/config-llm-worker-data-parallel.yaml
+2026-04-02 04:23:16,111     DEBUG      Copying assets/optional/ai-model-serving/kserve/llmisvc/kustomization.yaml <- _output/staging/rhoai/operator/kserve/llmisvc/kustomization.yaml
+2026-04-02 04:23:16,111     INFO       Clearing directory assets/optional/ai-model-serving/kserve/certmanager/
+2026-04-02 04:23:16,112     DEBUG      Copying assets/optional/ai-model-serving/kserve/certmanager/certificate.yaml <- _output/staging/rhoai/operator/kserve/certmanager/certificate.yaml
+2026-04-02 04:23:16,112     DEBUG      Copying assets/optional/ai-model-serving/kserve/certmanager/kustomization.yaml <- _output/staging/rhoai/operator/kserve/certmanager/kustomization.yaml
+2026-04-02 04:23:16,112     INFO       Clearing directory assets/optional/ai-model-serving/kserve/monitoring/llmisvc/
+2026-04-02 04:23:16,113     DEBUG      Copying assets/optional/ai-model-serving/kserve/monitoring/llmisvc/kustomization.yaml <- _output/staging/rhoai/operator/kserve/monitoring/llmisvc/kustomization.yaml
+2026-04-02 04:23:16,113     DEBUG      Copying assets/optional/ai-model-serving/kserve/monitoring/llmisvc/rbac.yaml <- _output/staging/rhoai/operator/kserve/monitoring/llmisvc/rbac.yaml
+2026-04-02 04:23:16,113     DEBUG      Copying assets/optional/ai-model-serving/kserve/monitoring/llmisvc/istio_gateway_monitor.yaml <- _output/staging/rhoai/operator/kserve/monitoring/llmisvc/istio_gateway_monitor.yaml
+2026-04-02 04:23:16,113     INFO       Clearing directory assets/optional/ai-model-serving/runtimes/
+2026-04-02 04:23:16,114     INFO       Restoring assets/optional/ai-model-serving/runtimes/kustomization.yaml
+2026-04-02 04:23:16,114     DEBUG      Executing 'git restore assets/optional/ai-model-serving/runtimes/kustomization.yaml'
+2026-04-02 04:23:16,169     WARNING    Ignoring optional/ai-model-serving/runtimes/kustomization.x86_64.yaml because Generated during rebase
+2026-04-02 04:23:16,169     DEBUG      Copying assets/optional/ai-model-serving/runtimes/caikit-standalone.yaml <- _output/staging/rhoai/operator/modelcontroller/runtimes/caikit-standalone-template.yaml
+2026-04-02 04:23:16,169     DEBUG      Copying assets/optional/ai-model-serving/runtimes/caikit-tgis.yaml <- _output/staging/rhoai/operator/modelcontroller/runtimes/caikit-tgis-template.yaml
+2026-04-02 04:23:16,170     DEBUG      Copying assets/optional/ai-model-serving/runtimes/hf-detector.yaml <- _output/staging/rhoai/operator/modelcontroller/runtimes/hf-detector-template.yaml
+2026-04-02 04:23:16,170     DEBUG      Copying assets/optional/ai-model-serving/runtimes/ovms-kserve.yaml <- _output/staging/rhoai/operator/modelcontroller/runtimes/ovms-kserve-template.yaml
+2026-04-02 04:23:16,170     DEBUG      Copying assets/optional/ai-model-serving/runtimes/vllm-cuda.yaml <- _output/staging/rhoai/operator/modelcontroller/runtimes/vllm-cuda-template.yaml
+2026-04-02 04:23:16,170     DEBUG      Copying assets/optional/ai-model-serving/runtimes/vllm-gaudi.yaml <- _output/staging/rhoai/operator/modelcontroller/runtimes/vllm-gaudi-template.yaml
+2026-04-02 04:23:16,170     DEBUG      Copying assets/optional/ai-model-serving/runtimes/vllm-rocm.yaml <- _output/staging/rhoai/operator/modelcontroller/runtimes/vllm-rocm-template.yaml
 Initializing release.json file
 Dropping template containers from ServingRuntimes and changing them to ClusterServingRuntimes
 Creating ClusterServingRuntimes images kustomization
-No changes to assets/ or last_rebase_ai_model_serving.sh
+Detected changes to assets/ or last_rebase_ai_model_serving.sh
+Committing changes
+[rebase-release-4.22-4.22.0-0.nightly-2026-04-01-151631_amd64-2026-04-01_arm64-2026-04-02 a17d4e2fa] Update AI Model Serving for MicroShift
+ 20 files changed, 164 insertions(+), 865 deletions(-)
+ delete mode 100644 assets/components/openshift-dns/dns/hosts-configmap-role.yaml
+ delete mode 100644 assets/components/openshift-dns/dns/hosts-configmap-rolebinding.yaml
+ delete mode 100644 assets/components/openshift-dns/node-resolver/daemonset.yaml
+ delete mode 100644 assets/components/openshift-router/ingress-class.yaml
+ delete mode 100644 assets/components/service-ca/clusterrole.yaml
+ delete mode 100644 assets/components/service-ca/clusterrolebinding.yaml
+ delete mode 100644 assets/components/service-ca/deployment.yaml
+ delete mode 100644 assets/components/service-ca/ns.yaml
+ delete mode 100644 assets/components/service-ca/role.yaml
+ delete mode 100644 assets/components/service-ca/rolebinding.yaml
+ delete mode 100644 assets/components/service-ca/sa.yaml
+ delete mode 100644 assets/components/service-ca/signing-cabundle.yaml
+ delete mode 100644 assets/components/service-ca/signing-secret.yaml
 Removing staging directory
diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt
index 852d45a2e9..d4b3c53473 100644
--- a/scripts/auto-rebase/changelog.txt
+++ b/scripts/auto-rebase/changelog.txt
@@ -1,4 +1,100 @@
-- ovn-kubernetes image-arm64 cca0923d6f0ea9d09e77a8085d83a32e35055af0 to ee514f9f66a328f4dd4b583709a8e411b515fa5f
+- api embedded-component 1e7cd4b531e7ce17efdb1d541013e0c55362bfa5 to 80fcf457ee87d9a81075bcc4e6deac506448195f
+  - 13f1241f 2026-03-30T05:58:11-04:00 Add ConfidentialCluster to the feature gate
+  - 77316367 2026-03-27T15:41:06Z Add OCP 4.15 (K8s 1.28) envtest release
+  - 76aebe7f 2026-03-27T10:04:00-04:00 Added new feature gate VSphereMultiVCenterDay2
+  - c67875d7 2026-03-24T00:17:28-04:00 Promote AzureClusterHostedDNS to default
+  - ff9d1de3 2026-03-20T11:59:51Z Add OCP 4.16 (K8s 1.29) envtest release
+
+- cluster-ingress-operator embedded-component dde7a93953d8b82faf492b759cc48763645b7039 to dfec6c028e2d4eaf7dd161cdc0e75740894df421
+  - d1de5cb 2026-03-31T12:47:25-04:00 add a commment to why BTLS test is skipped
+  - 5f91d10 2026-03-31T12:31:40-04:00 remove BTLS test
+  - 6895ca2 2026-03-31T11:03:44-04:00 Update conformance script version
+  - 2bfa9f7 2026-03-31T11:03:44-04:00 Bump to OSSM 3.3.1 and Istio v1.28.5
+  - b1bbbb7 2026-03-30T09:09:56-04:00 Remove SetImageDefaults that overrode CSV image SHAs
+  - 43c978a 2026-03-30T09:09:53-04:00 NE-2519: Move Sail Library to official release branch
+  - 6b6d84c 2026-03-27T12:10:43-04:00 Implement configurationManagement API
+  - 5374dab 2026-03-27T12:06:37-04:00 Bump openshift/api for configurationManagement API
+  - b088953 2026-03-26T16:15:23-04:00 OCPBUGS-79667: Use feature-gate annotation for Sail Library RBAC
+  - 9fe57a5 2026-03-26T11:48:51-04:00 fix(log): Add INFO logs alongside event recorder calls
+  - 6d2c6c8 2026-03-25T12:00:58-04:00 OCPBUGS-79467: Change default log level from DEBUG to INFO
+  - 7e92761 2026-03-16T21:00:19+01:00 OCPBUGS-78541: Move TestIngressControllerCustomEndpoints to run last
+
+- cluster-kube-apiserver-operator embedded-component ece488fe8612a58b95add127413a2c6f33210445 to de2a3ebcb3ceea0ea411a6fbb9b5b52c18c27e06
+  - 697f4d8 2026-04-01T12:35:57+05:30 update bouncpod functions
+  - 22d6e51 2026-04-01T08:28:56+05:30 update feedback
+  - 31f9a8f 2026-03-31T10:48:22+05:30 Fix TestBoundTokenOperatorSecretDeletion stability and monitor failures
+  - 03dbc35 2026-03-11T10:47:18Z Restart operator when TLS config changes
+
+- cluster-network-operator embedded-component 5ce0f713f24815bc508207b265d4a44d9c11a2d2 to 594de43f4f1567e5ce55be2eff7c0cf28d1e09e7
+  - 067feb9 2026-03-20T09:40:14+01:00 Fix ManagementState being reset on operator restart
+
+- kubernetes embedded-component 2b19898a979eb1ff0cd87ec5d49106e555e70ce6 to 9193b12ab88e006723c8605bea1659bfcbe7d638
+  - 429a52821 2026-03-27T14:29:55-04:00 UPSTREAM: <carry>: Register OpenShift cloud providers in k8s-tests-ext
+  - 39a9d96ad 2026-03-20T17:46:12-04:00 UPSTREAM: <drop>: hack/update-vendor.sh, make update and update image
+  - 78f7230b0 2026-03-20T15:17:52+01:00 UPSTREAM: 137926: KEP-961: demote maxUnavailable feature in statefulset to off by default
+  - 6c1cd99ae 2026-03-18T18:30:07Z Release commit for Kubernetes v1.35.3
+  - b57e146ae 2026-03-09T10:14:05-04:00 cmd/kubeadm: ignore EINVAL error during unmount
+  - af6488c9d 2026-03-04T18:02:34+05:30 Use localhost image reference in PodObservedGenerationTracking test
+  - 61003ad14 2026-03-03T14:33:21-08:00 drop publishing rules from dependencies.yaml on release branch
+  - b9be60a8c 2026-03-03T16:21:08+05:30 start scheduler after creating binding/non-binding slices
+  - 659d489e8 2026-03-03T16:21:08+05:30 dra: stabilize DeviceBindingConditions BasicFlow by creating without-binding slice first
+  - 02115b6ee 2026-02-26T20:14:22Z Update CHANGELOG/CHANGELOG-1.35.md for v1.35.2
+  - 1c0c911c3 2026-02-26T10:28:59Z kubeadm: do not add learner member to etcd client endpoints
+  - d05c50653 2026-02-16T15:29:03+05:30 Fix flake TestDeviceTaintRule test by adjusting event hanlder status update logic Co-authored-by: Pohly <patrick.ohly@intel.com>
+  - 2371267d2 2026-02-10T15:18:30-08:00 add dockerized go cache to  `make clean`
+  - bd3999173 2026-02-10T10:07:55+01:00 fake client-go: un-deprecate NewSimpleClientset
+  - 0a9d14b01 2026-01-21T18:32:52+05:30 Fix flaky TestApplyCRDuringCRDFinalization test
+
+- machine-config-operator embedded-component 540dfc0e51cd7324d8860b53a50b1b19e23e1aaf to 39ca98383d9b1aedf6147f9ff89e69b5a23541be
+  - 52ce5d6e 2026-03-30T13:19:07-04:00 operator: add skew doc links
+  - 162428e6 2026-03-30T15:13:20+05:30 reuse the func
+  - 83659461 2026-03-26T11:08:10Z NO-ISSUE: In extended tests, disable Skew when disabling the bootimages update
+  - afe3c608 2026-03-26T15:26:20+05:30 refactor: extract helper functions for PinnedImageSet test (OCP-88378)
+  - 7d41f94e 2026-03-26T12:24:51+05:30 duplicate images within a single PinnedImageSet (same image listed twice in the pinnedImages array)
+  - 69f31d0f 2026-03-23T12:18:23+05:30 test: add OCP-88378 Deleting a PinnedImageSet does not affect images pinned by another PinnedImageSet
+
+- operator-framework-olm embedded-component 3a864ce8343abf8877d7e20b0f5cff08d9e156f9 to 438f0e600e4ae75c8b7854afba5be963061eb2a1
+  - 26c54c87 2026-03-31T10:42:47+02:00 UPSTREAM: <carry>: Add pedjak and fgiudici as reviewers
+  - 8abbc327 2026-03-29T00:09:49Z Bump the k8s-dependencies group with 4 updates (#482)
+  - a5ea82ce 2026-03-29T00:09:08Z Bump google.golang.org/grpc from 1.78.0 to 1.79.3 (#481)
+  - 0e595339 2026-03-29T00:08:55Z Bump sigs.k8s.io/controller-runtime in the k8s-dependencies group (#480)
+  - 22670f68 2026-03-29T00:08:41Z Bump the k8s-dependencies group with 4 updates (#479)
+  - 21327766 2026-03-29T00:08:23Z Bump codecov/codecov-action from 5 to 6 (#1941)
+  - dab356b9 2026-03-29T00:08:08Z Bump github.com/operator-framework/api from 0.41.0 to 0.42.0 (#1940)
+  - 44de9cef 2026-03-29T00:07:52Z render package-level info from channel head in semver template (#1933)
+  - 114e8933 2026-03-29T00:07:35Z Bump github.com/docker/cli (#1939)
+  - fa03ec8e 2026-03-29T00:07:19Z Bump github.com/grpc-ecosystem/grpc-health-probe from 0.4.46 to 0.4.47 (#1937)
+  - ce8abe8a 2026-03-29T00:07:03Z Bump the k8s-dependencies group with 4 updates (#1936)
+  - 1f861d7f 2026-03-29T00:06:46Z Bump google.golang.org/grpc from 1.79.2 to 1.79.3 (#1935)
+  - a494f856 2026-03-29T00:06:30Z Bump github.com/mattn/go-sqlite3 from 1.14.34 to 1.14.37 (#1934)
+  - 2c8e7a36 2026-03-29T00:06:15Z chore(lint): Upgrade golanglint from v2.7.2 to  v2.8.0 and fix lint issues" (#1898)
+  - db577836 2026-03-29T00:06:00Z Bump the golang-x-deps group with 2 updates (#1932)
+  - 1701c434 2026-03-29T00:05:45Z Bump google.golang.org/grpc from 1.79.1 to 1.79.2 (#1930)
+  - 12352445 2026-03-29T00:05:30Z Bump github.com/grpc-ecosystem/grpc-health-probe from 0.4.45 to 0.4.46 (#1929)
+  - dc43e19e 2026-03-29T00:05:14Z Bump the golang-x-deps group with 2 updates (#1928)
+  - 975835e0 2026-03-29T00:04:59Z Bump docker/setup-buildx-action from 3 to 4 (#1927)
+  - 5bed99d5 2026-03-29T00:04:44Z Bump github.com/docker/cli (#1926)
+  - 2cdb1b90 2026-03-29T00:04:29Z Bump sigs.k8s.io/controller-runtime in the k8s-dependencies group (#1925)
+  - 1239ec3c 2026-03-29T00:04:14Z Bump docker/login-action from 3 to 4 (#1924)
+  - 68780955 2026-03-29T00:03:58Z Bump docker/setup-qemu-action from 3 to 4 (#1923)
+  - 60eb57b6 2026-03-29T00:03:42Z Bump the k8s-dependencies group with 4 updates (#1922)
+  - b30a6661 2026-03-29T00:03:24Z Update o-f/api and o-f/operator-registry dependencies (#3804)
+  - 5feab6f0 2026-03-29T00:03:06Z Migrate from klog v1 to klog/v2 v2.140.0 and honor stderrthreshold (#3801)
+  - c592d5ea 2026-03-29T00:02:51Z 🌱 Bump the k8s-dependencies group with 8 updates (#3802)
+  - 083fd342 2026-03-29T00:02:30Z :seedling: Bump google.golang.org/grpc from 1.79.2 to 1.79.3 (#3799)
+
+- service-ca-operator embedded-component dda95b7cb4e6810b5f604599d99c64af6c2d56cf to 951ea66067b4d69c868470e26a5a1a9f689be23e
+  - 8fe334e 2026-03-26T14:07:11-04:00 vendor: update
+  - e4f58c5 2026-03-26T14:07:11-04:00 bindata: replace `go-bindata` with `embed.FS`
+
+- oc image-amd64 c268e49f1f3b68b830472e2244f0aeef2cca9d2c to 12f8fce897cae737720309a894dac856d221485e
+  - b7c53a30 2026-03-30T15:31:21+02:00 claude: Turn pr-review skill into code-reviewer agent
+  - d10aa258 2026-03-23T11:41:30+01:00 must-gather: Handle signals properly
+
+- router image-amd64 235e224fe1acd6626f70bb4a21289d0f5173246a to 896390778ebe15f57f87e6ca78f11c96e64c2652
+  - 8997b3d 2026-03-27T19:55:43Z Add support for configurable SSL curves in HAProxy configuration
+
+- ovn-kubernetes image-amd64 cca0923d6f0ea9d09e77a8085d83a32e35055af0 to ee514f9f66a328f4dd4b583709a8e411b515fa5f
   - 979d3db2 2026-03-25T22:24:14-07:00 openshift: update module path and deps for upstream package rename
   - e2237ef1 2026-03-25T17:33:01-07:00 services,node,cni: update OCP hack imports for module rename
   - c24c2e38 2026-03-25T17:32:24-07:00 services: resolve merge conflict in lb_config.go
@@ -185,7 +281,49 @@
   - be75e912 2026-02-20T12:25:22-08:00 e2e: add e2e test for multiple attachments to the same localnet NAD
   - 88b276ba 2026-02-20T12:01:35-08:00 support multiple interfaces on the same localnet network
 
-- service-ca-operator image-arm64 dda95b7cb4e6810b5f604599d99c64af6c2d56cf to 951ea66067b4d69c868470e26a5a1a9f689be23e
+- kubernetes image-amd64 2b19898a979eb1ff0cd87ec5d49106e555e70ce6 to 9193b12ab88e006723c8605bea1659bfcbe7d638
+  - 429a52821 2026-03-27T14:29:55-04:00 UPSTREAM: <carry>: Register OpenShift cloud providers in k8s-tests-ext
+  - 39a9d96ad 2026-03-20T17:46:12-04:00 UPSTREAM: <drop>: hack/update-vendor.sh, make update and update image
+  - 78f7230b0 2026-03-20T15:17:52+01:00 UPSTREAM: 137926: KEP-961: demote maxUnavailable feature in statefulset to off by default
+  - 6c1cd99ae 2026-03-18T18:30:07Z Release commit for Kubernetes v1.35.3
+  - b57e146ae 2026-03-09T10:14:05-04:00 cmd/kubeadm: ignore EINVAL error during unmount
+  - af6488c9d 2026-03-04T18:02:34+05:30 Use localhost image reference in PodObservedGenerationTracking test
+  - 61003ad14 2026-03-03T14:33:21-08:00 drop publishing rules from dependencies.yaml on release branch
+  - b9be60a8c 2026-03-03T16:21:08+05:30 start scheduler after creating binding/non-binding slices
+  - 659d489e8 2026-03-03T16:21:08+05:30 dra: stabilize DeviceBindingConditions BasicFlow by creating without-binding slice first
+  - 02115b6ee 2026-02-26T20:14:22Z Update CHANGELOG/CHANGELOG-1.35.md for v1.35.2
+  - 1c0c911c3 2026-02-26T10:28:59Z kubeadm: do not add learner member to etcd client endpoints
+  - d05c50653 2026-02-16T15:29:03+05:30 Fix flake TestDeviceTaintRule test by adjusting event hanlder status update logic Co-authored-by: Pohly <patrick.ohly@intel.com>
+  - 2371267d2 2026-02-10T15:18:30-08:00 add dockerized go cache to  `make clean`
+  - bd3999173 2026-02-10T10:07:55+01:00 fake client-go: un-deprecate NewSimpleClientset
+  - 0a9d14b01 2026-01-21T18:32:52+05:30 Fix flaky TestApplyCRDuringCRDFinalization test
+
+- service-ca-operator image-amd64 dda95b7cb4e6810b5f604599d99c64af6c2d56cf to 951ea66067b4d69c868470e26a5a1a9f689be23e
   - 8fe334e 2026-03-26T14:07:11-04:00 vendor: update
   - e4f58c5 2026-03-26T14:07:11-04:00 bindata: replace `go-bindata` with `embed.FS`
 
+- oc image-arm64 c268e49f1f3b68b830472e2244f0aeef2cca9d2c to f835dae3a861b593c4dd8b688394a61614dd6663
+  - b2332831 2026-03-31T14:21:43-04:00 NO-ISSUE: recover the context in upgrade
+  - b7c53a30 2026-03-30T15:31:21+02:00 claude: Turn pr-review skill into code-reviewer agent
+  - d10aa258 2026-03-23T11:41:30+01:00 must-gather: Handle signals properly
+
+- router image-arm64 235e224fe1acd6626f70bb4a21289d0f5173246a to 896390778ebe15f57f87e6ca78f11c96e64c2652
+  - 8997b3d 2026-03-27T19:55:43Z Add support for configurable SSL curves in HAProxy configuration
+
+- kubernetes image-arm64 2b19898a979eb1ff0cd87ec5d49106e555e70ce6 to 9193b12ab88e006723c8605bea1659bfcbe7d638
+  - 429a52821 2026-03-27T14:29:55-04:00 UPSTREAM: <carry>: Register OpenShift cloud providers in k8s-tests-ext
+  - 39a9d96ad 2026-03-20T17:46:12-04:00 UPSTREAM: <drop>: hack/update-vendor.sh, make update and update image
+  - 78f7230b0 2026-03-20T15:17:52+01:00 UPSTREAM: 137926: KEP-961: demote maxUnavailable feature in statefulset to off by default
+  - 6c1cd99ae 2026-03-18T18:30:07Z Release commit for Kubernetes v1.35.3
+  - b57e146ae 2026-03-09T10:14:05-04:00 cmd/kubeadm: ignore EINVAL error during unmount
+  - af6488c9d 2026-03-04T18:02:34+05:30 Use localhost image reference in PodObservedGenerationTracking test
+  - 61003ad14 2026-03-03T14:33:21-08:00 drop publishing rules from dependencies.yaml on release branch
+  - b9be60a8c 2026-03-03T16:21:08+05:30 start scheduler after creating binding/non-binding slices
+  - 659d489e8 2026-03-03T16:21:08+05:30 dra: stabilize DeviceBindingConditions BasicFlow by creating without-binding slice first
+  - 02115b6ee 2026-02-26T20:14:22Z Update CHANGELOG/CHANGELOG-1.35.md for v1.35.2
+  - 1c0c911c3 2026-02-26T10:28:59Z kubeadm: do not add learner member to etcd client endpoints
+  - d05c50653 2026-02-16T15:29:03+05:30 Fix flake TestDeviceTaintRule test by adjusting event hanlder status update logic Co-authored-by: Pohly <patrick.ohly@intel.com>
+  - 2371267d2 2026-02-10T15:18:30-08:00 add dockerized go cache to  `make clean`
+  - bd3999173 2026-02-10T10:07:55+01:00 fake client-go: un-deprecate NewSimpleClientset
+  - 0a9d14b01 2026-01-21T18:32:52+05:30 Fix flaky TestApplyCRDuringCRDFinalization test
+
diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt
index 67802b4638..dc8de117f5 100644
--- a/scripts/auto-rebase/commits.txt
+++ b/scripts/auto-rebase/commits.txt
@@ -1,35 +1,35 @@
-https://github.com/openshift/api embedded-component 1e7cd4b531e7ce17efdb1d541013e0c55362bfa5
+https://github.com/openshift/api embedded-component 80fcf457ee87d9a81075bcc4e6deac506448195f
 https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component 98d8223ebe55a0ddc10bb485e7603deb2c0acbb9
 https://github.com/openshift/cluster-dns-operator embedded-component 3d2141182243cde1ec6417bd005c76d29aa88a01
-https://github.com/openshift/cluster-ingress-operator embedded-component dde7a93953d8b82faf492b759cc48763645b7039
-https://github.com/openshift/cluster-kube-apiserver-operator embedded-component ece488fe8612a58b95add127413a2c6f33210445
+https://github.com/openshift/cluster-ingress-operator embedded-component dfec6c028e2d4eaf7dd161cdc0e75740894df421
+https://github.com/openshift/cluster-kube-apiserver-operator embedded-component de2a3ebcb3ceea0ea411a6fbb9b5b52c18c27e06
 https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 7df2876085ac1d76ac11bf476c0538876110c9f0
 https://github.com/openshift/cluster-kube-scheduler-operator embedded-component ddbfddb8a0c77b03c1d7c994991caa031d99c330
-https://github.com/openshift/cluster-network-operator embedded-component 5ce0f713f24815bc508207b265d4a44d9c11a2d2
+https://github.com/openshift/cluster-network-operator embedded-component 594de43f4f1567e5ce55be2eff7c0cf28d1e09e7
 https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component e0d28ec9e1c91b0b72ff66c98f7a3b126f4480ad
 https://github.com/openshift/cluster-policy-controller embedded-component 44985a1306411101c84dd5081598fc928b432321
 https://github.com/openshift/csi-external-snapshotter embedded-component d1bc3ffaa9759c13a06c2ec61c541342e71bd109
 https://github.com/openshift/etcd embedded-component d8d67b8ce849f816d6d23c904098336632e2348f
-https://github.com/openshift/kubernetes embedded-component 2b19898a979eb1ff0cd87ec5d49106e555e70ce6
+https://github.com/openshift/kubernetes embedded-component 9193b12ab88e006723c8605bea1659bfcbe7d638
 https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 72835e43c7754356645e41031f3a99926b4d42e6
-https://github.com/openshift/machine-config-operator embedded-component 540dfc0e51cd7324d8860b53a50b1b19e23e1aaf
+https://github.com/openshift/machine-config-operator embedded-component 39ca98383d9b1aedf6147f9ff89e69b5a23541be
 https://github.com/openshift/openshift-controller-manager embedded-component 26d20feae8892f648f5b06ed3f5492fe6ffb4532
-https://github.com/openshift/operator-framework-olm embedded-component 3a864ce8343abf8877d7e20b0f5cff08d9e156f9
+https://github.com/openshift/operator-framework-olm embedded-component 438f0e600e4ae75c8b7854afba5be963061eb2a1
 https://github.com/openshift/route-controller-manager embedded-component 624742d93f3a7885cf7f70985f1e23ff60da580d
-https://github.com/openshift/service-ca-operator embedded-component dda95b7cb4e6810b5f604599d99c64af6c2d56cf
-https://github.com/openshift/oc image-amd64 c268e49f1f3b68b830472e2244f0aeef2cca9d2c
+https://github.com/openshift/service-ca-operator embedded-component 951ea66067b4d69c868470e26a5a1a9f689be23e
+https://github.com/openshift/oc image-amd64 12f8fce897cae737720309a894dac856d221485e
 https://github.com/openshift/coredns image-amd64 0dded2d232dab43c107b1dab9d0d9fdfd8259622
 https://github.com/openshift/csi-external-snapshotter image-amd64 d1bc3ffaa9759c13a06c2ec61c541342e71bd109
-https://github.com/openshift/router image-amd64 235e224fe1acd6626f70bb4a21289d0f5173246a
+https://github.com/openshift/router image-amd64 896390778ebe15f57f87e6ca78f11c96e64c2652
 https://github.com/openshift/kube-rbac-proxy image-amd64 d12e274605248f6c59373240a7eae7a7a357dcb3
-https://github.com/openshift/ovn-kubernetes image-amd64 cca0923d6f0ea9d09e77a8085d83a32e35055af0
-https://github.com/openshift/kubernetes image-amd64 2b19898a979eb1ff0cd87ec5d49106e555e70ce6
-https://github.com/openshift/service-ca-operator image-amd64 dda95b7cb4e6810b5f604599d99c64af6c2d56cf
-https://github.com/openshift/oc image-arm64 c268e49f1f3b68b830472e2244f0aeef2cca9d2c
+https://github.com/openshift/ovn-kubernetes image-amd64 ee514f9f66a328f4dd4b583709a8e411b515fa5f
+https://github.com/openshift/kubernetes image-amd64 9193b12ab88e006723c8605bea1659bfcbe7d638
+https://github.com/openshift/service-ca-operator image-amd64 951ea66067b4d69c868470e26a5a1a9f689be23e
+https://github.com/openshift/oc image-arm64 f835dae3a861b593c4dd8b688394a61614dd6663
 https://github.com/openshift/coredns image-arm64 0dded2d232dab43c107b1dab9d0d9fdfd8259622
 https://github.com/openshift/csi-external-snapshotter image-arm64 d1bc3ffaa9759c13a06c2ec61c541342e71bd109
-https://github.com/openshift/router image-arm64 235e224fe1acd6626f70bb4a21289d0f5173246a
+https://github.com/openshift/router image-arm64 896390778ebe15f57f87e6ca78f11c96e64c2652
 https://github.com/openshift/kube-rbac-proxy image-arm64 d12e274605248f6c59373240a7eae7a7a357dcb3
 https://github.com/openshift/ovn-kubernetes image-arm64 ee514f9f66a328f4dd4b583709a8e411b515fa5f
-https://github.com/openshift/kubernetes image-arm64 2b19898a979eb1ff0cd87ec5d49106e555e70ce6
+https://github.com/openshift/kubernetes image-arm64 9193b12ab88e006723c8605bea1659bfcbe7d638
 https://github.com/openshift/service-ca-operator image-arm64 951ea66067b4d69c868470e26a5a1a9f689be23e
diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh
index e241229ab9..8cddc768b7 100755
--- a/scripts/auto-rebase/last_rebase.sh
+++ b/scripts/auto-rebase/last_rebase.sh
@@ -1,2 +1,2 @@
 #!/bin/bash -x
-./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.22.0-0.nightly-2026-03-29-173136" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.22.0-0.nightly-arm64-2026-03-31-033117"
+./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.22.0-0.nightly-2026-04-01-151631" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.22.0-0.nightly-arm64-2026-04-02-033117"
diff --git a/vendor/k8s.io/client-go/kubernetes/fake/clientset_generated.go b/vendor/k8s.io/client-go/kubernetes/fake/clientset_generated.go
index f729718bfb..c101c28306 100644
--- a/vendor/k8s.io/client-go/kubernetes/fake/clientset_generated.go
+++ b/vendor/k8s.io/client-go/kubernetes/fake/clientset_generated.go
@@ -143,10 +143,6 @@ import (
 // It's backed by a very simple object tracker that processes creates, updates and deletions as-is,
 // without applying any field management, validations and/or defaults. It shouldn't be considered a replacement
 // for a real clientset and is mostly useful in simple unit tests.
-//
-// Deprecated: NewClientset replaces this with support for field management, which significantly improves
-// server side apply testing. NewClientset is only available when apply configurations are generated (e.g.
-// via --with-applyconfig).
 func NewSimpleClientset(objects ...runtime.Object) *Clientset {
 	o := testing.NewObjectTracker(scheme, codecs.UniversalDecoder())
 	for _, obj := range objects {
@@ -207,6 +203,10 @@ func (c *Clientset) IsWatchListSemanticsUnSupported() bool {
 // It's backed by a very simple object tracker that processes creates, updates and deletions as-is,
 // without applying any validations and/or defaults. It shouldn't be considered a replacement
 // for a real clientset and is mostly useful in simple unit tests.
+//
+// Compared to NewSimpleClientset, the Clientset returned here supports field tracking and thus
+// server-side apply. Beware though that support in that for CRDs is missing
+// (https://github.com/kubernetes/kubernetes/issues/126850).
 func NewClientset(objects ...runtime.Object) *Clientset {
 	o := testing.NewFieldManagedObjectTracker(
 		scheme,
diff --git a/vendor/k8s.io/kubernetes/pkg/controller/devicetainteviction/device_taint_eviction.go b/vendor/k8s.io/kubernetes/pkg/controller/devicetainteviction/device_taint_eviction.go
index d6075e98b3..b80042080c 100644
--- a/vendor/k8s.io/kubernetes/pkg/controller/devicetainteviction/device_taint_eviction.go
+++ b/vendor/k8s.io/kubernetes/pkg/controller/devicetainteviction/device_taint_eviction.go
@@ -434,6 +434,7 @@ func (tc *Controller) maybeDeletePod(ctx context.Context, podRef tainteviction.N
 			// Doing this immediately is not useful because
 			// it would just race with the informers update
 			// (rule status reads from cache!).
+			tc.logger.V(5).Info("Adding delayed status update because of pod eviction", "deviceTaintRule", klog.KObj(reason.rule), "delay", ruleStatusPeriod)
 			tc.workqueue.AddAfter(workItemForRule(reason.rule), ruleStatusPeriod)
 		}
 	}
@@ -1016,7 +1017,14 @@ func (tc *Controller) Run(ctx context.Context, numWorkers int) error {
 func (tc *Controller) evictPod(podRef tainteviction.NamespacedObject, eviction evictionAndReason) {
 	tc.deletePodAt[podRef] = eviction
 	now := time.Now()
-	tc.workqueue.AddAfter(workItem{podRef: podRef}, eviction.when.Sub(now))
+	delay := eviction.when.Sub(now)
+	if delay <= 0 {
+		tc.logger.V(3).Info("Adding immediate pod eviction", "pod", podRef, "eviction", eviction)
+		tc.workqueue.Add(workItem{podRef: podRef})
+	} else {
+		tc.logger.V(3).Info("Adding delayed pod eviction", "pod", podRef, "eviction", eviction, "delay", delay)
+		tc.workqueue.AddAfter(workItem{podRef: podRef}, delay)
+	}
 
 	if tc.evictPodHook != nil {
 		tc.evictPodHook(podRef, eviction)
@@ -1275,7 +1283,8 @@ func (tc *Controller) handleRuleChange(oldRule, newRule *resourcealpha.DeviceTai
 	}
 
 	if oldRule == nil {
-		// Update the status at least once.
+		// Update the status at least once, immediately and before evicting any pods.
+		tc.logger.V(5).Info("Adding immediate status update because of new rule", "deviceTaintRule", klog.KObj(newRule))
 		tc.workqueue.Add(workItemForRule(newRule))
 	}
 
@@ -1289,9 +1298,13 @@ func (tc *Controller) handleRuleChange(oldRule, newRule *resourcealpha.DeviceTai
 
 	if oldRule != nil &&
 		newRule != nil &&
-		oldRule.UID == newRule.UID &&
-		apiequality.Semantic.DeepEqual(&oldRule.Spec, &newRule.Spec) {
-		return
+		oldRule.UID == newRule.UID {
+		if apiequality.Semantic.DeepEqual(&oldRule.Spec, &newRule.Spec) {
+			return
+		}
+		// Update the status at least once, immediately and before evicting any pods.
+		tc.logger.V(5).Info("Adding immediate status update because of modified rule spec", "deviceTaintRule", klog.KObj(newRule))
+		tc.workqueue.Add(workItemForRule(newRule))
 	}
 
 	// Rule spec changes should be rare. Simply do a brute-force re-evaluation of all allocated claims.
@@ -1475,13 +1488,14 @@ func (tc *Controller) handlePod(pod *v1.Pod) {
 		return
 	}
 
-	tc.logger.V(3).Info("Going to evict pod", "pod", podRef, "eviction", eviction)
 	tc.evictPod(podRef, *eviction)
 
 	// If any reason is because of a taint, then eviction is in progress and the status may need to be updated.
+	// But don't do it immediately because more pod changes may be coming in.
 	for _, reason := range eviction.reason {
 		if reason.rule != nil {
-			tc.workqueue.Add(workItemForRule(reason.rule))
+			tc.logger.V(5).Info("Adding delayed status update because of pod change", "deviceTaintRule", klog.KObj(reason.rule), "delay", ruleStatusPeriod)
+			tc.workqueue.AddAfter(workItemForRule(reason.rule), ruleStatusPeriod)
 		}
 	}
 }
diff --git a/vendor/k8s.io/kubernetes/pkg/features/kube_features.go b/vendor/k8s.io/kubernetes/pkg/features/kube_features.go
index 5a6ee84351..bff6faf524 100644
--- a/vendor/k8s.io/kubernetes/pkg/features/kube_features.go
+++ b/vendor/k8s.io/kubernetes/pkg/features/kube_features.go
@@ -1514,7 +1514,7 @@ var defaultVersionedKubernetesFeatureGates = map[featuregate.Feature]featuregate
 
 	MaxUnavailableStatefulSet: {
 		{Version: version.MustParse("1.24"), Default: false, PreRelease: featuregate.Alpha},
-		{Version: version.MustParse("1.35"), Default: true, PreRelease: featuregate.Beta},
+		{Version: version.MustParse("1.35"), Default: false, PreRelease: featuregate.Beta},
 	},
 
 	MemoryManager: {
diff --git a/vendor/modules.txt b/vendor/modules.txt
index 1c9848d0e1..9445195321 100644
--- a/vendor/modules.txt
+++ b/vendor/modules.txt
@@ -1240,7 +1240,7 @@ gopkg.in/yaml.v2
 # gopkg.in/yaml.v3 v3.0.1
 ## explicit
 gopkg.in/yaml.v3
-# k8s.io/api v1.35.2 => ./deps/github.com/openshift/kubernetes/staging/src/k8s.io/api
+# k8s.io/api v1.35.3 => ./deps/github.com/openshift/kubernetes/staging/src/k8s.io/api
 ## explicit; go 1.25.0
 k8s.io/api/admission/v1
 k8s.io/api/admission/v1beta1
@@ -1302,7 +1302,7 @@ k8s.io/api/storage/v1
 k8s.io/api/storage/v1alpha1
 k8s.io/api/storage/v1beta1
 k8s.io/api/storagemigration/v1beta1
-# k8s.io/apiextensions-apiserver v1.35.2 => ./deps/github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver
+# k8s.io/apiextensions-apiserver v1.35.3 => ./deps/github.com/openshift/kubernetes/staging/src/k8s.io/apiextensions-apiserver
 ## explicit; go 1.25.0
 k8s.io/apiextensions-apiserver/pkg/apihelpers
 k8s.io/apiextensions-apiserver/pkg/apis/apiextensions
@@ -1349,7 +1349,7 @@ k8s.io/apiextensions-apiserver/pkg/generated/openapi
 k8s.io/apiextensions-apiserver/pkg/registry/customresource
 k8s.io/apiextensions-apiserver/pkg/registry/customresource/tableconvertor
 k8s.io/apiextensions-apiserver/pkg/registry/customresourcedefinition
-# k8s.io/apimachinery v1.35.2 => ./deps/github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery
+# k8s.io/apimachinery v1.35.3 => ./deps/github.com/openshift/kubernetes/staging/src/k8s.io/apimachinery
 ## explicit; go 1.25.0
 k8s.io/apimachinery/pkg/api/equality
 k8s.io/apimachinery/pkg/api/errors
@@ -1431,7 +1431,7 @@ k8s.io/apimachinery/pkg/watch
 k8s.io/apimachinery/third_party/forked/golang/json
 k8s.io/apimachinery/third_party/forked/golang/netutil
 k8s.io/apimachinery/third_party/forked/golang/reflect
-# k8s.io/apiserver v1.35.2 => ./deps/github.com/openshift/kubernetes/staging/src/k8s.io/apiserver
+# k8s.io/apiserver v1.35.3 => ./deps/github.com/openshift/kubernetes/staging/src/k8s.io/apiserver
 ## explicit; go 1.25.0
 k8s.io/apiserver/pkg/admission
 k8s.io/apiserver/pkg/admission/configuration
@@ -1625,13 +1625,13 @@ k8s.io/apiserver/plugin/pkg/authenticator/token/oidc
 k8s.io/apiserver/plugin/pkg/authenticator/token/webhook
 k8s.io/apiserver/plugin/pkg/authorizer/webhook
 k8s.io/apiserver/plugin/pkg/authorizer/webhook/metrics
-# k8s.io/cli-runtime v1.35.2 => ./deps/github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime
+# k8s.io/cli-runtime v1.35.3 => ./deps/github.com/openshift/kubernetes/staging/src/k8s.io/cli-runtime
 ## explicit; go 1.25.0
 k8s.io/cli-runtime/pkg/genericclioptions
 k8s.io/cli-runtime/pkg/genericiooptions
 k8s.io/cli-runtime/pkg/printers
 k8s.io/cli-runtime/pkg/resource
-# k8s.io/client-go v1.35.2 => ./deps/github.com/openshift/kubernetes/staging/src/k8s.io/client-go
+# k8s.io/client-go v1.35.3 => ./deps/github.com/openshift/kubernetes/staging/src/k8s.io/client-go
 ## explicit; go 1.25.0
 k8s.io/client-go/applyconfigurations
 k8s.io/client-go/applyconfigurations/admissionregistration/v1
@@ -2000,7 +2000,7 @@ k8s.io/client-go/util/keyutil
 k8s.io/client-go/util/retry
 k8s.io/client-go/util/watchlist
 k8s.io/client-go/util/workqueue
-# k8s.io/cloud-provider v1.35.2 => ./deps/github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider
+# k8s.io/cloud-provider v1.35.3 => ./deps/github.com/openshift/kubernetes/staging/src/k8s.io/cloud-provider
 ## explicit; go 1.25.0
 k8s.io/cloud-provider
 k8s.io/cloud-provider/api
@@ -2018,14 +2018,14 @@ k8s.io/cloud-provider/service/helpers
 k8s.io/cloud-provider/volume
 k8s.io/cloud-provider/volume/errors
 k8s.io/cloud-provider/volume/helpers
-# k8s.io/cluster-bootstrap v1.35.2 => ./deps/github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap
+# k8s.io/cluster-bootstrap v1.35.3 => ./deps/github.com/openshift/kubernetes/staging/src/k8s.io/cluster-bootstrap
 ## explicit; go 1.25.0
 k8s.io/cluster-bootstrap/token/api
 k8s.io/cluster-bootstrap/token/jws
 k8s.io/cluster-bootstrap/token/util
 k8s.io/cluster-bootstrap/util/secrets
 k8s.io/cluster-bootstrap/util/tokens
-# k8s.io/component-base v1.35.2 => ./deps/github.com/openshift/kubernetes/staging/src/k8s.io/component-base
+# k8s.io/component-base v1.35.3 => ./deps/github.com/openshift/kubernetes/staging/src/k8s.io/component-base
 ## explicit; go 1.25.0
 k8s.io/component-base/cli
 k8s.io/component-base/cli/flag
@@ -2062,7 +2062,7 @@ k8s.io/component-base/tracing/api/v1
 k8s.io/component-base/version
 k8s.io/component-base/version/verflag
 k8s.io/component-base/zpages/features
-# k8s.io/component-helpers v1.35.2 => ./deps/github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers
+# k8s.io/component-helpers v1.35.3 => ./deps/github.com/openshift/kubernetes/staging/src/k8s.io/component-helpers
 ## explicit; go 1.25.0
 k8s.io/component-helpers/apimachinery/lease
 k8s.io/component-helpers/apps/poddisruptionbudget
@@ -2080,7 +2080,7 @@ k8s.io/component-helpers/scheduling/corev1
 k8s.io/component-helpers/scheduling/corev1/nodeaffinity
 k8s.io/component-helpers/storage/ephemeral
 k8s.io/component-helpers/storage/volume
-# k8s.io/controller-manager v1.35.2 => ./deps/github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager
+# k8s.io/controller-manager v1.35.3 => ./deps/github.com/openshift/kubernetes/staging/src/k8s.io/controller-manager
 ## explicit; go 1.25.0
 k8s.io/controller-manager/app
 k8s.io/controller-manager/config
@@ -2097,22 +2097,22 @@ k8s.io/controller-manager/pkg/informerfactory
 k8s.io/controller-manager/pkg/leadermigration
 k8s.io/controller-manager/pkg/leadermigration/config
 k8s.io/controller-manager/pkg/leadermigration/options
-# k8s.io/cri-api v1.35.2 => ./deps/github.com/openshift/kubernetes/staging/src/k8s.io/cri-api
+# k8s.io/cri-api v1.35.3 => ./deps/github.com/openshift/kubernetes/staging/src/k8s.io/cri-api
 ## explicit; go 1.25.0
 k8s.io/cri-api/pkg/apis
 k8s.io/cri-api/pkg/apis/runtime/v1
 k8s.io/cri-api/pkg/errors
-# k8s.io/cri-client v1.35.2 => ./deps/github.com/openshift/kubernetes/staging/src/k8s.io/cri-client
+# k8s.io/cri-client v1.35.3 => ./deps/github.com/openshift/kubernetes/staging/src/k8s.io/cri-client
 ## explicit; go 1.25.0
 k8s.io/cri-client/pkg
 k8s.io/cri-client/pkg/internal
 k8s.io/cri-client/pkg/logs
 k8s.io/cri-client/pkg/util
-# k8s.io/csi-translation-lib v1.35.2 => ./deps/github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib
+# k8s.io/csi-translation-lib v1.35.3 => ./deps/github.com/openshift/kubernetes/staging/src/k8s.io/csi-translation-lib
 ## explicit; go 1.25.0
 k8s.io/csi-translation-lib
 k8s.io/csi-translation-lib/plugins
-# k8s.io/dynamic-resource-allocation v1.35.2 => ./deps/github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation
+# k8s.io/dynamic-resource-allocation v1.35.3 => ./deps/github.com/openshift/kubernetes/staging/src/k8s.io/dynamic-resource-allocation
 ## explicit; go 1.25.0
 k8s.io/dynamic-resource-allocation/api
 k8s.io/dynamic-resource-allocation/cel
@@ -2125,14 +2125,14 @@ k8s.io/dynamic-resource-allocation/structured/internal/experimental
 k8s.io/dynamic-resource-allocation/structured/internal/incubating
 k8s.io/dynamic-resource-allocation/structured/internal/stable
 k8s.io/dynamic-resource-allocation/structured/schedulerapi
-# k8s.io/endpointslice v1.35.2 => ./deps/github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice
+# k8s.io/endpointslice v1.35.3 => ./deps/github.com/openshift/kubernetes/staging/src/k8s.io/endpointslice
 ## explicit; go 1.25.0
 k8s.io/endpointslice
 k8s.io/endpointslice/metrics
 k8s.io/endpointslice/topologycache
 k8s.io/endpointslice/trafficdist
 k8s.io/endpointslice/util
-# k8s.io/externaljwt v1.35.2 => ./deps/github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt
+# k8s.io/externaljwt v1.35.3 => ./deps/github.com/openshift/kubernetes/staging/src/k8s.io/externaljwt
 ## explicit; go 1.25.0
 k8s.io/externaljwt/apis/v1
 # k8s.io/gengo/v2 v2.0.0-20250922181213-ec3ebc5fd46b
@@ -2154,13 +2154,13 @@ k8s.io/klog/v2/internal/severity
 k8s.io/klog/v2/internal/sloghandler
 k8s.io/klog/v2/internal/verbosity
 k8s.io/klog/v2/textlogger
-# k8s.io/kms v1.35.2 => ./deps/github.com/openshift/kubernetes/staging/src/k8s.io/kms
+# k8s.io/kms v1.35.3 => ./deps/github.com/openshift/kubernetes/staging/src/k8s.io/kms
 ## explicit; go 1.25.0
 k8s.io/kms/apis/v1beta1
 k8s.io/kms/apis/v2
 k8s.io/kms/pkg/service
 k8s.io/kms/pkg/util
-# k8s.io/kube-aggregator v1.35.2 => ./deps/github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator
+# k8s.io/kube-aggregator v1.35.3 => ./deps/github.com/openshift/kubernetes/staging/src/k8s.io/kube-aggregator
 ## explicit; go 1.25.0
 k8s.io/kube-aggregator/pkg/apis/apiregistration
 k8s.io/kube-aggregator/pkg/apis/apiregistration/install
@@ -2193,7 +2193,7 @@ k8s.io/kube-aggregator/pkg/controllers/status/remote
 k8s.io/kube-aggregator/pkg/registry/apiservice
 k8s.io/kube-aggregator/pkg/registry/apiservice/etcd
 k8s.io/kube-aggregator/pkg/registry/apiservice/rest
-# k8s.io/kube-controller-manager v1.35.2 => ./deps/github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager
+# k8s.io/kube-controller-manager v1.35.3 => ./deps/github.com/openshift/kubernetes/staging/src/k8s.io/kube-controller-manager
 ## explicit; go 1.25.0
 k8s.io/kube-controller-manager/config/v1alpha1
 # k8s.io/kube-openapi v0.0.0-20260304202019-5b3e3fdb0acf
@@ -2227,15 +2227,15 @@ k8s.io/kube-openapi/pkg/validation/spec
 k8s.io/kube-openapi/pkg/validation/strfmt
 k8s.io/kube-openapi/pkg/validation/strfmt/bson
 k8s.io/kube-openapi/pkg/validation/validate
-# k8s.io/kube-proxy v1.35.2 => ./deps/github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy
+# k8s.io/kube-proxy v1.35.3 => ./deps/github.com/openshift/kubernetes/staging/src/k8s.io/kube-proxy
 ## explicit; go 1.25.0
 k8s.io/kube-proxy/config/v1alpha1
-# k8s.io/kube-scheduler v1.35.2 => ./deps/github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler
+# k8s.io/kube-scheduler v1.35.3 => ./deps/github.com/openshift/kubernetes/staging/src/k8s.io/kube-scheduler
 ## explicit; go 1.25.0
 k8s.io/kube-scheduler/config/v1
 k8s.io/kube-scheduler/extender/v1
 k8s.io/kube-scheduler/framework
-# k8s.io/kubectl v1.35.2 => ./deps/github.com/openshift/kubernetes/staging/src/k8s.io/kubectl
+# k8s.io/kubectl v1.35.3 => ./deps/github.com/openshift/kubernetes/staging/src/k8s.io/kubectl
 ## explicit; go 1.25.0
 k8s.io/kubectl/pkg/apps
 k8s.io/kubectl/pkg/cmd/apiresources
@@ -2273,7 +2273,7 @@ k8s.io/kubectl/pkg/util/storage
 k8s.io/kubectl/pkg/util/templates
 k8s.io/kubectl/pkg/util/term
 k8s.io/kubectl/pkg/validation
-# k8s.io/kubelet v1.35.2 => ./deps/github.com/openshift/kubernetes/staging/src/k8s.io/kubelet
+# k8s.io/kubelet v1.35.3 => ./deps/github.com/openshift/kubernetes/staging/src/k8s.io/kubelet
 ## explicit; go 1.25.0
 k8s.io/kubelet/config/v1
 k8s.io/kubelet/config/v1alpha1
@@ -2296,7 +2296,7 @@ k8s.io/kubelet/pkg/cri/streaming
 k8s.io/kubelet/pkg/cri/streaming/portforward
 k8s.io/kubelet/pkg/cri/streaming/remotecommand
 k8s.io/kubelet/pkg/types
-# k8s.io/kubernetes v1.35.2 => ./deps/github.com/openshift/kubernetes
+# k8s.io/kubernetes v1.35.3 => ./deps/github.com/openshift/kubernetes
 ## explicit; go 1.25.0
 k8s.io/kubernetes/cmd/kube-apiserver/app
 k8s.io/kubernetes/cmd/kube-apiserver/app/options
@@ -3140,7 +3140,7 @@ k8s.io/kubernetes/third_party/forked/gonum/graph/simple
 k8s.io/kubernetes/third_party/forked/gonum/graph/traverse
 k8s.io/kubernetes/third_party/forked/libcontainer/apparmor
 k8s.io/kubernetes/third_party/forked/libcontainer/utils
-# k8s.io/metrics v1.35.2 => ./deps/github.com/openshift/kubernetes/staging/src/k8s.io/metrics
+# k8s.io/metrics v1.35.3 => ./deps/github.com/openshift/kubernetes/staging/src/k8s.io/metrics
 ## explicit; go 1.25.0
 k8s.io/metrics/pkg/apis/custom_metrics
 k8s.io/metrics/pkg/apis/custom_metrics/v1beta1
@@ -3155,10 +3155,10 @@ k8s.io/metrics/pkg/client/clientset/versioned/typed/metrics/v1beta1
 k8s.io/metrics/pkg/client/custom_metrics
 k8s.io/metrics/pkg/client/custom_metrics/scheme
 k8s.io/metrics/pkg/client/external_metrics
-# k8s.io/mount-utils v1.35.2 => ./deps/github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils
+# k8s.io/mount-utils v1.35.3 => ./deps/github.com/openshift/kubernetes/staging/src/k8s.io/mount-utils
 ## explicit; go 1.25.0
 k8s.io/mount-utils
-# k8s.io/pod-security-admission v1.35.2 => ./deps/github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission
+# k8s.io/pod-security-admission v1.35.3 => ./deps/github.com/openshift/kubernetes/staging/src/k8s.io/pod-security-admission
 ## explicit; go 1.25.0
 k8s.io/pod-security-admission/admission
 k8s.io/pod-security-admission/admission/api