diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index 496207bda7..d16d9aae8d 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.20.0-0.nightly-arm64-2025-10-13-214108 +OCP_VERSION := 4.20.0-0.nightly-arm64-2025-10-14-170037 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index cf7af2164e..3ae4c6d6b4 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.20.0-0.nightly-2025-10-13-053645 +OCP_VERSION := 4.20.0-0.nightly-2025-10-15-110252 diff --git a/assets/components/multus/kustomization.aarch64.yaml b/assets/components/multus/kustomization.aarch64.yaml index a594f18662..c1db541808 100644 --- 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:6375ea3514cb9b7e463633db98da65838d298c2c4a699714388c91edb59d6ef0 + digest: sha256:32aefcfc97009be41a4437a64eca5f1355d7ee0b11bce2c9e20d78c183edb472 - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:07d212c3500bf92e66df584226811a15fbf636d9f36af54f7c0140e53abddc55 + digest: sha256:8149cd3b064c1524c1260cef98abe791c88594e7fd9ec5785ed70c63e771778a diff --git a/assets/components/multus/kustomization.x86_64.yaml b/assets/components/multus/kustomization.x86_64.yaml index c784875265..d17f5a5620 100644 --- 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:22915ace68592ea6d59b786665699367bdb7ea8c8e2fc39fd86f2af5cee08102 + digest: sha256:757fef12ef54ac144b4858c4107e22b9add22e21828cec3890b25923a0819ffa - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:1b450f44eaca6aa5837f603c34b90fded5f992cdffb958b9c0711196a2b6c917 + digest: sha256:ac8510356e3eddd502ca366a8823f208ecc63cef122b7159cd1af383fd84f24a diff --git a/assets/components/multus/release-multus-aarch64.json b/assets/components/multus/release-multus-aarch64.json index 1e68e39f95..f592d4810d 100644 --- a/assets/components/multus/release-multus-aarch64.json +++ b/assets/components/multus/release-multus-aarch64.json @@ -1,9 +1,9 @@ { "release": { - "base": "4.20.0-0.nightly-arm64-2025-10-13-214108" + "base": "4.20.0-0.nightly-arm64-2025-10-14-170037" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6375ea3514cb9b7e463633db98da65838d298c2c4a699714388c91edb59d6ef0", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:07d212c3500bf92e66df584226811a15fbf636d9f36af54f7c0140e53abddc55" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:32aefcfc97009be41a4437a64eca5f1355d7ee0b11bce2c9e20d78c183edb472", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8149cd3b064c1524c1260cef98abe791c88594e7fd9ec5785ed70c63e771778a" } } diff --git a/assets/components/multus/release-multus-x86_64.json b/assets/components/multus/release-multus-x86_64.json index 32f009ea34..3644c7babf 100644 --- 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.20.0-0.nightly-2025-10-13-053645" + "base": "4.20.0-0.nightly-2025-10-15-110252" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:22915ace68592ea6d59b786665699367bdb7ea8c8e2fc39fd86f2af5cee08102", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1b450f44eaca6aa5837f603c34b90fded5f992cdffb958b9c0711196a2b6c917" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:757fef12ef54ac144b4858c4107e22b9add22e21828cec3890b25923a0819ffa", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ac8510356e3eddd502ca366a8823f208ecc63cef122b7159cd1af383fd84f24a" } } diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index 64dc00d881..5077e1066b 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml @@ -2,7 +2,7 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:3561fc9fa82c632275755c20657c2b4525b1754277fae97c4d3af0e34f5235cb + digest: sha256:78b0b67adc67f8ab1b79739fe755256263ef149bd10f47cb1f70fb7fbfc33edd - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev digest: sha256:59ca72c086329786ca934d7990b29370aea16928c9e99608b48b91d2f4d6e418 @@ -21,7 +21,7 @@ patches: path: /spec/template/spec/containers/0/env/- value: name: OLM_IMAGE - value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3561fc9fa82c632275755c20657c2b4525b1754277fae97c4d3af0e34f5235cb + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:78b0b67adc67f8ab1b79739fe755256263ef149bd10f47cb1f70fb7fbfc33edd 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 index 98793b7793..5cd643b005 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml @@ -2,13 +2,13 @@ images: - name: quay.io/operator-framework/olm newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:c7a6f68215b70a9a1aee69b0ae4bd0b1c88df9910d314ae8cba4f545c1e03399 + digest: sha256:84224f2b8bc990eb992b6d352a43d6b657174a54d582717c539073eac67315a6 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:b007443a6006543955bcab2828d1c6f4305f6dde6db6fe7882aeb019661db624 + digest: sha256:cf06a6de59bd5360bf025a0efdeb144a2c37322539f1c16cd772ac267a19d961 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:78663513e989e74979ba18e972cf544727aabdda405d34a5034c57b635cb93d2 + digest: sha256:6bcf3ebb137cbf1929429d26fdc6304f5684337fd8d2612c3e12094e80cdb6cd patches: - patch: |- @@ -16,12 +16,12 @@ patches: path: /spec/template/spec/containers/0/env/- value: name: OPERATOR_REGISTRY_IMAGE - value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b007443a6006543955bcab2828d1c6f4305f6dde6db6fe7882aeb019661db624 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cf06a6de59bd5360bf025a0efdeb144a2c37322539f1c16cd772ac267a19d961 - 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:c7a6f68215b70a9a1aee69b0ae4bd0b1c88df9910d314ae8cba4f545c1e03399 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:84224f2b8bc990eb992b6d352a43d6b657174a54d582717c539073eac67315a6 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 index f2cc75f229..9e97151ec0 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json @@ -1,9 +1,9 @@ { "release": { - "base": "4.20.0-0.nightly-arm64-2025-10-13-214108" + "base": "4.20.0-0.nightly-arm64-2025-10-14-170037" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3561fc9fa82c632275755c20657c2b4525b1754277fae97c4d3af0e34f5235cb", + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:78b0b67adc67f8ab1b79739fe755256263ef149bd10f47cb1f70fb7fbfc33edd", "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:59ca72c086329786ca934d7990b29370aea16928c9e99608b48b91d2f4d6e418", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f967d3833c9b14e291341c605810da0156b9236b37b92dfdd33cca7427fb0d25" } diff --git a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json index ff60709a54..05a9d021e4 100644 --- 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.20.0-0.nightly-2025-10-13-053645" + "base": "4.20.0-0.nightly-2025-10-15-110252" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c7a6f68215b70a9a1aee69b0ae4bd0b1c88df9910d314ae8cba4f545c1e03399", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b007443a6006543955bcab2828d1c6f4305f6dde6db6fe7882aeb019661db624", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:78663513e989e74979ba18e972cf544727aabdda405d34a5034c57b635cb93d2" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:84224f2b8bc990eb992b6d352a43d6b657174a54d582717c539073eac67315a6", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cf06a6de59bd5360bf025a0efdeb144a2c37322539f1c16cd772ac267a19d961", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6bcf3ebb137cbf1929429d26fdc6304f5684337fd8d2612c3e12094e80cdb6cd" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 3818f9ed29..621c7342c8 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,15 +1,15 @@ { "release": { - "base": "4.20.0-0.nightly-arm64-2025-10-13-214108" + "base": "4.20.0-0.nightly-arm64-2025-10-14-170037" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bdcda80f900bd95f0560fba9d345d4f358ff008806aab3d9d0c2f95565d590f7", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ce5f3be7e65240837789d0673ed0757ce61b053222a47ccafe3be43affa9637b", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7274f8c56944e57da32e359cd91df90beed101ce1bcb2cd8cc589ee446dcb511", "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bfdff18e1f99f78c0fa16e3fe0f40f3b2b32a53682ea5d1a31f201c5b9505911", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f967d3833c9b14e291341c605810da0156b9236b37b92dfdd33cca7427fb0d25", "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:487d5c9511d76dd2b60b4fcb67ebd6756a3db6412371fca0e50d6ab4051d8cba", "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7a876c1728e366824afe90f53a7ed77907ac7b8b9d5edf23a2b2a0800d813466", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:306755a521d1eb24f33d1fcacca92f9aea08f9a45996ae885a655c794e3cd0fc", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:29dfc434ec2fa2600ec1e4ad7fa1e186c4cea3b4721a2d6db632b5c18e6068ab", "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:3766640b19c336b443619ecdb35f36b479c79ea71b21de97febf024a5eaf6c84", "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:89a00f1e969b9bc53a0d41b384add1f8b96ffaf041809b6f6abc7a94023d0c68" } diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 05fbc04a0a..c5e7f642c6 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,16 +1,16 @@ { "release": { - "base": "4.20.0-0.nightly-2025-10-13-053645" + "base": "4.20.0-0.nightly-2025-10-15-110252" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:214fdc2298dac84cfe2247c4482cc3da25f6154e737e7f2893a43bc6e0ecd62a", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1b0f64aad825771bf6d99eb63ee11ac2a17e6b2f059128ae1b18954350b542b3", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:66123bdafdec00558bd82952c101a67b2cdfef3c3919f5d409a2e5e4ad9fc3cb", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:78663513e989e74979ba18e972cf544727aabdda405d34a5034c57b635cb93d2", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d7b9855395473451d0b1ba0711a9c1315ed9f8f07447f956346a1a3dd5580217", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cd578304e157c0c4cb38eb99038c4e144cc11efa1ef429d756f0f741b7a8dddd", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cc76785da7d0ee7355be720b065f6c3a363e99450c38e22f8a4f65b333f646f6", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f5c7734ba9419b294a850450aa753eb051d67d611f0b7d1077a885bc8d68ef76", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6bcf3ebb137cbf1929429d26fdc6304f5684337fd8d2612c3e12094e80cdb6cd", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ed36ae9574134fb544a44fbc058ba6fe215f1f5b837bc7f8cd6b9ba5d5ceb1b1", "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f1c31b954bb789d9a913c113bf79b10bff8801d1095ea4a8d5b358340ba5e6db", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6ce1e7406f0fde4570f1522268f5b88abd0349986db635f1842b1b300c7542a3", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:658d75cf478b8abf317574b33b4a0a9905f22d8fb607e5310e90d3574bec60f8", "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:58804d8baf922927b66cec9424d431a3bdb341d207024ce40cc8f0123bac03ee", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:44bd4dc6513346d10a07dad3924c179b90a96c52014d0c6c58d4af06cdbca8b8" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fce22854563ab7a304b057eaa209a64cc95faa8fc2aac7b9fed62d0f90d4faeb" } } diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index 1383279537..e585f0d46c 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,18 +1,3 @@ -- cluster-network-operator embedded-component 222905435d8186385608b8bdb864e2a5c73406e0 to e59626d01b36b15380d528d37396e66995fa001d - - 303f1e7 2025-09-29T12:32:23+01:00 Add drop flows for GARPs - -- machine-config-operator embedded-component 9f4ddbde3733d8fd48e2f10259bb0e998b491113 to 8d409e0fb33ac40d95f0d6e436edfc144e29cd82 - - 567a191e 2025-09-30T03:30:00+00:00 Networking: reset ovn-remote config and allow ovnkube controller to set it - -- ovn-kubernetes image-amd64 92bb5ee88ec3fa492d2dde06357baae9a6ccc822 to 84cdb994dc894b557f800d74766da0455f87a193 - - a4776fb3 2025-10-08T12:49:44+01:00 [IC][EIP] OCPBUGS-42303: Fix race between SB DB and OVN-Controller - - a7869b2c 2025-09-29T12:16:43+01:00 Node controller shutdown: do not ref gateway if not set - - 50a94e1e 2025-09-29T12:16:01+01:00 ovn-controller: block GARP during startup - - d65ec5c8 2025-09-29T12:15:22+01:00 Fix ovnkube-controller-with-node shutdown sequence - -- ovn-kubernetes image-arm64 92bb5ee88ec3fa492d2dde06357baae9a6ccc822 to 84cdb994dc894b557f800d74766da0455f87a193 - - a4776fb3 2025-10-08T12:49:44+01:00 [IC][EIP] OCPBUGS-42303: Fix race between SB DB and OVN-Controller - - a7869b2c 2025-09-29T12:16:43+01:00 Node controller shutdown: do not ref gateway if not set - - 50a94e1e 2025-09-29T12:16:01+01:00 ovn-controller: block GARP during startup - - d65ec5c8 2025-09-29T12:15:22+01:00 Fix ovnkube-controller-with-node shutdown sequence +- cluster-network-operator embedded-component e59626d01b36b15380d528d37396e66995fa001d to b0393aa3e67302d89e91b8f7b1013b6d2e317f04 + - 8f8b8e2 2025-10-02T16:02:20+00:00 Tweak iptables-alerter to try to avoid crictl bug diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 91cb5acad2..ca8d16f3f2 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -5,7 +5,7 @@ https://github.com/openshift/cluster-ingress-operator embedded-component 2371120 https://github.com/openshift/cluster-kube-apiserver-operator embedded-component cae310f190fccb3f0fa613de50c484afb039c098 https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 5a7da72ce2d21fc0900b428334865d97f39f6037 https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 58cbd296eecc61c0871739588ae65af9c05e87a6 -https://github.com/openshift/cluster-network-operator embedded-component e59626d01b36b15380d528d37396e66995fa001d +https://github.com/openshift/cluster-network-operator embedded-component b0393aa3e67302d89e91b8f7b1013b6d2e317f04 https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component aa455c043152123595c2b4f72e02279aad9dd48a https://github.com/openshift/cluster-policy-controller embedded-component 47c783103216aa5e1242632127a5d8f98b8b7455 https://github.com/openshift/csi-external-snapshotter embedded-component 42604822c25eb2aa0ecb017c24e328221b238eb9 diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index aa64846570..59517172b1 100755 --- 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.20.0-0.nightly-2025-10-13-053645" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.20.0-0.nightly-arm64-2025-10-13-214108" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.20.0-0.nightly-2025-10-15-110252" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.20.0-0.nightly-arm64-2025-10-14-170037"