diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index 95ec7b5d70..e236f90b96 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.22.0-0.nightly-arm64-2026-05-21-035130 +OCP_VERSION := 4.22.0-0.nightly-arm64-2026-05-25-031550 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index c347bc6010..a9c13be628 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.22.0-0.nightly-2026-05-20-180739 +OCP_VERSION := 4.22.0-0.nightly-2026-05-24-183203 diff --git a/assets/components/multus/kustomization.aarch64.yaml b/assets/components/multus/kustomization.aarch64.yaml index 57222e79e1..b79c845f6b 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:655a9d04510059e5a465b9c38875eccd27dd26cfb9ef8bcecd3c4966fe071798 + digest: sha256:c9c22af7518b9eb10a194ab512b1bd8e64bc7037e2fbc7937904a267006aaf35 - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:dcc63a76c1b6e7dcd575e3caba9d3a640485c551b4fc21f291a9ba53e96b0bb6 + digest: sha256:e623b026398c0b1f4d1444c0df226af9fd24fe6ea1767faed3f209ff38b3ca38 diff --git a/assets/components/multus/kustomization.x86_64.yaml b/assets/components/multus/kustomization.x86_64.yaml index 0f6ec7e882..9276202724 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:748798f55aed433eef0e451283359084fa1e74adf11cd4d89ee1403774f8fdd3 + digest: sha256:180f0ea11339d6aacfc67a58100c55c2bf522eef902b7a6e72f331c72b82a463 - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:3a8acf3de0289a32423b00c259f436684cf06f83e7d933a31857129f507122de + digest: sha256:5d954d7c3e2b610b84d2541448b5585d2283e96d2578a5419b273de7b4e48c98 diff --git a/assets/components/multus/release-multus-aarch64.json b/assets/components/multus/release-multus-aarch64.json index 115ec2ab2c..f0fbf01e7b 100644 --- a/assets/components/multus/release-multus-aarch64.json +++ b/assets/components/multus/release-multus-aarch64.json @@ -1,9 +1,9 @@ { "release": { - "base": "4.22.0-0.nightly-arm64-2026-05-21-035130" + "base": "4.22.0-0.nightly-arm64-2026-05-25-031550" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:655a9d04510059e5a465b9c38875eccd27dd26cfb9ef8bcecd3c4966fe071798", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dcc63a76c1b6e7dcd575e3caba9d3a640485c551b4fc21f291a9ba53e96b0bb6" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c9c22af7518b9eb10a194ab512b1bd8e64bc7037e2fbc7937904a267006aaf35", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e623b026398c0b1f4d1444c0df226af9fd24fe6ea1767faed3f209ff38b3ca38" } } diff --git a/assets/components/multus/release-multus-x86_64.json b/assets/components/multus/release-multus-x86_64.json index 19f6bbaf63..32836dd5f3 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.22.0-0.nightly-2026-05-20-180739" + "base": "4.22.0-0.nightly-2026-05-24-183203" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:748798f55aed433eef0e451283359084fa1e74adf11cd4d89ee1403774f8fdd3", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3a8acf3de0289a32423b00c259f436684cf06f83e7d933a31857129f507122de" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:180f0ea11339d6aacfc67a58100c55c2bf522eef902b7a6e72f331c72b82a463", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5d954d7c3e2b610b84d2541448b5585d2283e96d2578a5419b273de7b4e48c98" } } diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index 64091f0b5e..4cd836a9e0 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:197e653ef871c5df107f7899a64b0575bd33537d053f77ed062679c208d53835 + digest: sha256:33c1a7ca2342f7f593e74b18b213b4624870902837db8be00bce9485a7ccff68 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:40e33761feee5b7e735ad13e6f474b01f0550ee49b79369484cafa38b227ef29 + digest: sha256:556158e6d73d2ee71073681d0806a8e24276d656fe903975204f4c6eb463fcf7 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:86c4a72a60ae74d80c28edb895cfabd44117651c748acd374125d0e93b2c0be3 + digest: sha256:1884f7bdca95087a009e7d7ab02cef2a15bd89dc8b281451279d513c46cecc4a 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:40e33761feee5b7e735ad13e6f474b01f0550ee49b79369484cafa38b227ef29 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:556158e6d73d2ee71073681d0806a8e24276d656fe903975204f4c6eb463fcf7 - 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:197e653ef871c5df107f7899a64b0575bd33537d053f77ed062679c208d53835 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:33c1a7ca2342f7f593e74b18b213b4624870902837db8be00bce9485a7ccff68 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 caa1ae4722..10768818e7 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:524b90fabbab585fab59f637700ab445ee08640aee67d714ae1fb2783af2cb3d + digest: sha256:e1b7d61ea83cfc159a595ac1d130a6d326fbc791bafbe95f7a084ff45203f6e4 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:38163ba23e846b6710480ba348e415d47082b5cd4880926e024c21e30f903eb9 + digest: sha256:c0ddded229f7ba22c5094f157297b2c8825cbcd41d9e28809e5b0f73950bff17 - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:76f1ea773c20eeb9d3e07f98f522854c573c4f285193d643e904fedf0f766614 + digest: sha256:482b260c9ed6b71530baafcaaed97e0b766a5ff9a03442ac12b60efe36a442b6 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:38163ba23e846b6710480ba348e415d47082b5cd4880926e024c21e30f903eb9 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c0ddded229f7ba22c5094f157297b2c8825cbcd41d9e28809e5b0f73950bff17 - 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:524b90fabbab585fab59f637700ab445ee08640aee67d714ae1fb2783af2cb3d + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e1b7d61ea83cfc159a595ac1d130a6d326fbc791bafbe95f7a084ff45203f6e4 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 6c70a61c08..64a5e8c14e 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.22.0-0.nightly-arm64-2026-05-21-035130" + "base": "4.22.0-0.nightly-arm64-2026-05-25-031550" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:197e653ef871c5df107f7899a64b0575bd33537d053f77ed062679c208d53835", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:40e33761feee5b7e735ad13e6f474b01f0550ee49b79369484cafa38b227ef29", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:86c4a72a60ae74d80c28edb895cfabd44117651c748acd374125d0e93b2c0be3" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:33c1a7ca2342f7f593e74b18b213b4624870902837db8be00bce9485a7ccff68", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:556158e6d73d2ee71073681d0806a8e24276d656fe903975204f4c6eb463fcf7", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1884f7bdca95087a009e7d7ab02cef2a15bd89dc8b281451279d513c46cecc4a" } } 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 cd3061474f..e0c17a823a 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.22.0-0.nightly-2026-05-20-180739" + "base": "4.22.0-0.nightly-2026-05-24-183203" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:524b90fabbab585fab59f637700ab445ee08640aee67d714ae1fb2783af2cb3d", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:38163ba23e846b6710480ba348e415d47082b5cd4880926e024c21e30f903eb9", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:76f1ea773c20eeb9d3e07f98f522854c573c4f285193d643e904fedf0f766614" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e1b7d61ea83cfc159a595ac1d130a6d326fbc791bafbe95f7a084ff45203f6e4", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c0ddded229f7ba22c5094f157297b2c8825cbcd41d9e28809e5b0f73950bff17", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:482b260c9ed6b71530baafcaaed97e0b766a5ff9a03442ac12b60efe36a442b6" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index a1c1e254c1..7a4d62f4ce 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,16 +1,16 @@ { "release": { - "base": "4.22.0-0.nightly-arm64-2026-05-21-035130" + "base": "4.22.0-0.nightly-arm64-2026-05-25-031550" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:88b77851bd769ebeecc9eaa52168e8f995002dcac011e16dfb2c18a44c1c92bc", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a53efb1d535e69b0be02c3e72647f2f0adcd4ca361290b3ff6bf5cb84c50f88a", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:801571bf622c46e7f315058626ad1ed7153ce7831a15af1dfab82182632676c1", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:86c4a72a60ae74d80c28edb895cfabd44117651c748acd374125d0e93b2c0be3", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7c0b4d1b5ca0667af3982ccf71218286269d397d7de057447a6f0dcab3916d89", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:74712d259a97e6fb9b4f6d3a0e2ea527ea4c5220c2aeee041731a2a488a5eeba", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7875d0cf39f98270d43e695543ee3dbef58872aaa3bf093f9298c1c996124c0d", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1884f7bdca95087a009e7d7ab02cef2a15bd89dc8b281451279d513c46cecc4a", "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:06af8f6b747e394abec436df73fd480c54a65693d059ed12bb03086bb0c84a58", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:97fc9f85f802dd45328993be759c4cdd789501f6155148548fa59f82f96be546", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:26433f4cfecf9326065b03d3380aa3d48b021f0a6ae7ec8ef415f33b149a191b", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7fd796a7486816636d1f9155852b36eb32638fdef8d07d956a89bdcd42b2f1fe", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f9d7dd88dfd18057e7fd5cf7c5c61d944f6b77c9beaf290cb63dc14f31d9fb90", "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:e77365e44676fbd8ab9e4ce53f3a406856bbdfef3467c545a7df1197d84477af", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4fd98cb615f652b39deac6dd8eac8b7afdcaf4028dd42aef9c7888cd937957a3" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4e9580276c84bf6ed31c2733e9795ebeb0fdc491214b28b5484443117004b856" } } diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 43fc053d18..fe35894527 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,16 +1,16 @@ { "release": { - "base": "4.22.0-0.nightly-2026-05-20-180739" + "base": "4.22.0-0.nightly-2026-05-24-183203" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:570e8cf68b924824188ac24a813c85b845d826d0b84989edfbceb14d78887608", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fe34e9913e706628339661990a789c44a70eb2c35dc5ad0c1eb1f9c6c74c3286", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:06458beb6ba34213c83f5c66fab748b647bbafc9930ce0e322d0e5a1da3867f0", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:76f1ea773c20eeb9d3e07f98f522854c573c4f285193d643e904fedf0f766614", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1c59b20f197f3c61b0d4c92b7aabdc73f4da325ff8ee2e0dac8cc472b9dc9d19", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:713228b559eaa92d81f50bc7373cd57f19dd9287ec59526bd6190f8f798f2744", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:978c75a63ed676b58096ab5fd30cb02a18b6a30e0b75beac07eeb4fd718f8683", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:482b260c9ed6b71530baafcaaed97e0b766a5ff9a03442ac12b60efe36a442b6", "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0bfafdd8708d19724c6ec44e84f572f507462e71ceb023433c6cf2265080b8a8", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f5958e314edca4fee07140d284af68c62fbbb4ae9379ee0504a1ea1018f04068", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1b4f6ddffd62789e06d4d3e28501ed9b794d2a4eae139944eb6590a09839b861", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:aaa7183a521d2f7e9527dd6176c0946dddd1d7db693bd7522fb42826524e87e6", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:12818ce7c45163e99b95e8739b2024364f309603f7778ed679a513781c67635d", "lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:10c9ccab4f2857d113b55e12cac29aed0dc97d5a4e29ed2e4ea0f77551ee55f8", - "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:88b5ed553911b7180f09027ce1ad5c4e5135bc969bad4c6720dc6ad967337e20" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:305536d437c8f12f056bd9fec73c554cfa15371a495827bff9e2e3cc756a4f73" } } diff --git a/packaging/crio.conf.d/10-microshift_amd64.conf b/packaging/crio.conf.d/10-microshift_amd64.conf index fc49c78a7a..4e919a3972 100644 --- a/packaging/crio.conf.d/10-microshift_amd64.conf +++ b/packaging/crio.conf.d/10-microshift_amd64.conf @@ -2,6 +2,6 @@ # 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:f5958e314edca4fee07140d284af68c62fbbb4ae9379ee0504a1ea1018f04068" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:aaa7183a521d2f7e9527dd6176c0946dddd1d7db693bd7522fb42826524e87e6" 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 2b167f1d1c..2aec77969e 100644 --- a/packaging/crio.conf.d/10-microshift_arm64.conf +++ b/packaging/crio.conf.d/10-microshift_arm64.conf @@ -2,6 +2,6 @@ # 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:97fc9f85f802dd45328993be759c4cdd789501f6155148548fa59f82f96be546" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7fd796a7486816636d1f9155852b36eb32638fdef8d07d956a89bdcd42b2f1fe" 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 index 15746fcbac..5d23045db9 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,17 +1,16 @@ -- cluster-openshift-controller-manager-operator embedded-component e1c3674198c6c1274fd3fd3c3108eb4cade4eb0a to 2d2699e4f3fabc80e402f4c090c8cf80c4517977 - - daf771d 2026-05-19T10:34:34+05:30 CNTRLPLANE-2907:e2e network policy tests - - f0d07bd 2026-05-19T10:34:26+05:30 CNTRLPLANE-2907:add dependencies for Ginkgo tests +- cluster-ingress-operator embedded-component 52c2b0465ecf1dcdcd57c010b9b15ac28f62a2ba to 8ae91f62ca9e6ca1f210b815ab54edbae856ac4c + - 76744ed 2026-05-19T09:11:15Z OCPBUGS-83923: Vendor updates for grpc-go and x/net + - a0d7041 2026-05-19T09:11:15Z OCPBUGS-83923: Update grpc-go and x/net -- machine-config-operator embedded-component 6ff546c6bf38055a335625191c60dcc9c7c714d2 to ab81640d1510800b1be795066ef4d392dbcdf470 - - 327db855 2026-05-18T20:00:05Z drain: fix re-cordon detection - - b384040e 2026-05-18T10:38:39+02:00 OCPBUGS-83830: Apply password only if changes exist +- oc image-amd64 66dee73f66c4f048c333c6a77d76871872027896 to 062bc5449c4987c92c76da4d315ef4969c22d638 + - 1582d6c0 2026-05-06T01:05:51Z OCPBUGS-62799: Add required-scc annotation to node-joiner pod to prevent third-party SCC interference -- route-controller-manager embedded-component 624742d93f3a7885cf7f70985f1e23ff60da580d to 55f77ca4cf0328b7c4fd7736bce79ebe171a9b6b - - da1aade 2026-05-19T11:45:48-03:00 OCPBUGS-83892: Vendor updates for grpc-go and x/net - - e162d33 2026-05-19T11:45:17-03:00 OCPBUGS-83892: Update grpc-go and x/net +- router image-amd64 896390778ebe15f57f87e6ca78f11c96e64c2652 to 1d980e1d4c65832893e91150df92fc6ad1932d89 + - 39e7d40 2026-05-19T12:50:01-04:00 Bump google.golang.org/grpc to v1.79.3 -- coredns image-amd64 0dded2d232dab43c107b1dab9d0d9fdfd8259622 to 9a71d9a6b788437e755b5ed3bfad78c63fa7c6f4 - - 7db70e5 2026-05-19T10:46:26-04:00 Fix GO-2026-4918: Bump golang.org/x/net to v0.53.0 - - 8316b33 2026-05-19T10:46:26-04:00 Fix GO-2025-4245: Bump github.com/expr-lang/expr to v1.17.7 - - 38d839a 2026-05-19T10:46:26-04:00 OCPBUGS-83943: Bump gRPC to v1.79.3 to resolve CVE-2026-33186 +- oc image-arm64 66dee73f66c4f048c333c6a77d76871872027896 to 062bc5449c4987c92c76da4d315ef4969c22d638 + - 1582d6c0 2026-05-06T01:05:51Z OCPBUGS-62799: Add required-scc annotation to node-joiner pod to prevent third-party SCC interference + +- router image-arm64 896390778ebe15f57f87e6ca78f11c96e64c2652 to 1d980e1d4c65832893e91150df92fc6ad1932d89 + - 39e7d40 2026-05-19T12:50:01-04:00 Bump google.golang.org/grpc to v1.79.3 diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index ae81f29e42..b9baa9c4c3 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -1,7 +1,7 @@ https://github.com/openshift/api embedded-component 694421e64aeeae4374e7e7394014ad40ab5a1f30 https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component 108f37f0e378accc322cbeb68136ec500ec35b94 https://github.com/openshift/cluster-dns-operator embedded-component 3d2141182243cde1ec6417bd005c76d29aa88a01 -https://github.com/openshift/cluster-ingress-operator embedded-component 52c2b0465ecf1dcdcd57c010b9b15ac28f62a2ba +https://github.com/openshift/cluster-ingress-operator embedded-component 8ae91f62ca9e6ca1f210b815ab54edbae856ac4c https://github.com/openshift/cluster-kube-apiserver-operator embedded-component fb68eab51544f9dffac9916796723f6cee4faf3c https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 95150ed5dbf11370b4a06e6959c77efa13768561 https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 51ea59abd057d0cef56b29b8a74efc28411d5427 @@ -17,18 +17,18 @@ https://github.com/openshift/openshift-controller-manager embedded-component 26d https://github.com/openshift/operator-framework-olm embedded-component de6260e53055e10e216ec668d692a35554ab0585 https://github.com/openshift/route-controller-manager embedded-component 55f77ca4cf0328b7c4fd7736bce79ebe171a9b6b https://github.com/openshift/service-ca-operator embedded-component 9fff46a576033685f66fbb1121eb0a2f134a29be -https://github.com/openshift/oc image-amd64 66dee73f66c4f048c333c6a77d76871872027896 +https://github.com/openshift/oc image-amd64 062bc5449c4987c92c76da4d315ef4969c22d638 https://github.com/openshift/coredns image-amd64 9a71d9a6b788437e755b5ed3bfad78c63fa7c6f4 https://github.com/openshift/csi-external-snapshotter image-amd64 d1bc3ffaa9759c13a06c2ec61c541342e71bd109 -https://github.com/openshift/router image-amd64 896390778ebe15f57f87e6ca78f11c96e64c2652 +https://github.com/openshift/router image-amd64 1d980e1d4c65832893e91150df92fc6ad1932d89 https://github.com/openshift/kube-rbac-proxy image-amd64 d12e274605248f6c59373240a7eae7a7a357dcb3 https://github.com/openshift/ovn-kubernetes image-amd64 72db5e8d8ec23d4108183a8c67b45cdfdb8057ba https://github.com/openshift/kubernetes image-amd64 c5ea727d19837f8a22cda5c0ba8899960b7777ff https://github.com/openshift/service-ca-operator image-amd64 9fff46a576033685f66fbb1121eb0a2f134a29be -https://github.com/openshift/oc image-arm64 66dee73f66c4f048c333c6a77d76871872027896 +https://github.com/openshift/oc image-arm64 062bc5449c4987c92c76da4d315ef4969c22d638 https://github.com/openshift/coredns image-arm64 9a71d9a6b788437e755b5ed3bfad78c63fa7c6f4 https://github.com/openshift/csi-external-snapshotter image-arm64 d1bc3ffaa9759c13a06c2ec61c541342e71bd109 -https://github.com/openshift/router image-arm64 896390778ebe15f57f87e6ca78f11c96e64c2652 +https://github.com/openshift/router image-arm64 1d980e1d4c65832893e91150df92fc6ad1932d89 https://github.com/openshift/kube-rbac-proxy image-arm64 d12e274605248f6c59373240a7eae7a7a357dcb3 https://github.com/openshift/ovn-kubernetes image-arm64 72db5e8d8ec23d4108183a8c67b45cdfdb8057ba https://github.com/openshift/kubernetes image-arm64 c5ea727d19837f8a22cda5c0ba8899960b7777ff diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index 150cb04e10..bf209f4e15 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.22.0-0.nightly-2026-05-20-180739" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.22.0-0.nightly-arm64-2026-05-21-035130" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.22.0-0.nightly-2026-05-24-183203" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.22.0-0.nightly-arm64-2026-05-25-031550"