openshift · openshift-merge-bot · Sep 26, 2024 · Sep 26, 2024 · Sep 26, 2024 · Sep 26, 2024
diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var
@@ -1 +1 @@
-OCP_VERSION := 4.18.0-0.nightly-arm64-2024-09-22-231813
+OCP_VERSION := 4.18.0-0.nightly-arm64-2024-09-25-225501
diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var
@@ -1 +1 @@
-OCP_VERSION := 4.18.0-0.nightly-2024-09-21-014704
+OCP_VERSION := 4.18.0-0.nightly-2024-09-23-182657
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-09-22-231813"
+    "base": "4.18.0-0.nightly-arm64-2024-09-25-225501"
   },
   "images": {
     "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b10e8eb8c507b1f0c630480acb9f3c82a8da74522e271a46983b50d413a20b77",

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-09-21-014704"
+    "base": "4.18.0-0.nightly-2024-09-23-182657"
   },
   "images": {
     "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c2184410d2afe1ae682931d0e213aa8743b757440379caac425833e56f831726",

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-09-22-231813"
+    "base": "4.18.0-0.nightly-arm64-2024-09-25-225501"
   },
   "images": {
     "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:849ac702ee07de4c99bed2b49be3fa661a7362798caa87771a61c7a79a55bc12",

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-09-21-014704"
+    "base": "4.18.0-0.nightly-2024-09-23-182657"
   },
   "images": {
     "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e7b325764bcf641993415676dc63eda6819880575abb48969abc1155cd5024ca",

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-09-22-231813"
+    "base": "4.18.0-0.nightly-arm64-2024-09-25-225501"
   },
   "images": {
-    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:32718ae0394b3aed96c7a5dee026630d9cefee8cc51bbd7cb6482fdb2d75b9b1",
+    "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0a8e175cac0f0229166d5e97a0c43eab60d90023a4cbf269b898d90f08111c19",
     "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a7869c9e060124b06c4486138ed1f19fc45e7cbf8a91ffa37059d8654f36ef88",
     "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5f44f25911cdf4775490eb0242185ec084f5ed70ae32969e33203bc5d284462a",
     "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bdb8a3dd3a5885a3fab5df1395cbd6097fb78a05de56c27d2cd7e20efaedbe98",
     "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:37e965c8eb06a4628bff7960654b7dfad8d603bc8c9b0d8fad91c512613e4cac",
-    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b578e46c39c31e2cbdcac294e192b500621d77599d4b08f690dd01bd4604ec60",
+    "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7a1e4aa92a3879a8cdbfb6a7d54f5db872d0c974db63f725c5d98515a5eea58e",
     "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cbc7a9e0519de2d9416c87384fc3b031f749cef398422b834dbf947edffb7896",
     "lvms_operator": "quay.io/lvms_dev/lvms4-lvms-rhel9-operator@sha256:86f0b8a3a1a699feff2d77d57b0917eaae501086b91c8ae3cbf31e5454967089",
     "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2b9ae4e6c83606ecc7bfbd0b125ff8d4089f306393d56038977caa521283c77e",

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-2024-09-21-014704"
+    "base": "4.18.0-0.nightly-2024-09-23-182657"
   },
   "images": {
     "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3edf3c693cfc79da6c1c6dda374307e3df94f7dbb9cad1c4fcc40d1419018198",

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:b578e46c39c31e2cbdcac294e192b500621d77599d4b08f690dd01bd4604ec60"
+pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7a1e4aa92a3879a8cdbfb6a7d54f5db872d0c974db63f725c5d98515a5eea58e"
 pause_image_auth_file = "/etc/crio/openshift-pull-secret"
 pause_command = "/usr/bin/pod"
diff --git a/packaging/rpm/microshift.spec b/packaging/rpm/microshift.spec
@@ -10,7 +10,7 @@
 
 # golang specifics
 # Needs to match go.mod go directive
-%global golang_version 1.20
+%global golang_version 1.22
 #debuginfo not supported with Go
 %global debug_package %{nil}
 # modifying the Go binaries breaks the DWARF debugging

diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt
@@ -1,42 +1,15 @@
-- api embedded-component 1d6161864959881b9b574d30428e574f92ea5c43 to 2669d1ebc91092ec32e77b1d3f503b11f759b855
-  - de692e9 2024-09-19T11:25:05-03:00 generated
-  - 4435e93 2024-09-19T11:07:35-03:00 move authoritative source of storage CRDs manifests to openshift/api
-  - 8abc53a 2024-09-17T17:04:36-04:00 generated
-  - 147b220 2024-09-17T17:04:35-04:00 make operator generations behave as a map list type
-  - 8f68f40 2024-09-17T16:51:35-04:00 generated
-  - 873d8c8 2024-09-17T16:51:19-04:00 copy mco crds to be managed by openshfit/api
+- cluster-ingress-operator embedded-component 871b2b20f9a3381e7ee31fda34f5821f51fff13c to b67185f557fceab56fc27d0fde5f6aca3f96e30c
+  - 8655f59 2024-08-28T10:16:47+02:00 Set required-scc dynamically for ingress
+  - f5099e4 2024-08-28T10:16:24+02:00 Set required-scc for openshift workloads
 
-- cluster-kube-apiserver-operator embedded-component 49d13e8c6a3d4543a91b0d023d5040b3b7eddf0b to 9fb047aaed45a81bf817233dde0ca09c8d38e257
-  - cbe3f11 2024-09-20T19:03:34+02:00 cleanup flag validation after they have been added to the installer
-  - 5fe57a1 2024-09-17T08:56:51-04:00 create CRDs from openshift/api
-  - a64a08c 2024-08-19T13:21:45+02:00 Revert "NO-ISSUE: Revert "certrotationcontroller: set AutoRegenerateAfterOfflineExpiry for generated certificates"
+- machine-config-operator embedded-component 2bea7cd03f26a85f9a76d6c9db7dbb8067a45ee6 to a6ee4b40c68c3d1c89748f7519886a0e27444685
+  - 4a633c80 2024-09-20T10:59:44-04:00 envtest: update CRD install location
+  - 3e29baec 2024-09-20T10:59:12-04:00 make go-deps
 
-- cluster-kube-controller-manager-operator embedded-component f4da19293909b2723f8fa6060f5cb8660070114e to a7e2a74001f3fe7e6be577b2ddef85c3d126a52c
-  - cc3e703 2024-09-17T08:57:37-04:00 create CRDs from openshift/api
+- oc image-arm64 d6387d4acdcc020925d993d896437cffbf883671 to e75d922ae2a2af65a647dd6c094be9e78d49f7d4
+  - 3f424dac 2024-09-25T16:21:13+03:00 Skip inspection of the daemonset pods running on data plane
+  - db010056 2024-09-24T17:16:21-07:00 pkg/cli/admin/upgrade/recommend: Add end-to-end output test coverage
 
-- cluster-kube-scheduler-operator embedded-component 1e9ddcfcbfef7a1bb090b11f0dc1af2a4d1c5edb to bced8cd6e60108d590dfb1f4aa80d4c718f0b3c6
-  - 206f8e7 2024-09-17T08:58:33-04:00 create CRDs from openshift/api
-
-- cluster-network-operator embedded-component d936ce382648f456461c6a4d4af63a2073664c77 to 4eec256fe4565434ccf0f4b44ee74d24c40f6850
-  - 4b45ff6 2024-09-19T15:47:13-04:00 Updates terminationGracePeriodSeconds to 30 seconds for Multus daemonset
-
-- cluster-openshift-controller-manager-operator embedded-component 2b962c71d5b3ac179898dc1ece6a98de0b33cd70 to 95bd10ad4841d72b46c58078a1e4d2559d5e2c67
-  - d44e4e4 2024-09-17T09:00:01-04:00 create CRDs from openshift/api
-
-- machine-config-operator embedded-component 702991da8c042288619870de3d21d310b1d1ebd6 to 2bea7cd03f26a85f9a76d6c9db7dbb8067a45ee6
-  - 6f583cb6 2024-09-18T15:13:04-04:00 template: remove root-ca write to disk
-  - 5db1478b 2024-09-17T16:54:25-04:00 move crd management to openshift/api to ease feature promotion
-  - acb22625 2024-09-16T12:14:25-04:00 node_controller: sync all old custom pools
-  - 450b9bba 2024-09-16T11:54:52+00:00 Set ESP offloads off in bonds if slaves don't support them
-  - 4208e55e 2024-09-16T11:27:39+00:00 Revert "Disable ESP offload in vmxnet3 including bonds"
-  - 1b03d851 2024-09-13T08:21:57-04:00 on-prem/resolv-prepender: stop leaking tmp files
-
-- oc image-amd64 4682bd8222d39d4eb71eb474030a0b6860c61e0e to d6387d4acdcc020925d993d896437cffbf883671
-  - eda1ab39 2024-09-20T13:09:39+03:00 Update root-approvers of oc
-  - a8fc369d 2024-09-18T13:42:25+03:00 Check cast result in adm prune deployments to prevent panic
-  - d1f9f1bd 2024-09-12T17:53:19-04:00 Rename rsync'd ISO file to -output-name value
-  - 01ab8579 2024-09-10T17:39:03-04:00 OCPBUGS-38450: Fix copy artifacts for all CPU architectures
-
-- oc image-arm64 95a400196419a730dd6f7d711c58a6859c0408c6 to d6387d4acdcc020925d993d896437cffbf883671
-  - eda1ab39 2024-09-20T13:09:39+03:00 Update root-approvers of oc
+- kubernetes image-arm64 ce117ff87249deb45bf9564d976255645e530105 to 947ea2f8f2a97d76a8bc9382c1ecda89fbc13555
+  - d656b56da 2024-09-24T11:26:17-04:00 UPSTREAM: 125398: Fix issue with scheduler failing on hostname mismatch
 
diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt
@@ -1,7 +1,7 @@
 https://github.com/openshift/api embedded-component 2669d1ebc91092ec32e77b1d3f503b11f759b855
 https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component 8122add3d1529f0ea8fa918b45e3d7b35d5a0388
 https://github.com/openshift/cluster-dns-operator embedded-component 208d50c1a5e0aaeb991366daa749abdffa803224
-https://github.com/openshift/cluster-ingress-operator embedded-component 871b2b20f9a3381e7ee31fda34f5821f51fff13c
+https://github.com/openshift/cluster-ingress-operator embedded-component b67185f557fceab56fc27d0fde5f6aca3f96e30c
 https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 9fb047aaed45a81bf817233dde0ca09c8d38e257
 https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component a7e2a74001f3fe7e6be577b2ddef85c3d126a52c
 https://github.com/openshift/cluster-kube-scheduler-operator embedded-component bced8cd6e60108d590dfb1f4aa80d4c718f0b3c6
@@ -12,7 +12,7 @@ https://github.com/openshift/csi-external-snapshotter embedded-component 672a0d5
 https://github.com/openshift/etcd embedded-component d3e76939ade21ec3080e53c2cf83b3aac15f5119
 https://github.com/openshift/kubernetes embedded-component ce117ff87249deb45bf9564d976255645e530105
 https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 50d17147f15d8b216e7c41f91d1bd7d307ca8c73
-https://github.com/openshift/machine-config-operator embedded-component 2bea7cd03f26a85f9a76d6c9db7dbb8067a45ee6
+https://github.com/openshift/machine-config-operator embedded-component a6ee4b40c68c3d1c89748f7519886a0e27444685
 https://github.com/openshift/openshift-controller-manager embedded-component c8b7e50875be58338892cf5ebcbc55cad822857a
 https://github.com/openshift/operator-framework-olm embedded-component 8dac17a7feed9532363be139d83c0f98200f830a
 https://github.com/openshift/route-controller-manager embedded-component 87dfd7936fc5264ad972dcbc4eb0380dc5cff0db
@@ -26,12 +26,12 @@ https://github.com/openshift/kube-rbac-proxy image-amd64 89b245aa3dd7a3417000be8
 https://github.com/openshift/ovn-kubernetes image-amd64 b70ae7f5d24c5fcd69a18399419b41468afa6cac
 https://github.com/openshift/kubernetes image-amd64 ce117ff87249deb45bf9564d976255645e530105
 https://github.com/openshift/service-ca-operator image-amd64 1f7d6472fea332fc307d9c8911f8c3cf57347755
-https://github.com/openshift/oc image-arm64 d6387d4acdcc020925d993d896437cffbf883671
+https://github.com/openshift/oc image-arm64 e75d922ae2a2af65a647dd6c094be9e78d49f7d4
 https://github.com/openshift/coredns image-arm64 cb1abfaeb7b0c5df4f0c56b0a009b439db1d0949
 https://github.com/openshift/csi-external-snapshotter image-arm64 672a0d5ea97a71afd0dfb50002319f30db2e10d7
 https://github.com/openshift/csi-external-snapshotter image-arm64 672a0d5ea97a71afd0dfb50002319f30db2e10d7
 https://github.com/openshift/router image-arm64 72114ea78be0a032d5cdddcad694e0a352a00e93
 https://github.com/openshift/kube-rbac-proxy image-arm64 89b245aa3dd7a3417000be8ad07287d8b5648872
 https://github.com/openshift/ovn-kubernetes image-arm64 b70ae7f5d24c5fcd69a18399419b41468afa6cac
-https://github.com/openshift/kubernetes image-arm64 ce117ff87249deb45bf9564d976255645e530105
+https://github.com/openshift/kubernetes image-arm64 947ea2f8f2a97d76a8bc9382c1ecda89fbc13555
 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-09-21-014704" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2024-09-22-231813"
+./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.18.0-0.nightly-2024-09-23-182657" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2024-09-25-225501"
diff --git a/scripts/devenv-builder/configure-vm.sh b/scripts/devenv-builder/configure-vm.sh
@@ -142,7 +142,7 @@ if ${INSTALL_BUILD_DEPS} || ${BUILD_AND_RUN}; then
     [[ -d /run/systemd/system ]] &&  sudo systemctl enable --now cockpit.socket
 fi
 
-GO_VER=1.21.3  # released 2023-10-10 (matches CI images)
+GO_VER=1.22.5
 GO_ARCH=$([ "$(uname -m)" == "x86_64" ] && echo "amd64" || echo "arm64")
 GO_INSTALL_DIR="/usr/local/go${GO_VER}"
 if ${INSTALL_BUILD_DEPS} && [ ! -d "${GO_INSTALL_DIR}" ]; then
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		OCP_VERSION := 4.18.0-0.nightly-arm64-2024-09-22-231813
		OCP_VERSION := 4.18.0-0.nightly-arm64-2024-09-25-225501
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		OCP_VERSION := 4.18.0-0.nightly-2024-09-21-014704
		OCP_VERSION := 4.18.0-0.nightly-2024-09-23-182657