From 1bee43e994c7c5d8b814beced1e2794aaa1b52ec Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 20 Nov 2025 04:23:03 +0000 Subject: [PATCH 1/5] update last_rebase.sh --- scripts/auto-rebase/last_rebase.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index 45d4057edc..8e74614de7 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.18.0-0.nightly-2025-11-16-173230" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2025-11-17-034615" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.18.0-0.nightly-2025-11-20-003155" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2025-11-20-022051" From 9aa7c9d4155cbefca6e8b531f302520ce2a86ffe Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 20 Nov 2025 04:23:03 +0000 Subject: [PATCH 2/5] update changelog --- scripts/auto-rebase/changelog.txt | 34 +++++++++---------------------- scripts/auto-rebase/commits.txt | 8 ++++---- 2 files changed, 14 insertions(+), 28 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index d2681dbe11..c5d1cba674 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,26 +1,12 @@ -- ovn-kubernetes image-amd64 2fe096327a6da6602c509d108ea0ed4a599a7eb3 to 9f04906c9822218d53f51b1e4311f6590eca1db8 - - 3a524b55 2025-11-07T13:27:01+01:00 Fix cleanup of LRP for deleted pods - - 6cd0f090 2025-11-07T13:27:01+01:00 Handle missing pod delete event in EIP controller - - 75f0b7e9 2025-11-07T13:27:01+01:00 EgressIP: fix failover and restart stale SNAT/LRP; ensure status sync - - 947941b7 2025-11-07T13:27:01+01:00 OVN EIP: fix printing of stale next hops value - - 7b12cc64 2025-11-07T13:27:01+01:00 OVN EIP: add UT for syncing next hops for v4/v6 - - b7d8695b 2025-11-07T13:27:01+01:00 EIP: do not skip generating potential valid next hops if LSP not found - - 87005cd4 2025-11-07T13:27:01+01:00 EIP: when checking for stale LRP next hops on startup, restrict to enodes - - d5490685 2025-11-07T09:07:14+00:00 Reintroduce completed pod check in shouldReleaseDeletedPod - - b170a2f2 2025-11-07T09:07:14+00:00 kubevirt: test with per-pod SNATs - - d16ed585 2025-11-07T09:07:14+00:00 kubevirt: test OVN DB after completion of source pod - - 9319b6d7 2025-11-07T09:07:14+00:00 kubevirt: fix search of colliding pods for migrated pods - - 1b1515cc 2025-11-07T09:07:14+00:00 kubevirt: prevent error log on IP release - - d077b268 2025-11-07T09:07:13+00:00 kubevirt: fix bad release of IPs of live migratable pods - - e7bf7330 2025-11-07T09:07:13+00:00 kubevirt e2e: use a value for vm nodeselector - - bc5438ca 2025-11-07T09:07:13+00:00 Fix naming of "Secondary" to be "User-Defined" +- kubernetes embedded-component 56747b62f392bf1b0da64649aa2285f6a524c435 to 337fc64fb1915348588ddee22a04fee0dc6aa083 + - cdc5d836e 2025-11-11T23:43:24+00:00 UPSTREAM: 133227: Concurrentmap Iteration -- ovn-kubernetes image-arm64 672e10d79b520bee9a715ff07d46702e56ede51b to 9f04906c9822218d53f51b1e4311f6590eca1db8 - - 3a524b55 2025-11-07T13:27:01+01:00 Fix cleanup of LRP for deleted pods - - 6cd0f090 2025-11-07T13:27:01+01:00 Handle missing pod delete event in EIP controller - - 75f0b7e9 2025-11-07T13:27:01+01:00 EgressIP: fix failover and restart stale SNAT/LRP; ensure status sync - - 947941b7 2025-11-07T13:27:01+01:00 OVN EIP: fix printing of stale next hops value - - 7b12cc64 2025-11-07T13:27:01+01:00 OVN EIP: add UT for syncing next hops for v4/v6 - - b7d8695b 2025-11-07T13:27:01+01:00 EIP: do not skip generating potential valid next hops if LSP not found - - 87005cd4 2025-11-07T13:27:01+01:00 EIP: when checking for stale LRP next hops on startup, restrict to enodes +- operator-framework-olm embedded-component f295d320d98493b70a105fa22ca79fab546a2e52 to 357bb130e6149ef87afbaadd6677ab1f71876d53 + - 1c0d5e87 2025-11-18T10:46:08+08:00 Fix TOCTOU race condition in ensureInstallPlan (#3682) + +- kubernetes image-amd64 56747b62f392bf1b0da64649aa2285f6a524c435 to 337fc64fb1915348588ddee22a04fee0dc6aa083 + - cdc5d836e 2025-11-11T23:43:24+00:00 UPSTREAM: 133227: Concurrentmap Iteration + +- kubernetes image-arm64 56747b62f392bf1b0da64649aa2285f6a524c435 to 337fc64fb1915348588ddee22a04fee0dc6aa083 + - cdc5d836e 2025-11-11T23:43:24+00:00 UPSTREAM: 133227: Concurrentmap Iteration diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index bba979ab12..06afc4bbd8 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -10,11 +10,11 @@ https://github.com/openshift/cluster-openshift-controller-manager-operator embed https://github.com/openshift/cluster-policy-controller embedded-component 5fd852525909ce6eab52972ba9ce8fcf56528eb9 https://github.com/openshift/csi-external-snapshotter embedded-component 8ddbcd381bf5317c1d1a93db3b5760681a33cb27 https://github.com/openshift/etcd embedded-component b5a4f8d079fbb04200251d5a6bc7c56f79d9d1e3 -https://github.com/openshift/kubernetes embedded-component 56747b62f392bf1b0da64649aa2285f6a524c435 +https://github.com/openshift/kubernetes embedded-component 337fc64fb1915348588ddee22a04fee0dc6aa083 https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component c0f1886ab08d8c2ed84c9ea648b3f65cd82dc5f5 https://github.com/openshift/machine-config-operator embedded-component bb2aa85171d93b2df952ed802a8cb200164e666f https://github.com/openshift/openshift-controller-manager embedded-component 8ee744063ed12b249f1a2b89e9af4f53b2f1daf7 -https://github.com/openshift/operator-framework-olm embedded-component f295d320d98493b70a105fa22ca79fab546a2e52 +https://github.com/openshift/operator-framework-olm embedded-component 357bb130e6149ef87afbaadd6677ab1f71876d53 https://github.com/openshift/route-controller-manager embedded-component ce6ffa24dac3a5f49f70818e1159e40eaf27a6a3 https://github.com/openshift/service-ca-operator embedded-component 30efb529a5b7db5d6f352f6ac0470d8385268539 https://github.com/openshift/oc image-amd64 03e97ec079064c4f451b15510622caac316fb517 @@ -23,7 +23,7 @@ https://github.com/openshift/csi-external-snapshotter image-amd64 8ddbcd381bf531 https://github.com/openshift/router image-amd64 d8058949aaf91dcdea050c58e6a34ef5f6670c67 https://github.com/openshift/kube-rbac-proxy image-amd64 5a14ea9d338b2582c7c2a8f89f351a0c30f56371 https://github.com/openshift/ovn-kubernetes image-amd64 9f04906c9822218d53f51b1e4311f6590eca1db8 -https://github.com/openshift/kubernetes image-amd64 56747b62f392bf1b0da64649aa2285f6a524c435 +https://github.com/openshift/kubernetes image-amd64 337fc64fb1915348588ddee22a04fee0dc6aa083 https://github.com/openshift/service-ca-operator image-amd64 30efb529a5b7db5d6f352f6ac0470d8385268539 https://github.com/openshift/oc image-arm64 03e97ec079064c4f451b15510622caac316fb517 https://github.com/openshift/coredns image-arm64 8ca7f02b8becb40f7a9919243000e2620d7036d4 @@ -31,5 +31,5 @@ https://github.com/openshift/csi-external-snapshotter image-arm64 8ddbcd381bf531 https://github.com/openshift/router image-arm64 d8058949aaf91dcdea050c58e6a34ef5f6670c67 https://github.com/openshift/kube-rbac-proxy image-arm64 5a14ea9d338b2582c7c2a8f89f351a0c30f56371 https://github.com/openshift/ovn-kubernetes image-arm64 9f04906c9822218d53f51b1e4311f6590eca1db8 -https://github.com/openshift/kubernetes image-arm64 56747b62f392bf1b0da64649aa2285f6a524c435 +https://github.com/openshift/kubernetes image-arm64 337fc64fb1915348588ddee22a04fee0dc6aa083 https://github.com/openshift/service-ca-operator image-arm64 30efb529a5b7db5d6f352f6ac0470d8385268539 From c6ca4545f7b2b64d222e39eefae8a174d0b8f245 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 20 Nov 2025 04:25:01 +0000 Subject: [PATCH 3/5] update component images --- packaging/crio.conf.d/10-microshift_amd64.conf | 2 +- packaging/crio.conf.d/10-microshift_arm64.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packaging/crio.conf.d/10-microshift_amd64.conf b/packaging/crio.conf.d/10-microshift_amd64.conf index cb3678e015..3da2d6bd83 100644 --- a/packaging/crio.conf.d/10-microshift_amd64.conf +++ b/packaging/crio.conf.d/10-microshift_amd64.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:e1b65cd90fd93c9c33fb92080abca317c69600a6c1ff558ca6b2a6f9b0ddb8fc" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3a70b2a95140d1e90978f36cc9889013ae34bd232662c5424002274385669ed9" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" diff --git a/packaging/crio.conf.d/10-microshift_arm64.conf b/packaging/crio.conf.d/10-microshift_arm64.conf index 8fc4758891..eeb1d07c10 100644 --- 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:2c43a0b046c8fd9a9983a184f074d89c138f589afef0cccb065b4276a74c6bb4" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d19618654feeb6c65c136f084fe96536c9c9d4c85504a97b09bfa7759094a243" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" From dff599c266efe7a4261c01234f17b7b22e7c19d2 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 20 Nov 2025 04:25:03 +0000 Subject: [PATCH 4/5] update manifests --- .../optional/multus/kustomization.aarch64.yaml | 4 ++-- .../optional/multus/kustomization.x86_64.yaml | 4 ++-- .../multus/release-multus-aarch64.json | 6 +++--- .../optional/multus/release-multus-x86_64.json | 6 +++--- .../kustomization.aarch64.yaml | 10 +++++----- .../kustomization.x86_64.yaml | 10 +++++----- .../release-olm-aarch64.json | 8 ++++---- .../release-olm-x86_64.json | 8 ++++---- assets/release/release-aarch64.json | 18 +++++++++--------- assets/release/release-x86_64.json | 18 +++++++++--------- 10 files changed, 46 insertions(+), 46 deletions(-) diff --git a/assets/optional/multus/kustomization.aarch64.yaml b/assets/optional/multus/kustomization.aarch64.yaml index ac9eba4bbf..7bce1510b0 100644 --- a/assets/optional/multus/kustomization.aarch64.yaml +++ b/assets/optional/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:bff1d88506ad0725a7a9a3d3d1c99a2e8fbfb43cdb69361d96d15c3f95656b7a + digest: sha256:9fa3b31e0434b55e226ae675ffc55ff1e12c677c0cadbd6a7f23a3ad4c3964f0 - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:bbe8f451ca9c2e1562ce12aef2c0c341748617af0c387232082287f578015f36 + digest: sha256:71343fc527ac1bdd258ecb6ce376c19252b8a225015eecb98030db315452c6ec diff --git a/assets/optional/multus/kustomization.x86_64.yaml b/assets/optional/multus/kustomization.x86_64.yaml index 0f8a1cd66d..33fd000bd8 100644 --- a/assets/optional/multus/kustomization.x86_64.yaml +++ b/assets/optional/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:f84a81280262040d7ed2d1488bf8d1acad4a3715cb01d42aabd45838bb94652a + digest: sha256:e45a823c96517d642e654ff09c07f01f87a24adb900946fa1b76ede88c803b28 - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:8f78e04f538471f090b20a27c034123c54b037ec3aa80fc1263387d7926eefef + digest: sha256:b3005530b0fe7da09e408fda796a13ecd6f963671adcb70e03e98fb09130abe7 diff --git a/assets/optional/multus/release-multus-aarch64.json b/assets/optional/multus/release-multus-aarch64.json index 0f418d45e7..ca98fa3f25 100644 --- 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-11-17-034615" + "base": "4.18.0-0.nightly-arm64-2025-11-20-022051" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bff1d88506ad0725a7a9a3d3d1c99a2e8fbfb43cdb69361d96d15c3f95656b7a", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bbe8f451ca9c2e1562ce12aef2c0c341748617af0c387232082287f578015f36" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9fa3b31e0434b55e226ae675ffc55ff1e12c677c0cadbd6a7f23a3ad4c3964f0", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:71343fc527ac1bdd258ecb6ce376c19252b8a225015eecb98030db315452c6ec" } } diff --git a/assets/optional/multus/release-multus-x86_64.json b/assets/optional/multus/release-multus-x86_64.json index 9023cd23f2..7e3e80f037 100644 --- 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-16-173230" + "base": "4.18.0-0.nightly-2025-11-20-003155" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f84a81280262040d7ed2d1488bf8d1acad4a3715cb01d42aabd45838bb94652a", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8f78e04f538471f090b20a27c034123c54b037ec3aa80fc1263387d7926eefef" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e45a823c96517d642e654ff09c07f01f87a24adb900946fa1b76ede88c803b28", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b3005530b0fe7da09e408fda796a13ecd6f963671adcb70e03e98fb09130abe7" } } diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index ddc35ad8f9..2f03b1c823 100644 --- a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml +++ b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.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:47ae8e458f71f0428aeb6825a7da4e79d4f266d101692da0e49756699be0b6bc + digest: sha256:ad477ff912d907d154f348d7941a4e2dc0c0f3b4587e2f9577e8767bbb9a3584 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:3e66c28eb95ed86e8ae600ba7544a124be0a45791c82608874b3067cbaeb002f + digest: sha256:0b45d519d40fcd2c1ec86651a822ff040e4759928f2254580e0b44c087237d7f - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:9c8e7978111c637ef37e65ce7a30c8b8a51a6c3c64a40f7dbb79bdb3bd8a8a8e + digest: sha256:a90011b0d0983495d4e749224ba056cae16a459fe01b28aba165d9a4c0ab093b 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:3e66c28eb95ed86e8ae600ba7544a124be0a45791c82608874b3067cbaeb002f + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0b45d519d40fcd2c1ec86651a822ff040e4759928f2254580e0b44c087237d7f - 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:47ae8e458f71f0428aeb6825a7da4e79d4f266d101692da0e49756699be0b6bc + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ad477ff912d907d154f348d7941a4e2dc0c0f3b4587e2f9577e8767bbb9a3584 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 6fdd4eb93d..c1d6adf964 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:04ec5193856b3d1cac946ad7b72f4622cd634093f025803c74df4fe117c27979 + digest: sha256:f1ca78c423f43f89a0411e40393642f64e4f8df9e5f61c25e31047c4cce170f9 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:a91467ff64290addb20cc91a558f1362a5dc0b7c635eeee59a2756a99cdb2db1 + digest: sha256:01d2e67fd74086da701c39dac5b821822351cb0151f9afe72821c05df19953ad - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:d2229f54d2d6e420d34897428f617435515e687b306d1aba5b20d9ccf9910f84 + digest: sha256:c69ffd8f8dcceedc2d6eb306cea33f8beabc1be1308cd5f4ee8b9a8e3eab9843 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:a91467ff64290addb20cc91a558f1362a5dc0b7c635eeee59a2756a99cdb2db1 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:01d2e67fd74086da701c39dac5b821822351cb0151f9afe72821c05df19953ad - 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:04ec5193856b3d1cac946ad7b72f4622cd634093f025803c74df4fe117c27979 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f1ca78c423f43f89a0411e40393642f64e4f8df9e5f61c25e31047c4cce170f9 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 607abe7a11..346e755a9a 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-aarch64.json @@ -1,10 +1,10 @@ { "release": { - "base": "4.18.0-0.nightly-arm64-2025-11-17-034615" + "base": "4.18.0-0.nightly-arm64-2025-11-20-022051" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:47ae8e458f71f0428aeb6825a7da4e79d4f266d101692da0e49756699be0b6bc", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3e66c28eb95ed86e8ae600ba7544a124be0a45791c82608874b3067cbaeb002f", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9c8e7978111c637ef37e65ce7a30c8b8a51a6c3c64a40f7dbb79bdb3bd8a8a8e" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ad477ff912d907d154f348d7941a4e2dc0c0f3b4587e2f9577e8767bbb9a3584", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0b45d519d40fcd2c1ec86651a822ff040e4759928f2254580e0b44c087237d7f", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a90011b0d0983495d4e749224ba056cae16a459fe01b28aba165d9a4c0ab093b" } } 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 fa35ffda06..86b8b3e479 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.18.0-0.nightly-2025-11-16-173230" + "base": "4.18.0-0.nightly-2025-11-20-003155" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:04ec5193856b3d1cac946ad7b72f4622cd634093f025803c74df4fe117c27979", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a91467ff64290addb20cc91a558f1362a5dc0b7c635eeee59a2756a99cdb2db1", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d2229f54d2d6e420d34897428f617435515e687b306d1aba5b20d9ccf9910f84" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f1ca78c423f43f89a0411e40393642f64e4f8df9e5f61c25e31047c4cce170f9", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:01d2e67fd74086da701c39dac5b821822351cb0151f9afe72821c05df19953ad", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c69ffd8f8dcceedc2d6eb306cea33f8beabc1be1308cd5f4ee8b9a8e3eab9843" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index 1206cb18ab..b0bc2dc628 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,16 +1,16 @@ { "release": { - "base": "4.18.0-0.nightly-arm64-2025-11-17-034615" + "base": "4.18.0-0.nightly-arm64-2025-11-20-022051" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:71373a48ab92d470b648181921c973600a6d37ce083efa748d5e8948e61c1c76", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2e0fb8891d7767965af7a2222502da0115a6ed8f7d04b4ccfd0e8bdce57756e6", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:00f3ed1892402ceebeff8deb6bec55d4ae96ac3086975b9a1f098348b5cc0aa4", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9c8e7978111c637ef37e65ce7a30c8b8a51a6c3c64a40f7dbb79bdb3bd8a8a8e", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d505d7e39254793585f06de2b4eda9b09fde2767802c3b60d3c7f9a524e7611d", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2c43a0b046c8fd9a9983a184f074d89c138f589afef0cccb065b4276a74c6bb4", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e618cbb7d6e63b673e86c79edd8ea803e8d22a9f2693643cb41bfb49eebd13a5", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f081c282bf71700dec746dd3ed5e46e423c8c096d6b57c1c714c306b413a1caa", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b062f954968d758a77a2ee1280662842bdf5661a08c6667e68be23943c2ab478", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ea5481d4852720d7aa3815ef59493f76eceff470c08e44de531d8d6247f1b018", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a90011b0d0983495d4e749224ba056cae16a459fe01b28aba165d9a4c0ab093b", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0db012bf77534a566ce4d950c60cd8589fabc9cc85456ccc83ef31aaaf6a12f3", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d19618654feeb6c65c136f084fe96536c9c9d4c85504a97b09bfa7759094a243", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:31fd6af2009f13c03bef414bcb1a660808e109ad26d9750bb28060ab1bca110f", "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:dc4f9b579da4e79cef4173666406b31f26b05fb7d5b38de8d81a11ed6c4399ca" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:150c7281cf8d2d4fdee2610d6503b8d7ba803047ef17a32f3fbac61b6b764985" } } diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index dd73fa7fe2..e793b38703 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,16 +1,16 @@ { "release": { - "base": "4.18.0-0.nightly-2025-11-16-173230" + "base": "4.18.0-0.nightly-2025-11-20-003155" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d55c73a9ace595315097b04b4bb80c26b6afb12cf113dd647637aecf3d2e6d34", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e721be4cd8270830dd7fdc0614356c94a59c5a6037cf8e1badb44ed7e292c2ee", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a2537767e8847ccdd35461140683d0f34021480e1328c1444832869a4994d13a", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d2229f54d2d6e420d34897428f617435515e687b306d1aba5b20d9ccf9910f84", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8e0fd0aa5adf172a4d743c94f3436effdf66b1cc4917a109ab1e18e8513b5ecd", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e1b65cd90fd93c9c33fb92080abca317c69600a6c1ff558ca6b2a6f9b0ddb8fc", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c07fd44281485e200221dc9d03f79a046d8692e040c3855af8efaca264e096d4", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:79f99fd6cce984287932edf0d009660bb488d663081f3d62ec3b23bc8bfbf6c2", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:eb928c13a46d3fb45f4a881892d023a92d610a5430be0ffd916aaf8da8e7d297", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2b3d313c599852b3543ee5c3a62691bd2d1bbad12c2e1c610cd71a1dec6eea32", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c69ffd8f8dcceedc2d6eb306cea33f8beabc1be1308cd5f4ee8b9a8e3eab9843", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:22fd46c2a781b93b6d6b8ffea9d73020e0d16a573aa6bbb807b98a6c4a629f08", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3a70b2a95140d1e90978f36cc9889013ae34bd232662c5424002274385669ed9", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8139ed65c0a0a4b0f253b715c11cc52be027efe8a4774da9ccce35c78ef439da", "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:b8ecfcfbfd5cec00c8228e38eb2160750f4fd1446a8e17ea494a7105b3b08ab2" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d3ce2cbf1032ad0f24f204db73687002fcf302e86ebde3945801c74351b64576" } } From 632bcc4742233f6b8e86142298cf5b9567634579 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Thu, 20 Nov 2025 04:25:03 +0000 Subject: [PATCH 5/5] update buildfiles --- Makefile.kube_git.var | 2 +- Makefile.version.aarch64.var | 2 +- Makefile.version.x86_64.var | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Makefile.kube_git.var b/Makefile.kube_git.var index ae9a4c7114..ad9e6d2338 100644 --- a/Makefile.kube_git.var +++ b/Makefile.kube_git.var @@ -1,5 +1,5 @@ KUBE_GIT_MAJOR=1 KUBE_GIT_MINOR=31 KUBE_GIT_VERSION=v1.31.13 -KUBE_GIT_COMMIT=56747b62f392bf1b0da64649aa2285f6a524c435 +KUBE_GIT_COMMIT=337fc64fb1915348588ddee22a04fee0dc6aa083 KUBE_GIT_TREE_STATE=clean diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index c930a524c9..854534b79e 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.18.0-0.nightly-arm64-2025-11-17-034615 +OCP_VERSION := 4.18.0-0.nightly-arm64-2025-11-20-022051 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 0b5aca1225..4f3b5568c3 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.18.0-0.nightly-2025-11-16-173230 +OCP_VERSION := 4.18.0-0.nightly-2025-11-20-003155