NO-ISSUE: rebase-release-4.21-4.21.0-0.nightly-2025-12-15-125449_amd64-2025-12-15_arm64-2025-12-17 (#5939)

microshift-rebase-script[bot] · ci-robot · web-flow · commit 183a7b6ed772 · 2025-12-18T07:01:36.000Z
* update last_rebase.sh

* update changelog

* update component images

* update manifests

* update buildfiles

* Update AI Model Serving for MicroShift

* Update SR-IOV for MicroShift

---------

Co-authored-by: ci-robot &lt;ci-robot@openshift.io&gt;
diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var
@@ -1 +1 @@
-OCP_VERSION := 4.21.0-0.nightly-arm64-2025-12-15-020840
+OCP_VERSION := 4.21.0-0.nightly-arm64-2025-12-17-223241
diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var
@@ -1 +1 @@
-OCP_VERSION := 4.21.0-0.nightly-2025-12-14-144544
+OCP_VERSION := 4.21.0-0.nightly-2025-12-15-125449
diff --git a/assets/components/multus/kustomization.aarch64.yaml b/assets/components/multus/kustomization.aarch64.yaml
@@ -2,7 +2,7 @@
 images:
   - name: multus-cni-microshift
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:5aae3c85957482d13482523d29d59b25368c565342054b42f558bc74716f8118
+    digest: sha256:18552017da9aa18b031807120befe01faea9c75dda06808a11bf8b58e8c3e3fe
   - name: containernetworking-plugins-microshift
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:00422141ddbcf2b33b543944f9aff59dcb222de8dd0e64d49bf20bafdacd1d27
+    digest: sha256:7b235df906a1ee6f10a3124bb4aba4f442e1daeec0c2c561e18ab1248ef21059
diff --git a/assets/components/multus/kustomization.x86_64.yaml b/assets/components/multus/kustomization.x86_64.yaml
@@ -2,7 +2,7 @@
 images:
   - name: multus-cni-microshift
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:0f3ad99813d120b4ab58883ad612e2318848501aed082beb37f83d9211781ee6
+    digest: sha256:339e6c637393961f0ddfaff015fa9030a9abdb75a1d24c20da064793a97cee0b
   - name: containernetworking-plugins-microshift
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:ff1517209f0534a2f1709e730901250d101cccdb6141ab11813e63b305e926cf
+    digest: sha256:875caf9302b320c9fd41be71ba0be0aab15765048e6847dd231cee5819d5348a
diff --git a/assets/components/multus/release-multus-aarch64.json b/assets/components/multus/release-multus-aarch64.json
@@ -1,9 +1,9 @@
 {
   "release": {
-    "base": "4.21.0-0.nightly-arm64-2025-12-15-020840"
+    "base": "4.21.0-0.nightly-arm64-2025-12-17-223241"
   },
   "images": {
-    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5aae3c85957482d13482523d29d59b25368c565342054b42f558bc74716f8118",
-    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:00422141ddbcf2b33b543944f9aff59dcb222de8dd0e64d49bf20bafdacd1d27"
+    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:18552017da9aa18b031807120befe01faea9c75dda06808a11bf8b58e8c3e3fe",
+    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7b235df906a1ee6f10a3124bb4aba4f442e1daeec0c2c561e18ab1248ef21059"
   }
 }
diff --git a/assets/components/multus/release-multus-x86_64.json b/assets/components/multus/release-multus-x86_64.json
@@ -1,9 +1,9 @@
 {
   "release": {
-    "base": "4.21.0-0.nightly-2025-12-14-144544"
+    "base": "4.21.0-0.nightly-2025-12-15-125449"
   },
   "images": {
-    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0f3ad99813d120b4ab58883ad612e2318848501aed082beb37f83d9211781ee6",
-    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ff1517209f0534a2f1709e730901250d101cccdb6141ab11813e63b305e926cf"
+    "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:339e6c637393961f0ddfaff015fa9030a9abdb75a1d24c20da064793a97cee0b",
+    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:875caf9302b320c9fd41be71ba0be0aab15765048e6847dd231cee5819d5348a"
   }
 }
diff --git a/assets/optional/ai-model-serving/release-ai-model-serving-x86_64.json b/assets/optional/ai-model-serving/release-ai-model-serving-x86_64.json
@@ -1,6 +1,6 @@
 {
   "release": {
-    "base": "2.25.0"
+    "base": "2.25.1"
   },
   "images": {
     "ray-tls-generator-image": "registry.redhat.io/ubi9/ubi-minimal:latest",
diff --git a/assets/optional/ai-model-serving/runtimes/caikit-standalone.yaml b/assets/optional/ai-model-serving/runtimes/caikit-standalone.yaml
@@ -9,6 +9,7 @@ metadata:
     opendatahub.io/dashboard: 'true'
 spec:
   annotations:
+    opendatahub.io/kserve-runtime: 'caikit'
     prometheus.io/port: '8086'
     prometheus.io/path: /metrics
   multiModel: false
diff --git a/assets/optional/ai-model-serving/runtimes/caikit-tgis.yaml b/assets/optional/ai-model-serving/runtimes/caikit-tgis.yaml
@@ -9,6 +9,7 @@ metadata:
     opendatahub.io/dashboard: 'true'
 spec:
   annotations:
+    opendatahub.io/kserve-runtime: 'tgis'
     prometheus.io/port: '3000'
     prometheus.io/path: /metrics
   multiModel: false
diff --git a/assets/optional/ai-model-serving/runtimes/ovms-kserve.yaml b/assets/optional/ai-model-serving/runtimes/ovms-kserve.yaml
@@ -11,6 +11,7 @@ metadata:
 spec:
   multiModel: false
   annotations:
+    opendatahub.io/kserve-runtime: 'ovms'
     prometheus.io/port: '8888'
     prometheus.io/path: /metrics
   supportedModelFormats:
diff --git a/assets/optional/ai-model-serving/runtimes/vllm-cuda.yaml b/assets/optional/ai-model-serving/runtimes/vllm-cuda.yaml
@@ -10,8 +10,9 @@ metadata:
     opendatahub.io/dashboard: "true"
 spec:
   annotations:
-    prometheus.io/port: "8080"
-    prometheus.io/path: "/metrics"
+    opendatahub.io/kserve-runtime: 'vllm'
+    prometheus.io/port: '8080'
+    prometheus.io/path: '/metrics'
   multiModel: false
   supportedModelFormats:
     - autoSelect: true
diff --git a/assets/optional/ai-model-serving/runtimes/vllm-gaudi.yaml b/assets/optional/ai-model-serving/runtimes/vllm-gaudi.yaml
@@ -10,6 +10,7 @@ metadata:
     opendatahub.io/dashboard: 'true'
 spec:
   annotations:
+    opendatahub.io/kserve-runtime: 'vllm'
     prometheus.io/port: '8080'
     prometheus.io/path: '/metrics'
   multiModel: false
diff --git a/assets/optional/ai-model-serving/runtimes/vllm-rocm.yaml b/assets/optional/ai-model-serving/runtimes/vllm-rocm.yaml
@@ -10,6 +10,7 @@ metadata:
     opendatahub.io/dashboard: 'true'
 spec:
   annotations:
+    opendatahub.io/kserve-runtime: 'vllm'
     prometheus.io/port: '8080'
     prometheus.io/path: '/metrics'
   multiModel: false
diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml
@@ -2,26 +2,26 @@
 images:
   - name: quay.io/operator-framework/olm
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:3f1fa4d8c697a7b97788272f0d86de0a75483cdd2f1ec66a618758ab9c95a2f6
+    digest: sha256:31eece9e8eab776daf32ba43e9f87c39a6e57d6b487c224d0330f0fd3113a69e
   - name: quay.io/operator-framework/configmap-operator-registry
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:858c5d9b3174b63058c68e5db890319dc641dc6c43f3a767182adef5c43a69b7
+    digest: sha256:c52641e6b34b070d139734824fa386a1925958b125949aa77b1738dc11f1f26b
   - name: quay.io/openshift/origin-kube-rbac-proxy
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:7b3c01c6949923fb870dfb563e5829672df646247c8eadea8cb0a9693a3f2089
+    digest: sha256:dd585eb01f7424740fb0c3d1fbcbc1a6cf04fc25ba49ddc8f997701bf741d186
 
 patches:
   - patch: |-
      - op: add
        path: /spec/template/spec/containers/0/env/-
        value:
          name: OPERATOR_REGISTRY_IMAGE
-         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:858c5d9b3174b63058c68e5db890319dc641dc6c43f3a767182adef5c43a69b7
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c52641e6b34b070d139734824fa386a1925958b125949aa77b1738dc11f1f26b
      - op: add
        path: /spec/template/spec/containers/0/env/-
        value:
          name: OLM_IMAGE
-         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3f1fa4d8c697a7b97788272f0d86de0a75483cdd2f1ec66a618758ab9c95a2f6
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:31eece9e8eab776daf32ba43e9f87c39a6e57d6b487c224d0330f0fd3113a69e
     target:
       kind: Deployment
       labelSelector: app=catalog-operator
diff --git a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml
@@ -2,26 +2,26 @@
 images:
   - name: quay.io/operator-framework/olm
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:018b50d116337c33478dfb9079f2fe9e10c884d822cc1f7f872b7b47427b9e0a
+    digest: sha256:4cba3ea5043689480a4cc2517efa8e8469fcb5c082c7d46644b997849c9b1682
   - name: quay.io/operator-framework/configmap-operator-registry
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:1c10c75bdba6356cf3dad15374c43c3e592bfeb1869aa9f7d76ef60330840a78
+    digest: sha256:2bf1719296b50c43547f51f1c574d478f079222f8d39dc7290ce13b72d05dd27
   - name: quay.io/openshift/origin-kube-rbac-proxy
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:f3968be7c4898d66afca3704a3e5b22974cbfd00992edd7be6cf17c06d284360
+    digest: sha256:98fe564dafca4b43415e55fcc377fca43d45e0774403b7566c8e480ca0d37ab3
 
 patches:
   - patch: |-
      - op: add
        path: /spec/template/spec/containers/0/env/-
        value:
          name: OPERATOR_REGISTRY_IMAGE
-         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1c10c75bdba6356cf3dad15374c43c3e592bfeb1869aa9f7d76ef60330840a78
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2bf1719296b50c43547f51f1c574d478f079222f8d39dc7290ce13b72d05dd27
      - op: add
        path: /spec/template/spec/containers/0/env/-
        value:
          name: OLM_IMAGE
-         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:018b50d116337c33478dfb9079f2fe9e10c884d822cc1f7f872b7b47427b9e0a
+         value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4cba3ea5043689480a4cc2517efa8e8469fcb5c082c7d46644b997849c9b1682
     target:
       kind: Deployment
       labelSelector: app=catalog-operator
diff --git a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json
@@ -1,10 +1,10 @@
 {
   "release": {
-    "base": "4.21.0-0.nightly-arm64-2025-12-15-020840"
+    "base": "4.21.0-0.nightly-arm64-2025-12-17-223241"
   },
   "images": {
-    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3f1fa4d8c697a7b97788272f0d86de0a75483cdd2f1ec66a618758ab9c95a2f6",
-    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:858c5d9b3174b63058c68e5db890319dc641dc6c43f3a767182adef5c43a69b7",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7b3c01c6949923fb870dfb563e5829672df646247c8eadea8cb0a9693a3f2089"
+    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:31eece9e8eab776daf32ba43e9f87c39a6e57d6b487c224d0330f0fd3113a69e",
+    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c52641e6b34b070d139734824fa386a1925958b125949aa77b1738dc11f1f26b",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dd585eb01f7424740fb0c3d1fbcbc1a6cf04fc25ba49ddc8f997701bf741d186"
   }
 }
diff --git a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json
@@ -1,10 +1,10 @@
 {
   "release": {
-    "base": "4.21.0-0.nightly-2025-12-14-144544"
+    "base": "4.21.0-0.nightly-2025-12-15-125449"
   },
   "images": {
-    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:018b50d116337c33478dfb9079f2fe9e10c884d822cc1f7f872b7b47427b9e0a",
-    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1c10c75bdba6356cf3dad15374c43c3e592bfeb1869aa9f7d76ef60330840a78",
-    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f3968be7c4898d66afca3704a3e5b22974cbfd00992edd7be6cf17c06d284360"
+    "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4cba3ea5043689480a4cc2517efa8e8469fcb5c082c7d46644b997849c9b1682",
+    "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2bf1719296b50c43547f51f1c574d478f079222f8d39dc7290ce13b72d05dd27",
+    "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:98fe564dafca4b43415e55fcc377fca43d45e0774403b7566c8e480ca0d37ab3"
   }
 }
diff --git a/assets/optional/sriov/deploy/operator.yaml b/assets/optional/sriov/deploy/operator.yaml
@@ -22,21 +22,21 @@ spec:
                 fieldRef:
                   fieldPath: metadata.annotations['olm.targetNamespaces']
             - name: SRIOV_CNI_IMAGE
-              value: registry.redhat.io/openshift4/sriov-cni-rhel9@sha256:76ed6db7ad7d01e1ec70888f3c3ca787bab460ef1139d4930f66e8aab4fe2dd7
+              value: registry.redhat.io/openshift4/sriov-cni-rhel9@sha256:6a3b0070b671a818f094f78073279669c9646ebdc668f7099e44d007380b6060
             - name: SRIOV_DEVICE_PLUGIN_IMAGE
-              value: registry.redhat.io/openshift4/ose-sriov-network-device-plugin-rhel9@sha256:ea6942948b23a96054a8c27c4a8b6cffca49b6acc6ca556ce3e0708eb787789d
+              value: registry.redhat.io/openshift4/ose-sriov-network-device-plugin-rhel9@sha256:6508614560de3d333fe93d7c72e6b6a1fffb4b5fd75632bf74fc686eb9deaf80
             - name: NETWORK_RESOURCES_INJECTOR_IMAGE
-              value: registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:f07f432f89667200549eac89c6ef53c734420eb76a29c4008dd85a0a3526ad03
+              value: registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:f14abff38a42cb72299e58b957c6f0f09af5182208800a4a6ed55e57e4ab5f28
             - name: OPERATOR_NAME
               value: sriov-network-operator
             - name: SRIOV_NETWORK_CONFIG_DAEMON_IMAGE
-              value: registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:41d6d4232d6ed37f370795908f7ea0b56379ca6538afbb35ef7cfda4f000fafd
+              value: registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:e912e692c32a70f22c34360ca8e8960bdf40bc141f54c5782da3380b972b62ff
             - name: SRIOV_NETWORK_WEBHOOK_IMAGE
-              value: registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:cd12a9afe94fcb823cfff1a274b633c9d687b11537ad37c1752244981e9bda43
+              value: registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:6b23062ab592c3776ff7207ce7caed878474566033e45e377a893c4bac01de82
             - name: SRIOV_INFINIBAND_CNI_IMAGE
-              value: registry.redhat.io/openshift4/ose-sriov-infiniband-cni-rhel9@sha256:ad2994a2ef988378926196175d26ffc3bc9ed0be6a8d4d9eb79bae0422641af4
+              value: registry.redhat.io/openshift4/ose-sriov-infiniband-cni-rhel9@sha256:b423a3dca275e650fd498e6ca928c9d3c6bd1744c03986d30fb8775f04609b39
             - name: RDMA_CNI_IMAGE
-              value: registry.redhat.io/openshift4/ose-sriov-rdma-cni-rhel9@sha256:993925e3e3ca5e3d603ad9b868490e5ede61190ecb20dea873bd597627c65c95
+              value: registry.redhat.io/openshift4/ose-sriov-rdma-cni-rhel9@sha256:276e01d4ce0e9407f5f67e015af36ec552f61303fbb7b2d45de5beacdc417937
             - name: RESOURCE_PREFIX
               value: openshift.io
             - name: ADMISSION_CONTROLLERS_ENABLED
@@ -46,9 +46,9 @@ spec:
             - name: ADMISSION_CONTROLLERS_CERTIFICATES_INJECTOR_SECRET_NAME
               value: network-resources-injector-secret
             - name: METRICS_EXPORTER_IMAGE
-              value: registry.redhat.io/openshift4/ose-sriov-network-metrics-exporter-rhel9@sha256:04358d43922f4d29af64f99baa2a73b0b32cf2895140232b61e538599ec08e46
+              value: registry.redhat.io/openshift4/ose-sriov-network-metrics-exporter-rhel9@sha256:41b94f5b270e5d57b2130de47b0fa25796bfcf64c4dc771058ca0cd433404c05
             - name: METRICS_EXPORTER_KUBE_RBAC_PROXY_IMAGE
-              value: registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:5d7478a62742900e39d7b007dde5375cd06c6076ced6dab69d805f5fcce3f342
+              value: registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:ca1344cb64140188b7cae7bbc51fb751566c0b0c97d5e39b5850e628032c4a5e
             - name: METRICS_EXPORTER_SECRET_NAME
               value: metrics-exporter-cert
             - name: METRICS_EXPORTER_PROMETHEUS_OPERATOR_ENABLED
@@ -79,7 +79,7 @@ spec:
               value: /run/cni/bin
             - name: CLUSTER_TYPE
               value: kubernetes
-          image: registry.redhat.io/openshift4/ose-sriov-network-rhel9-operator@sha256:edf864070393e01c4423ead4f86a066cb2e083de870ad84e1367c6c0fee5c84d
+          image: registry.redhat.io/openshift4/ose-sriov-network-rhel9-operator@sha256:c4b91f426ee2ca995472dc03e04276cab57e1edf01e7af7a57b360c1b0ec5bd0
           imagePullPolicy: IfNotPresent
           livenessProbe:
             httpGet:
diff --git a/assets/optional/sriov/release-sriov-aarch64.json b/assets/optional/sriov/release-sriov-aarch64.json
@@ -1,17 +1,17 @@
 {
   "release": {
-    "base": "4.20.0-202511250912"
+    "base": "4.20.0-202512081147"
   },
   "images": {
-    "sriov-cni-image": "registry.redhat.io/openshift4/sriov-cni-rhel9@sha256:76ed6db7ad7d01e1ec70888f3c3ca787bab460ef1139d4930f66e8aab4fe2dd7",
-    "sriov-device-plugin-image": "registry.redhat.io/openshift4/ose-sriov-network-device-plugin-rhel9@sha256:ea6942948b23a96054a8c27c4a8b6cffca49b6acc6ca556ce3e0708eb787789d",
-    "network-resources-injector-image": "registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:f07f432f89667200549eac89c6ef53c734420eb76a29c4008dd85a0a3526ad03",
-    "sriov-network-config-daemon-image": "registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:41d6d4232d6ed37f370795908f7ea0b56379ca6538afbb35ef7cfda4f000fafd",
-    "sriov-network-webhook-image": "registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:cd12a9afe94fcb823cfff1a274b633c9d687b11537ad37c1752244981e9bda43",
-    "sriov-infiniband-cni-image": "registry.redhat.io/openshift4/ose-sriov-infiniband-cni-rhel9@sha256:ad2994a2ef988378926196175d26ffc3bc9ed0be6a8d4d9eb79bae0422641af4",
-    "rdma-cni-image": "registry.redhat.io/openshift4/ose-sriov-rdma-cni-rhel9@sha256:993925e3e3ca5e3d603ad9b868490e5ede61190ecb20dea873bd597627c65c95",
-    "metrics-exporter-image": "registry.redhat.io/openshift4/ose-sriov-network-metrics-exporter-rhel9@sha256:04358d43922f4d29af64f99baa2a73b0b32cf2895140232b61e538599ec08e46",
-    "metrics-exporter-kube-rbac-proxy-image": "registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:5d7478a62742900e39d7b007dde5375cd06c6076ced6dab69d805f5fcce3f342",
-    "sriov-network-operator": "registry.redhat.io/openshift4/ose-sriov-network-rhel9-operator@sha256:edf864070393e01c4423ead4f86a066cb2e083de870ad84e1367c6c0fee5c84d"
+    "sriov-cni-image": "registry.redhat.io/openshift4/sriov-cni-rhel9@sha256:6a3b0070b671a818f094f78073279669c9646ebdc668f7099e44d007380b6060",
+    "sriov-device-plugin-image": "registry.redhat.io/openshift4/ose-sriov-network-device-plugin-rhel9@sha256:6508614560de3d333fe93d7c72e6b6a1fffb4b5fd75632bf74fc686eb9deaf80",
+    "network-resources-injector-image": "registry.redhat.io/openshift4/ose-sriov-dp-admission-controller-rhel9@sha256:f14abff38a42cb72299e58b957c6f0f09af5182208800a4a6ed55e57e4ab5f28",
+    "sriov-network-config-daemon-image": "registry.redhat.io/openshift4/ose-sriov-network-config-daemon-rhel9@sha256:e912e692c32a70f22c34360ca8e8960bdf40bc141f54c5782da3380b972b62ff",
+    "sriov-network-webhook-image": "registry.redhat.io/openshift4/ose-sriov-network-webhook-rhel9@sha256:6b23062ab592c3776ff7207ce7caed878474566033e45e377a893c4bac01de82",
+    "sriov-infiniband-cni-image": "registry.redhat.io/openshift4/ose-sriov-infiniband-cni-rhel9@sha256:b423a3dca275e650fd498e6ca928c9d3c6bd1744c03986d30fb8775f04609b39",
+    "rdma-cni-image": "registry.redhat.io/openshift4/ose-sriov-rdma-cni-rhel9@sha256:276e01d4ce0e9407f5f67e015af36ec552f61303fbb7b2d45de5beacdc417937",
+    "metrics-exporter-image": "registry.redhat.io/openshift4/ose-sriov-network-metrics-exporter-rhel9@sha256:41b94f5b270e5d57b2130de47b0fa25796bfcf64c4dc771058ca0cd433404c05",
+    "metrics-exporter-kube-rbac-proxy-image": "registry.redhat.io/openshift4/ose-kube-rbac-proxy-rhel9@sha256:ca1344cb64140188b7cae7bbc51fb751566c0b0c97d5e39b5850e628032c4a5e",
+    "sriov-network-operator": "registry.redhat.io/openshift4/ose-sriov-network-rhel9-operator@sha256:c4b91f426ee2ca995472dc03e04276cab57e1edf01e7af7a57b360c1b0ec5bd0"
   }
 }
diff --git a/assets/optional/sriov/release-sriov-x86_64.json b/assets/optional/sriov/release-sriov-x86_64.json
diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json
diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json
diff --git a/packaging/crio.conf.d/10-microshift_amd64.conf b/packaging/crio.conf.d/10-microshift_amd64.conf
diff --git a/packaging/crio.conf.d/10-microshift_arm64.conf b/packaging/crio.conf.d/10-microshift_arm64.conf
diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt
diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt
diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-OCP_VERSION := 4.21.0-0.nightly-arm64-2025-12-15-020840`
	`1`	`+OCP_VERSION := 4.21.0-0.nightly-arm64-2025-12-17-223241`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-OCP_VERSION := 4.21.0-0.nightly-2025-12-14-144544`
	`1`	`+OCP_VERSION := 4.21.0-0.nightly-2025-12-15-125449`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`{`
`2`	`2`	`"release": {`
`3`		`- "base": "4.21.0-0.nightly-arm64-2025-12-15-020840"`
	`3`	`+ "base": "4.21.0-0.nightly-arm64-2025-12-17-223241"`
`4`	`4`	`},`
`5`	`5`	`"images": {`
`6`		`- "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5aae3c85957482d13482523d29d59b25368c565342054b42f558bc74716f8118",`
`7`		`- "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:00422141ddbcf2b33b543944f9aff59dcb222de8dd0e64d49bf20bafdacd1d27"`
	`6`	`+ "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:18552017da9aa18b031807120befe01faea9c75dda06808a11bf8b58e8c3e3fe",`
	`7`	`+ "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7b235df906a1ee6f10a3124bb4aba4f442e1daeec0c2c561e18ab1248ef21059"`
`8`	`8`	`}`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`{`
`2`	`2`	`"release": {`
`3`		`- "base": "4.21.0-0.nightly-2025-12-14-144544"`
	`3`	`+ "base": "4.21.0-0.nightly-2025-12-15-125449"`
`4`	`4`	`},`
`5`	`5`	`"images": {`
`6`		`- "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0f3ad99813d120b4ab58883ad612e2318848501aed082beb37f83d9211781ee6",`
`7`		`- "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ff1517209f0534a2f1709e730901250d101cccdb6141ab11813e63b305e926cf"`
	`6`	`+ "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:339e6c637393961f0ddfaff015fa9030a9abdb75a1d24c20da064793a97cee0b",`
	`7`	`+ "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:875caf9302b320c9fd41be71ba0be0aab15765048e6847dd231cee5819d5348a"`
`8`	`8`	`}`
`9`	`9`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"release": {`
`3`		`- "base": "2.25.0"`
	`3`	`+ "base": "2.25.1"`
`4`	`4`	`},`
`5`	`5`	`"images": {`
`6`	`6`	`"ray-tls-generator-image": "registry.redhat.io/ubi9/ubi-minimal:latest",`