NO-ISSUE: rebase-release-4.18-4.18.0-0.nightly-2025-12-03-213720_amd64-2025-12-03_arm64-2025-12-03 (#5853)

microshift-rebase-script[bot] · ci-robot · web-flow · commit c3a40d9a8d84 · 2025-12-04T15:18:28.000Z
* update last_rebase.sh

* update changelog

* update manifests

* update buildfiles

---------

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.18.0-0.nightly-arm64-2025-12-01-032311
+OCP_VERSION := 4.18.0-0.nightly-arm64-2025-12-03-212311
diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var
@@ -1 +1 @@
-OCP_VERSION := 4.18.0-0.nightly-2025-11-30-172840
+OCP_VERSION := 4.18.0-0.nightly-2025-12-03-213720
diff --git a/assets/optional/multus/kustomization.aarch64.yaml b/assets/optional/multus/kustomization.aarch64.yaml
@@ -5,4 +5,4 @@ images:
     digest: sha256:f56fb6bc797784ddab6d1c3e4009f1654773153102a237ca7dfe06c5bbef6fde
   - name: containernetworking-plugins-microshift
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:831b0a8201506f026ddaf268d20394ac2e73d4e8300d9fb5262f9088dd8df9e1
+    digest: sha256:27e5a16051f080c4594a33c9960e2e6f17629171c53f03ccf35b591f57f75410
diff --git a/assets/optional/multus/kustomization.x86_64.yaml b/assets/optional/multus/kustomization.x86_64.yaml
@@ -5,4 +5,4 @@ images:
     digest: sha256:f9d86dc5ee44da3eb1b8f73b94538478657fada310d1b8ad33b22860d4da2ef5
   - name: containernetworking-plugins-microshift
     newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
-    digest: sha256:29db4e799a6f9e6c16c90faf73b5249232f2ac35139b4b8acf86ce16611a431b
+    digest: sha256:2524433b9d1c19576264bf9a40434a4eec7b4f185c268d42166e8240b1a9f547
diff --git a/assets/optional/multus/release-multus-aarch64.json b/assets/optional/multus/release-multus-aarch64.json
@@ -1,9 +1,9 @@
 {
   "release": {
-    "base": "4.18.0-0.nightly-arm64-2025-12-01-032311"
+    "base": "4.18.0-0.nightly-arm64-2025-12-03-212311"
   },
   "images": {
     "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f56fb6bc797784ddab6d1c3e4009f1654773153102a237ca7dfe06c5bbef6fde",
-    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:831b0a8201506f026ddaf268d20394ac2e73d4e8300d9fb5262f9088dd8df9e1"
+    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:27e5a16051f080c4594a33c9960e2e6f17629171c53f03ccf35b591f57f75410"
   }
 }
diff --git a/assets/optional/multus/release-multus-x86_64.json b/assets/optional/multus/release-multus-x86_64.json
@@ -1,9 +1,9 @@
 {
   "release": {
-    "base": "4.18.0-0.nightly-2025-11-30-172840"
+    "base": "4.18.0-0.nightly-2025-12-03-213720"
   },
   "images": {
     "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f9d86dc5ee44da3eb1b8f73b94538478657fada310d1b8ad33b22860d4da2ef5",
-    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:29db4e799a6f9e6c16c90faf73b5249232f2ac35139b4b8acf86ce16611a431b"
+    "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2524433b9d1c19576264bf9a40434a4eec7b4f185c268d42166e8240b1a9f547"
   }
 }
diff --git a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json
@@ -1,6 +1,6 @@
 {
   "release": {
-    "base": "4.18.0-0.nightly-arm64-2025-12-01-032311"
+    "base": "4.18.0-0.nightly-arm64-2025-12-03-212311"
   },
   "images": {
     "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1fc6522dd8dc735a62c846efeb62cf1f0068d2441ebed8ccee3087d77ce0c141",
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,6 +1,6 @@
 {
   "release": {
-    "base": "4.18.0-0.nightly-2025-11-30-172840"
+    "base": "4.18.0-0.nightly-2025-12-03-213720"
   },
   "images": {
     "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7430023781b2028ab450fb4f805228e25c62df1930d3e2fc1edd9304bc7b5ed1",
diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json
@@ -1,13 +1,13 @@
 {
   "release": {
-    "base": "4.18.0-0.nightly-arm64-2025-12-01-032311"
+    "base": "4.18.0-0.nightly-arm64-2025-12-03-212311"
   },
   "images": {
     "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:225cf8516a61fa42a40d05627241d76ae23b41e95ad75a783030c3934d98806e",
     "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:13eae84e69025e5fbaf2f9b5504bf1919a50fcf253ebf8163658b0bd3ddc565c",
     "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4116ae0b535a46e1ae548ed36bac595f2b0ac7b3e16b195db82eecb040725003",
     "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3b0cfd92c640f3b981907865d0b6d18542d55b8c6533519d3b78fe580426407f",
-    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:64e6e26ad95b9938a5bf1c9809ebee895c40fa9d714bb1ca9e232c259c026970",
+    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5a123b5f9c1e978aaaa1142280e1b1e99a7a417c53780d95866220d4a11cc755",
     "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:33fcd4c023d2bb92d11b3d4ab44e794424604f2e98f3f4ce728f7ddc56b21ad3",
     "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:999fbfdd16e96cbf908360131c842c4ee62aff1bf922fb6ea40be4340c6200e7",
     "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e",
diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json
@@ -1,13 +1,13 @@
 {
   "release": {
-    "base": "4.18.0-0.nightly-2025-11-30-172840"
+    "base": "4.18.0-0.nightly-2025-12-03-213720"
   },
   "images": {
     "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9bd872f8adc3138f7c3bd8267aa1a8ecb5cd2e7f3385b8434a684cfd52093909",
     "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:eda217bc3f5af197249c4e3eb8d77a0572e0cedff460db3475d1ced1d9de2d92",
     "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0af23bc26a1d8a64483ea2831a0d222b44b3a6e33f6763d01cd04843a6aadef4",
     "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4638924ee1497d50cf8b85a36a8e980f8da0989b55426cac2068771282ebc232",
-    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b4f32435fc8c38c59a0da69a680857ccb0b8d9d58ff28fee54cbc917a7c44603",
+    "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:65c1e620c5c49fb1a4b0c49a907eccd9a730c73a3a2e79716bcd57ba7d991f6d",
     "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8d4bd2b7ea78f1d71959bf406fcb0890b550777911534f75d89994efb10c1828",
     "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2af60f461be57443bdaf0985f6f4a6bbabac434cfe25cfd6df90683241c5f250",
     "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e",
diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt
@@ -1,70 +0,0 @@
-- cluster-kube-apiserver-operator embedded-component bac8a7c99c2e8562a05b784c8fe4f8ecd91eecdf to 416eeae4e60970f5ab52a833774c7bb60644e6af
-  - c6b78b3 2025-11-26T14:25:53+01:00 bump library-go
-
-- cluster-kube-controller-manager-operator embedded-component a2cbb5725fe5e560ba40d884cfd079b3f8391f03 to 9a9a437f2342dc9bba7844298b955d5f9bbc76bb
-  - f20da3d 2025-11-26T14:22:18+01:00 bump library-go
-
-- cluster-kube-scheduler-operator embedded-component 6182930dde5ec8dd22bd50481e8b369ce673484c to 971ffbb8239a8c49f1254e5fdaab854eed224f31
-  - 8e4ffd1 2025-11-26T14:16:48+01:00 bump library-go
-
-- cluster-network-operator embedded-component eec368f2985d93c136785b6f37bdd39559a1cf4c to af0e6d30bcfd2f3f55b61e8538d33e6d052afb68
-  - c7d95af 2025-11-18T07:40:34+00:00 Annotate whereabouts-controller
-
-- kubernetes embedded-component 337fc64fb1915348588ddee22a04fee0dc6aa083 to 436b373e7dec669750c65a1ef832665e56b733b7
-  - b10f2ccf8 2025-11-18T13:53:42+01:00 UPSTREAM: <drop>: hack/update-vendor.sh, make update and update image
-  - 5e00b99ba 2025-11-11T20:18:09+00:00 Release commit for Kubernetes v1.31.14
-  - a05234023 2025-11-01T05:50:42+02:00 Fix tests
-  - a9ea4da48 2025-10-31T22:45:46+02:00 etcd: bump etcd to v3.5.24 for k8s v1.31, v1.32, v1.33
-  - 78558809d 2025-10-17T17:06:14+03:00 gce: fix etcd manifest
-  - 0a10906a0 2025-10-15T13:39:36+02:00 update setcap and debian-base to bookworm-v1.0.6
-  - e217986aa 2025-10-15T13:38:43+02:00 Bump dependencies, images and versions used to Go 1.24.9 and distroless iptables
-  - 48954b9e7 2025-10-14T14:35:04-04:00 golangci-lint: temporarily suppress stylistic testifylint issues in the code base
-  - 62e72880a 2025-10-14T13:11:06-04:00 golangci-lint: temporarily suppress known issues in the code base
-  - 0269ff398 2025-10-14T13:11:05-04:00 Bump hack/tools to github.com/golangci/golangci-lint 1.64.5 for go 1.24
-  - cb0660cdc 2025-10-14T09:39:18-04:00 Add integration test for invalid SAN certificate handling
-  - 9bd285d24 2025-10-14T09:39:18-04:00 Remove invalid SAN certificate construction
-  - 73677638a 2025-10-14T09:39:17-04:00 kubeadm preflight checks: fix host URL construction
-  - c2bc37355 2025-09-16T22:32:57+05:30 Fix ClusterIP load balancer disappearing when InternalTrafficPolicy: Local is set.
-  - c908ad241 2025-09-09T23:19:16+00:00 Update CHANGELOG/CHANGELOG-1.31.md for v1.31.13
-
-- machine-config-operator embedded-component 42fb22473a59c95ff7e89eadb5c701c7621f7b9e to a51e963bdc11e1b49404d111c94e6257a637059f
-  - 89285dba 2025-10-15T17:28:16+00:00 add: fallback check for br-ex-br in ofport NM dispatcher script
-  - 4252ec62 2025-10-15T17:28:16+00:00 Revert "ofport-request dispatcher script takes br-ex(-br) managed by nmstate into account"
-  - b57ac326 2025-10-15T17:28:16+00:00 Revert "improve of-port request so it uses a common path instead of retrying on NMS managed br-ex"
-  - cf65cd72 2025-10-15T17:28:16+00:00 improve of-port request so it uses a common path instead of retrying on NMS managed br-ex
-  - 0cedc7c4 2025-10-15T17:28:16+00:00 ofport-request dispatcher script takes br-ex(-br) managed by nmstate into account
-
-- kubernetes image-amd64 337fc64fb1915348588ddee22a04fee0dc6aa083 to 436b373e7dec669750c65a1ef832665e56b733b7
-  - b10f2ccf8 2025-11-18T13:53:42+01:00 UPSTREAM: <drop>: hack/update-vendor.sh, make update and update image
-  - 5e00b99ba 2025-11-11T20:18:09+00:00 Release commit for Kubernetes v1.31.14
-  - a05234023 2025-11-01T05:50:42+02:00 Fix tests
-  - a9ea4da48 2025-10-31T22:45:46+02:00 etcd: bump etcd to v3.5.24 for k8s v1.31, v1.32, v1.33
-  - 78558809d 2025-10-17T17:06:14+03:00 gce: fix etcd manifest
-  - 0a10906a0 2025-10-15T13:39:36+02:00 update setcap and debian-base to bookworm-v1.0.6
-  - e217986aa 2025-10-15T13:38:43+02:00 Bump dependencies, images and versions used to Go 1.24.9 and distroless iptables
-  - 48954b9e7 2025-10-14T14:35:04-04:00 golangci-lint: temporarily suppress stylistic testifylint issues in the code base
-  - 62e72880a 2025-10-14T13:11:06-04:00 golangci-lint: temporarily suppress known issues in the code base
-  - 0269ff398 2025-10-14T13:11:05-04:00 Bump hack/tools to github.com/golangci/golangci-lint 1.64.5 for go 1.24
-  - cb0660cdc 2025-10-14T09:39:18-04:00 Add integration test for invalid SAN certificate handling
-  - 9bd285d24 2025-10-14T09:39:18-04:00 Remove invalid SAN certificate construction
-  - 73677638a 2025-10-14T09:39:17-04:00 kubeadm preflight checks: fix host URL construction
-  - c2bc37355 2025-09-16T22:32:57+05:30 Fix ClusterIP load balancer disappearing when InternalTrafficPolicy: Local is set.
-  - c908ad241 2025-09-09T23:19:16+00:00 Update CHANGELOG/CHANGELOG-1.31.md for v1.31.13
-
-- kubernetes image-arm64 337fc64fb1915348588ddee22a04fee0dc6aa083 to 436b373e7dec669750c65a1ef832665e56b733b7
-  - b10f2ccf8 2025-11-18T13:53:42+01:00 UPSTREAM: <drop>: hack/update-vendor.sh, make update and update image
-  - 5e00b99ba 2025-11-11T20:18:09+00:00 Release commit for Kubernetes v1.31.14
-  - a05234023 2025-11-01T05:50:42+02:00 Fix tests
-  - a9ea4da48 2025-10-31T22:45:46+02:00 etcd: bump etcd to v3.5.24 for k8s v1.31, v1.32, v1.33
-  - 78558809d 2025-10-17T17:06:14+03:00 gce: fix etcd manifest
-  - 0a10906a0 2025-10-15T13:39:36+02:00 update setcap and debian-base to bookworm-v1.0.6
-  - e217986aa 2025-10-15T13:38:43+02:00 Bump dependencies, images and versions used to Go 1.24.9 and distroless iptables
-  - 48954b9e7 2025-10-14T14:35:04-04:00 golangci-lint: temporarily suppress stylistic testifylint issues in the code base
-  - 62e72880a 2025-10-14T13:11:06-04:00 golangci-lint: temporarily suppress known issues in the code base
-  - 0269ff398 2025-10-14T13:11:05-04:00 Bump hack/tools to github.com/golangci/golangci-lint 1.64.5 for go 1.24
-  - cb0660cdc 2025-10-14T09:39:18-04:00 Add integration test for invalid SAN certificate handling
-  - 9bd285d24 2025-10-14T09:39:18-04:00 Remove invalid SAN certificate construction
-  - 73677638a 2025-10-14T09:39:17-04:00 kubeadm preflight checks: fix host URL construction
-  - c2bc37355 2025-09-16T22:32:57+05:30 Fix ClusterIP load balancer disappearing when InternalTrafficPolicy: Local is set.
-  - c908ad241 2025-09-09T23:19:16+00:00 Update CHANGELOG/CHANGELOG-1.31.md for v1.31.13
-
diff --git 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.18.0-0.nightly-2025-11-30-172840" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2025-12-01-032311"
+./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.18.0-0.nightly-2025-12-03-213720" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2025-12-03-212311"

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-OCP_VERSION := 4.18.0-0.nightly-arm64-2025-12-01-032311`
	`1`	`+OCP_VERSION := 4.18.0-0.nightly-arm64-2025-12-03-212311`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-OCP_VERSION := 4.18.0-0.nightly-2025-11-30-172840`
	`1`	`+OCP_VERSION := 4.18.0-0.nightly-2025-12-03-213720`
Original file line number	Diff line number	Diff line change
`@@ -1,9 +1,9 @@`
`1`	`1`	`{`
`2`	`2`	`"release": {`
`3`		`- "base": "4.18.0-0.nightly-arm64-2025-12-01-032311"`
	`3`	`+ "base": "4.18.0-0.nightly-arm64-2025-12-03-212311"`
`4`	`4`	`},`
`5`	`5`	`"images": {`
`6`	`6`	`"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f56fb6bc797784ddab6d1c3e4009f1654773153102a237ca7dfe06c5bbef6fde",`
`7`		`- "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:831b0a8201506f026ddaf268d20394ac2e73d4e8300d9fb5262f9088dd8df9e1"`
	`7`	`+ "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:27e5a16051f080c4594a33c9960e2e6f17629171c53f03ccf35b591f57f75410"`
`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.18.0-0.nightly-2025-11-30-172840"`
	`3`	`+ "base": "4.18.0-0.nightly-2025-12-03-213720"`
`4`	`4`	`},`
`5`	`5`	`"images": {`
`6`	`6`	`"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f9d86dc5ee44da3eb1b8f73b94538478657fada310d1b8ad33b22860d4da2ef5",`
`7`		`- "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:29db4e799a6f9e6c16c90faf73b5249232f2ac35139b4b8acf86ce16611a431b"`
	`7`	`+ "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2524433b9d1c19576264bf9a40434a4eec7b4f185c268d42166e8240b1a9f547"`
`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": "4.18.0-0.nightly-arm64-2025-12-01-032311"`
	`3`	`+ "base": "4.18.0-0.nightly-arm64-2025-12-03-212311"`
`4`	`4`	`},`
`5`	`5`	`"images": {`
`6`	`6`	`"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1fc6522dd8dc735a62c846efeb62cf1f0068d2441ebed8ccee3087d77ce0c141",`