NO-ISSUE: rebase-release-4.18-4.18.0-0.nightly-2025-02-07-235831_amd64-2025-02-08_arm64-2025-02-09 (#4526)

microshift-rebase-script[bot] · ci-robot · web-flow · commit cf0471315679 · 2025-02-10T08:02:47.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-02-06-191241
+OCP_VERSION := 4.18.0-0.nightly-arm64-2025-02-09-091710
diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var
@@ -1 +1 @@
-OCP_VERSION := 4.18.0-0.nightly-2025-02-06-092713
+OCP_VERSION := 4.18.0-0.nightly-2025-02-07-235831
diff --git a/assets/optional/multus/release-multus-aarch64.json b/assets/optional/multus/release-multus-aarch64.json
@@ -1,6 +1,6 @@
 {
   "release": {
-    "base": "4.18.0-0.nightly-arm64-2025-02-06-191241"
+    "base": "4.18.0-0.nightly-arm64-2025-02-09-091710"
   },
   "images": {
     "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cff936abaaf77fcae90d16563afaffa5fabed681ff6a84cd0d07cd753f23483e",
diff --git a/assets/optional/multus/release-multus-x86_64.json b/assets/optional/multus/release-multus-x86_64.json
@@ -1,6 +1,6 @@
 {
   "release": {
-    "base": "4.18.0-0.nightly-2025-02-06-092713"
+    "base": "4.18.0-0.nightly-2025-02-07-235831"
   },
   "images": {
     "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:098bab222712ecdbf85e748e0b676814b0e08debfdbc15127b057b63c136fcab",
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-02-06-191241"
+    "base": "4.18.0-0.nightly-arm64-2025-02-09-091710"
   },
   "images": {
     "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:77b44abd29994f5e934a1158c909eaa4a944e10c12c580fca1ff1e18b13f0427",
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-02-06-092713"
+    "base": "4.18.0-0.nightly-2025-02-07-235831"
   },
   "images": {
     "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:47b0670fa1051335fd2d2c9e8361e4ed77c7760c33a2180b136f7c7f59863ec2",
diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json
@@ -1,6 +1,6 @@
 {
   "release": {
-    "base": "4.18.0-0.nightly-arm64-2025-02-06-191241"
+    "base": "4.18.0-0.nightly-arm64-2025-02-09-091710"
   },
   "images": {
     "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0730b0c09e2f2e0a25a9b7bd65f2ecf65012465124b87ffdcbf6cd847a3ed8d0",
diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json
@@ -1,6 +1,6 @@
 {
   "release": {
-    "base": "4.18.0-0.nightly-2025-02-06-092713"
+    "base": "4.18.0-0.nightly-2025-02-07-235831"
   },
   "images": {
     "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:35512335ac39aed0f55b7f799f416f4f6445c20c1b19888cf2bb72bb276703f2",
diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt
@@ -1,35 +1,7 @@
-- cluster-csi-snapshot-controller-operator embedded-component 46902b494ed0a608a48d2a04faf6e4ed2f9a6a5b to 6fe700087e8be6513285edd18f461790fecc65c3
-  - 0133119 2025-02-04T16:54:45+00:00 Support HCP labels
+- cluster-network-operator embedded-component e98cac9c69c0cdf0a08c3a6f688c11dae2ac7d93 to b48488a6ee4c9e1ae778217817266baddd5f3e51
+  - 1fcce67 2025-01-29T07:22:33+00:00 Update egressfirewall CRD to be consistent with ovn-kubernetes repo
 
-- kubernetes embedded-component 5f71ced928d02ee98ecc2a0f23f9e5b45dfa3275 to acb9630c20d2fa0d11bad4c38c7b28e2db9d818b
-  - 0c68a455f 2025-02-04T11:31:24-05:00 UPSTREAM: <carry>: Don't retry storage calls with side effects.
-  - d2d1c4138 2025-01-20T17:13:16+01:00 UPSTREAM: <drop>: hack/update-vendor.sh, make update and update image
-  - 79b096c6b 2025-01-20T17:13:16+01:00 UPSTREAM: <drop>: manually resolve conflicts
-  - af64d838a 2025-01-15T14:32:36+00:00 Release commit for Kubernetes v1.31.5
-  - c94919d68 2025-01-13T14:46:05-08:00 kubelet: use env vars in node log query PS command
-  - 774adff44 2025-01-06T15:08:09-08:00 webhook: alter regex to account for x509sha1 GODEBUG removal
-  - ec1a3974b 2025-01-02T15:01:34+02:00 kubeadm: fix a bug where the node.skipPhases in UpgradeNodeConfiguration is not respected by 'kubeadm upgrade node'
-  - eb8c23995 2024-12-30T09:13:26+01:00 Bump images, dependencies and versions to go 1.22.10 and distroless iptables
-  - b82572f6f 2024-12-20T10:03:38+03:00 Do not attempt to truncate revision history if revisionHistoryLimit is negative
-  - 1f830174c 2024-12-18T19:47:41+01:00 fetch cni plugins from GitHub releases
-  - b555e6b2a 2024-12-16T10:40:28-05:00 Fix volume expansion offline
-  - b8265e785 2024-12-12T15:59:00+01:00 prevent unnecessary resolving of iscsi/fc devices to dm
-  - fd78b5296 2024-12-10T11:57:04+00:00 Update CHANGELOG/CHANGELOG-1.31.md for v1.31.4
-  - 04f5b2038 2024-12-03T09:47:51+08:00 kubelet: Fix the volume manager did't check the device mount state in the actual state of the world before marking the volume as detached. It may cause a pod to be stuck in the Terminating state due to the above issue when it was deleted.
-
-- kubernetes image-amd64 5f71ced928d02ee98ecc2a0f23f9e5b45dfa3275 to acb9630c20d2fa0d11bad4c38c7b28e2db9d818b
-  - 0c68a455f 2025-02-04T11:31:24-05:00 UPSTREAM: <carry>: Don't retry storage calls with side effects.
-  - d2d1c4138 2025-01-20T17:13:16+01:00 UPSTREAM: <drop>: hack/update-vendor.sh, make update and update image
-  - 79b096c6b 2025-01-20T17:13:16+01:00 UPSTREAM: <drop>: manually resolve conflicts
-  - af64d838a 2025-01-15T14:32:36+00:00 Release commit for Kubernetes v1.31.5
-  - c94919d68 2025-01-13T14:46:05-08:00 kubelet: use env vars in node log query PS command
-  - 774adff44 2025-01-06T15:08:09-08:00 webhook: alter regex to account for x509sha1 GODEBUG removal
-  - ec1a3974b 2025-01-02T15:01:34+02:00 kubeadm: fix a bug where the node.skipPhases in UpgradeNodeConfiguration is not respected by 'kubeadm upgrade node'
-  - eb8c23995 2024-12-30T09:13:26+01:00 Bump images, dependencies and versions to go 1.22.10 and distroless iptables
-  - b82572f6f 2024-12-20T10:03:38+03:00 Do not attempt to truncate revision history if revisionHistoryLimit is negative
-  - 1f830174c 2024-12-18T19:47:41+01:00 fetch cni plugins from GitHub releases
-  - b555e6b2a 2024-12-16T10:40:28-05:00 Fix volume expansion offline
-  - b8265e785 2024-12-12T15:59:00+01:00 prevent unnecessary resolving of iscsi/fc devices to dm
-  - fd78b5296 2024-12-10T11:57:04+00:00 Update CHANGELOG/CHANGELOG-1.31.md for v1.31.4
-  - 04f5b2038 2024-12-03T09:47:51+08:00 kubelet: Fix the volume manager did't check the device mount state in the actual state of the world before marking the volume as detached. It may cause a pod to be stuck in the Terminating state due to the above issue when it was deleted.
+- machine-config-operator embedded-component d6090f11285d3b9a9262290f17bc3f90eb3dd8e5 to 120ba674540c81513d1a701b99c8d424dbb41887
+  - 50cbe275 2025-01-28T15:57:29+00:00 OCPBUGS-46072: create /run/nodeip-configuration before use
+  - 36e34c5d 2024-12-12T10:48:17+00:00 Update the storage.conf configuration file template
 
diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt
@@ -5,14 +5,14 @@ https://github.com/openshift/cluster-ingress-operator embedded-component 8be1749
 https://github.com/openshift/cluster-kube-apiserver-operator embedded-component a77db53429b161c62ea284b9d91f2c47fd0c525c
 https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 0fac9aa9a20b3c843e0e832a2849db6a7e3441c1
 https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 6182930dde5ec8dd22bd50481e8b369ce673484c
-https://github.com/openshift/cluster-network-operator embedded-component e98cac9c69c0cdf0a08c3a6f688c11dae2ac7d93
+https://github.com/openshift/cluster-network-operator embedded-component b48488a6ee4c9e1ae778217817266baddd5f3e51
 https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component f1711cf30f683ec0eaa187cd5168caae9e8c1254
 https://github.com/openshift/cluster-policy-controller embedded-component 5fd852525909ce6eab52972ba9ce8fcf56528eb9
 https://github.com/openshift/csi-external-snapshotter embedded-component 838d2484157f076bbb81f1b584898aec6f051c2f
 https://github.com/openshift/etcd embedded-component 914783cae63a13b90971c65e28c3349c1ecb7dfb
 https://github.com/openshift/kubernetes embedded-component acb9630c20d2fa0d11bad4c38c7b28e2db9d818b
 https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 50d17147f15d8b216e7c41f91d1bd7d307ca8c73
-https://github.com/openshift/machine-config-operator embedded-component d6090f11285d3b9a9262290f17bc3f90eb3dd8e5
+https://github.com/openshift/machine-config-operator embedded-component 120ba674540c81513d1a701b99c8d424dbb41887
 https://github.com/openshift/openshift-controller-manager embedded-component 5bfc8081a65ea3e0d23306c0398143a9987d659e
 https://github.com/openshift/operator-framework-olm embedded-component 182471a8d72ee38d2ff82ce44db6903e66c4b22b
 https://github.com/openshift/route-controller-manager embedded-component 07daee4d2f0b5c7aaca56ee45ff6dfdf97680db0
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-02-06-092713" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2025-02-06-191241"
+./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.18.0-0.nightly-2025-02-07-235831" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2025-02-09-091710"

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-OCP_VERSION := 4.18.0-0.nightly-arm64-2025-02-06-191241`
	`1`	`+OCP_VERSION := 4.18.0-0.nightly-arm64-2025-02-09-091710`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-OCP_VERSION := 4.18.0-0.nightly-2025-02-06-092713`
	`1`	`+OCP_VERSION := 4.18.0-0.nightly-2025-02-07-235831`
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-02-06-191241"`
	`3`	`+ "base": "4.18.0-0.nightly-arm64-2025-02-09-091710"`
`4`	`4`	`},`
`5`	`5`	`"images": {`
`6`	`6`	`"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cff936abaaf77fcae90d16563afaffa5fabed681ff6a84cd0d07cd753f23483e",`
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-2025-02-06-092713"`
	`3`	`+ "base": "4.18.0-0.nightly-2025-02-07-235831"`
`4`	`4`	`},`
`5`	`5`	`"images": {`
`6`	`6`	`"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:098bab222712ecdbf85e748e0b676814b0e08debfdbc15127b057b63c136fcab",`