NO-ISSUE: rebase-main-4.18.0-0.nightly-2024-10-15-032107_amd64-2024-10-15_arm64-2024-10-15 (#4067)

microshift-rebase-script[bot] · ci-robot · web-flow · commit 3656c5df1d5c · 2024-10-16T17:18:22.000Z
* update last_rebase.sh

* update changelog

* update component images

* 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-2024-10-14-175031
+OCP_VERSION := 4.18.0-0.nightly-arm64-2024-10-15-235031
diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var
@@ -1 +1 @@
-OCP_VERSION := 4.18.0-0.nightly-2024-10-14-110402
+OCP_VERSION := 4.18.0-0.nightly-2024-10-15-032107
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-2024-10-14-175031"
+    "base": "4.18.0-0.nightly-arm64-2024-10-15-235031"
   },
   "images": {
     "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7e2fabcf0945cac73b5014742877075284b51a08096d6dec636e027303278902",
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-2024-10-14-110402"
+    "base": "4.18.0-0.nightly-2024-10-15-032107"
   },
   "images": {
     "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f66a006dd3dfc4499328b4571998796eafff75a5fd33e7f347fc3b81b2244bef",
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-2024-10-14-175031"
+    "base": "4.18.0-0.nightly-arm64-2024-10-15-235031"
   },
   "images": {
     "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3e627d61c73df96c0479c6165764a151fbb6ad369c0ea56cc6553972ce97e650",
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-2024-10-14-110402"
+    "base": "4.18.0-0.nightly-2024-10-15-032107"
   },
   "images": {
     "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:becadbe4a2ed96467cade6ffcb36e02feaeb0ad3d391c6a157fc020bd14c0e0f",
diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json
@@ -1,14 +1,14 @@
 {
   "release": {
-    "base": "4.18.0-0.nightly-arm64-2024-10-14-175031"
+    "base": "4.18.0-0.nightly-arm64-2024-10-15-235031"
   },
   "images": {
-    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:05be8691b2292e1d99ab794557574b65d887bcaf11c7bc510bb2d1c1a8cf45f6",
+    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:32b7326b194abbbf92d65631929e027e01d2484f33f4fb0151cd6a502ba2f0b2",
     "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d4224b963091460e7943cb70e4abc0e09aeeccf500ff43052f13619231d5ecc7",
     "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4cced5765b1ace977a6143e59dba7d5c8ef17c31d71e82693fa0f9e693727ec6",
     "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:848c917be4d44b6f2e42d768011a98cd8faf8b058beb7320869123d285985aa6",
     "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c30f8019f0541f457f1a91140268c1f67d65c90edb5522ae552ddbc79384c6de",
-    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e4bb71b1a5145adb15d77ceaaec30b56916c118d5995a9c8c02fed9a56376d88",
+    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2aabc01a4353a74afd7b7c23582521e8587f9fd6240cee606d5ddb20c2e1cca3",
     "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:38ae2279c08031ced8f5b614cdc14fb5cbd09abb50a18e760ebdc43e0e92d184",
     "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e",
     "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8299171653497dad460708e9c7a3840e08f0fe6de0912ae452b6937c65bc43df",
diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json
@@ -1,9 +1,9 @@
 {
   "release": {
-    "base": "4.18.0-0.nightly-2024-10-14-110402"
+    "base": "4.18.0-0.nightly-2024-10-15-032107"
   },
   "images": {
-    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:eb6edf5277baf7e570fa5677aa44946e7f88c3560173d92ab6d7ad9e7adac97b",
+    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bef1327c5b80d5f68bdaec793cb2ed0bdf6a9b6bec3cf52ab111b9a11ad4fc70",
     "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6f083b48c19a38f4e4cdb501c89995ffb2b4753427f23030ac2b9e7d507137a0",
     "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:75243fed0ab2ca524f667ea202768655f11e4698dfb27dd77f52407988825879",
     "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:746bbe7e17997e6c877486882ae399750d0cda0ef653141ba77692f07f4bc647",
diff --git a/packaging/crio.conf.d/10-microshift_arm64.conf b/packaging/crio.conf.d/10-microshift_arm64.conf
@@ -25,6 +25,6 @@ plugin_dirs = [
 # 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:e4bb71b1a5145adb15d77ceaaec30b56916c118d5995a9c8c02fed9a56376d88"
+pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2aabc01a4353a74afd7b7c23582521e8587f9fd6240cee606d5ddb20c2e1cca3"
 pause_image_auth_file = "/etc/crio/openshift-pull-secret"
 pause_command = "/usr/bin/pod"
diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt
@@ -0,0 +1,11 @@
+- oc image-amd64 3692450b96d57ae3870e5f693e833a0701d0e2b0 to f1d465eaae8e4a3facc0a51b5190ff6047dad4a0
+  - 39d7603f 2024-10-14T13:02:35+03:00 Remove redundant defaulting message in description
+
+- oc image-arm64 3692450b96d57ae3870e5f693e833a0701d0e2b0 to 2f7484ac8ab99e3915df8cffda21a8d4b3205195
+  - 2f858b85 2024-10-15T10:58:38+03:00 Do not allow new line in user in create user
+  - 39d7603f 2024-10-14T13:02:35+03:00 Remove redundant defaulting message in description
+
+- kubernetes image-arm64 8540bd493e8a42ffb61a3f470f71290488332b1c to 6c76c890616c214538d2b5d664ccfcb4f5e460bd
+  - b993f1482 2024-10-15T06:22:41-04:00 UPSTREAM: <carry>: Revert "Merge pull request #2067 from sanchezl/decprecated"
+  - 205c34a6a 2024-10-03T12:31:49-04:00 UPSTREAM: <carry>: log only deprecated api requests
+
diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt
@@ -17,7 +17,7 @@ https://github.com/openshift/openshift-controller-manager embedded-component 528
 https://github.com/openshift/operator-framework-olm embedded-component 5e2c73b7663d0122c9dc3e59ea39e515a31e2719
 https://github.com/openshift/route-controller-manager embedded-component 87dfd7936fc5264ad972dcbc4eb0380dc5cff0db
 https://github.com/openshift/service-ca-operator embedded-component 1f7d6472fea332fc307d9c8911f8c3cf57347755
-https://github.com/openshift/oc image-amd64 3692450b96d57ae3870e5f693e833a0701d0e2b0
+https://github.com/openshift/oc image-amd64 f1d465eaae8e4a3facc0a51b5190ff6047dad4a0
 https://github.com/openshift/coredns image-amd64 cb1abfaeb7b0c5df4f0c56b0a009b439db1d0949
 https://github.com/openshift/csi-external-snapshotter image-amd64 f52ce8b8b0799a341caf1fb864bba5d9d040a856
 https://github.com/openshift/csi-external-snapshotter image-amd64 f52ce8b8b0799a341caf1fb864bba5d9d040a856
@@ -26,12 +26,12 @@ https://github.com/openshift/kube-rbac-proxy image-amd64 526498ab32996a0f67a9653
 https://github.com/openshift/ovn-kubernetes image-amd64 e816f5899f31572c0c93dad9e241557c307a7728
 https://github.com/openshift/kubernetes image-amd64 8540bd493e8a42ffb61a3f470f71290488332b1c
 https://github.com/openshift/service-ca-operator image-amd64 1f7d6472fea332fc307d9c8911f8c3cf57347755
-https://github.com/openshift/oc image-arm64 3692450b96d57ae3870e5f693e833a0701d0e2b0
+https://github.com/openshift/oc image-arm64 2f7484ac8ab99e3915df8cffda21a8d4b3205195
 https://github.com/openshift/coredns image-arm64 cb1abfaeb7b0c5df4f0c56b0a009b439db1d0949
 https://github.com/openshift/csi-external-snapshotter image-arm64 f52ce8b8b0799a341caf1fb864bba5d9d040a856
 https://github.com/openshift/csi-external-snapshotter image-arm64 f52ce8b8b0799a341caf1fb864bba5d9d040a856
 https://github.com/openshift/router image-arm64 72114ea78be0a032d5cdddcad694e0a352a00e93
 https://github.com/openshift/kube-rbac-proxy image-arm64 526498ab32996a0f67a96530ad7173f955e3fbe2
 https://github.com/openshift/ovn-kubernetes image-arm64 e816f5899f31572c0c93dad9e241557c307a7728
-https://github.com/openshift/kubernetes image-arm64 8540bd493e8a42ffb61a3f470f71290488332b1c
+https://github.com/openshift/kubernetes image-arm64 6c76c890616c214538d2b5d664ccfcb4f5e460bd
 https://github.com/openshift/service-ca-operator image-arm64 1f7d6472fea332fc307d9c8911f8c3cf57347755
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-2024-10-14-110402" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2024-10-14-175031"
+./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.18.0-0.nightly-2024-10-15-032107" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2024-10-15-235031"

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-OCP_VERSION := 4.18.0-0.nightly-arm64-2024-10-14-175031`
	`1`	`+OCP_VERSION := 4.18.0-0.nightly-arm64-2024-10-15-235031`
Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-OCP_VERSION := 4.18.0-0.nightly-2024-10-14-110402`
	`1`	`+OCP_VERSION := 4.18.0-0.nightly-2024-10-15-032107`
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-2024-10-14-175031"`
	`3`	`+ "base": "4.18.0-0.nightly-arm64-2024-10-15-235031"`
`4`	`4`	`},`
`5`	`5`	`"images": {`
`6`	`6`	`"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7e2fabcf0945cac73b5014742877075284b51a08096d6dec636e027303278902",`
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-2024-10-14-110402"`
	`3`	`+ "base": "4.18.0-0.nightly-2024-10-15-032107"`
`4`	`4`	`},`
`5`	`5`	`"images": {`
`6`	`6`	`"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f66a006dd3dfc4499328b4571998796eafff75a5fd33e7f347fc3b81b2244bef",`