diff --git a/Makefile.kube_git.var b/Makefile.kube_git.var index ea09ca61fe..2c2111869c 100644 --- a/Makefile.kube_git.var +++ b/Makefile.kube_git.var @@ -1,5 +1,5 @@ KUBE_GIT_MAJOR=1 KUBE_GIT_MINOR=35 KUBE_GIT_VERSION=v1.35.4 -KUBE_GIT_COMMIT=80f28ac33ac111532fb8ba59b2e569085ee871b0 +KUBE_GIT_COMMIT=6b9ddbe6e09aa225e949baecde4145208bf94c8e KUBE_GIT_TREE_STATE=clean diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index 7e566a9323..c70c24dda6 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.22.0-0.nightly-arm64-2026-05-13-030029 +OCP_VERSION := 4.22.0-0.nightly-arm64-2026-05-14-030029 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index f920465963..2bcde195c6 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.22.0-0.nightly-2026-05-11-232602 +OCP_VERSION := 4.22.0-0.nightly-2026-05-13-154759 diff --git a/assets/components/multus/kustomization.aarch64.yaml b/assets/components/multus/kustomization.aarch64.yaml index 71b11122d1..421713c6c6 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:286d8cad01cfd00e5444c17171dd081ea402c2a4f6df92808ac3ca5d177091eb + digest: sha256:add0b47ac06901b10d2043899d704899ca4efc5b85ffad1066bd5180bd9caaa7 - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:682a6b8c4b61522edfb85fa628c9860ec27fb4205d88ecefa8aabe4755ce84d4 + digest: sha256:9067a8a306c17d57fa2a361b269012d71ce3e115d23404011284640605ecdd42 diff --git a/assets/components/multus/kustomization.x86_64.yaml b/assets/components/multus/kustomization.x86_64.yaml index c7282be11e..a120349348 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:fc77c06c3de2796f6358c1f0c1273c7042f4a6bc5f72b19aa19fc12513a29766 + digest: sha256:05e3dd857008fb90e2e4ccdeb26dfafd39ddcca397283c6f8563bc13192da4cd - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:991e62d7878151f4aefc2fd7df1d8413d71115b51de9c1c51315f120188cc7a4 + digest: sha256:e68c577994350df7d0ff57649f24daaf0e28c8e5b7afadfd5357fe90e8387e39 diff --git a/assets/components/multus/release-multus-aarch64.json b/assets/components/multus/release-multus-aarch64.json index e4a62c214e..dc286bc52c 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-13-030029" + "base": "4.22.0-0.nightly-arm64-2026-05-14-030029" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:286d8cad01cfd00e5444c17171dd081ea402c2a4f6df92808ac3ca5d177091eb", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:682a6b8c4b61522edfb85fa628c9860ec27fb4205d88ecefa8aabe4755ce84d4" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:add0b47ac06901b10d2043899d704899ca4efc5b85ffad1066bd5180bd9caaa7", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9067a8a306c17d57fa2a361b269012d71ce3e115d23404011284640605ecdd42" } } diff --git a/assets/components/multus/release-multus-x86_64.json b/assets/components/multus/release-multus-x86_64.json index 545b100351..7bc93adc8c 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-11-232602" + "base": "4.22.0-0.nightly-2026-05-13-154759" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fc77c06c3de2796f6358c1f0c1273c7042f4a6bc5f72b19aa19fc12513a29766", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:991e62d7878151f4aefc2fd7df1d8413d71115b51de9c1c51315f120188cc7a4" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:05e3dd857008fb90e2e4ccdeb26dfafd39ddcca397283c6f8563bc13192da4cd", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e68c577994350df7d0ff57649f24daaf0e28c8e5b7afadfd5357fe90e8387e39" } } diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index cfb7fb123a..7e24f85b1b 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:8b0a5b738dc296d3087e36f557f91f94e9a2d66a70fb39b602eb2991fdce9296 + digest: sha256:56428c56796128f8d25752ac354f2e90bcc8ef98c399aa0daa38ead545ae8022 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:29b3c0e3ea66482e3b960e567678fa3a9b964487b7dcf847ae9f1f192518400a + digest: sha256:5f1e5aaa1904a82bdf100440f813740bddcbf8f2a80299069f9b3dad1617f14e - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:6a36a074f4e146e1407a59d0cce898126cd0175cc3637fe4270bf4ace45daaa6 + digest: sha256:e65f33024e81d616f45252bff717632351064b5ead26c8f6401ac729258809a4 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:29b3c0e3ea66482e3b960e567678fa3a9b964487b7dcf847ae9f1f192518400a + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5f1e5aaa1904a82bdf100440f813740bddcbf8f2a80299069f9b3dad1617f14e - 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:8b0a5b738dc296d3087e36f557f91f94e9a2d66a70fb39b602eb2991fdce9296 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:56428c56796128f8d25752ac354f2e90bcc8ef98c399aa0daa38ead545ae8022 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 865645d204..d5c0cd1a87 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:b22f2d07f2a334776b3791d5595178ea7b2cce32aec9f7d7e38d4cd810bc60b6 + digest: sha256:8f7ffbbc2881ab733a7380b809a7da79885d4ae4786b2d2e72a9184801caddf3 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:76e38d17882d821225497b9b091ce35daa4db7e0cd63e01f327c16551dd8a99f + digest: sha256:813b4852e9d4f61ea9557ed27e2fdff2d06edc735e569fcb7cb0417c0e68b7bc - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:0878d6e7a30330a8466d150a5d8d66690f5442e6c6a0a2a3be4afdf1bee6031d + digest: sha256:28ce4fb536ad0b695620ffcd026ff3284b6aee36821ffce0e291159d7ae78804 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:76e38d17882d821225497b9b091ce35daa4db7e0cd63e01f327c16551dd8a99f + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:813b4852e9d4f61ea9557ed27e2fdff2d06edc735e569fcb7cb0417c0e68b7bc - 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:b22f2d07f2a334776b3791d5595178ea7b2cce32aec9f7d7e38d4cd810bc60b6 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8f7ffbbc2881ab733a7380b809a7da79885d4ae4786b2d2e72a9184801caddf3 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 7cf27d938a..90cef087cc 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-13-030029" + "base": "4.22.0-0.nightly-arm64-2026-05-14-030029" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8b0a5b738dc296d3087e36f557f91f94e9a2d66a70fb39b602eb2991fdce9296", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:29b3c0e3ea66482e3b960e567678fa3a9b964487b7dcf847ae9f1f192518400a", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6a36a074f4e146e1407a59d0cce898126cd0175cc3637fe4270bf4ace45daaa6" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:56428c56796128f8d25752ac354f2e90bcc8ef98c399aa0daa38ead545ae8022", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5f1e5aaa1904a82bdf100440f813740bddcbf8f2a80299069f9b3dad1617f14e", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e65f33024e81d616f45252bff717632351064b5ead26c8f6401ac729258809a4" } } 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 cb4100a448..5f6e8eb6eb 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-11-232602" + "base": "4.22.0-0.nightly-2026-05-13-154759" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b22f2d07f2a334776b3791d5595178ea7b2cce32aec9f7d7e38d4cd810bc60b6", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:76e38d17882d821225497b9b091ce35daa4db7e0cd63e01f327c16551dd8a99f", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0878d6e7a30330a8466d150a5d8d66690f5442e6c6a0a2a3be4afdf1bee6031d" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8f7ffbbc2881ab733a7380b809a7da79885d4ae4786b2d2e72a9184801caddf3", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:813b4852e9d4f61ea9557ed27e2fdff2d06edc735e569fcb7cb0417c0e68b7bc", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:28ce4fb536ad0b695620ffcd026ff3284b6aee36821ffce0e291159d7ae78804" } } diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index f37e019c5d..7d0e6cf920 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-13-030029" + "base": "4.22.0-0.nightly-arm64-2026-05-14-030029" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:05fa8e5d7b5b03a281ddd63e9b5cf46f92b720b47684e5ae687cbbbae80d230c", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c81c19c36c44a7eb76e298c49ba7f275845ea839d4f884e97d278add62660a47", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:221bec867f89b36ff1dcc1856f000958315e825c143efe0c181ba9af36f48f3b", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6a36a074f4e146e1407a59d0cce898126cd0175cc3637fe4270bf4ace45daaa6", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e71ff87168bdb2a8656f1a7331e89d98a108bc7a93ff67e8f004d0dc0ea58f02", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:141f4a3fc9f1131744efbdf01e98b8ef1efdfeec36b1e008519de802dd27dae0", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1c3d286d1c9bf8ed5b5a0dded4555a624a0d85b416d4f32aff8a0efb27ca3d7e", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b31b66e9bf5ee04a434374cd5763729bd75347e3f631380acb976d92562fa869", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0cc8dfcd8170adbe32120bd9bf89ec85db240afc67ce7f23c31571fa33252f60", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:70b6477460134e5c9578b4b5b28d40ae431ae01160afbaf3fae24ef0546f6aaa", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e65f33024e81d616f45252bff717632351064b5ead26c8f6401ac729258809a4", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0df2ba484d5bc7ec245a713a19f2130eb31103e2353795db4dafc24c6ee66ede", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e78f0dbb59944a39552e380ffd9cd6e3a5dc586ceffe8ea6750bfea3fe51205c", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c65ad20ae2572a1858e2cc438564108329daacc9db1a198950eccffbd59b670f", "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:3bef8b2622a0c0b651724ebc1a6db02ff9dfdbf598013a4344eb8d574a9bb07b" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:772a112d3e35269f19feaf8295f119003a35724f190d2a1b747f70c03ad0f47e" } } diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 15389db3fc..2f5dd1666d 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-11-232602" + "base": "4.22.0-0.nightly-2026-05-13-154759" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:52d09447b7d5bbb2dd8f91fea43970739e501d970e9cf602cd9f0910fc7a2638", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d52f3a0c205c90681f6efac0295cee0a0797de9af6d76f5d00bfb7a19546f4a2", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:04161000d7db66b972c4bf0039008d42b1a55aa3e1ab2b7aa169c98059596787", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0878d6e7a30330a8466d150a5d8d66690f5442e6c6a0a2a3be4afdf1bee6031d", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7036e605cc5b57c0fa560bc8a914c1e58b03d024bff2d99cf9c3a9c09318ca25", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:57a30ae1662f7b1dda0d07bca7ddb93ecdd4af6c7ca19cf5cdd90e2564c1e191", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8dc771b853d7e310df417d18226fce8752121a685c3b6ee9d1e570c80ddf6353", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8762deff566a93d3d6fa9869748f50e22bbadf0e8979898803cc290ef5a91cd0", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:25272a0944e00a27ce1d63e2cc1dfba29b896b89890fe191f394f67b6e13ae05", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2f11b7a4f6cc23e213a30566cab93ac01d347a49aa40825feab57ba5010a66f6", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:28ce4fb536ad0b695620ffcd026ff3284b6aee36821ffce0e291159d7ae78804", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f73f7295fcaf42ab336cd98782f802945dd1fac1771ca48f29bfaf7e1036ce46", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:40cf94e00c8e84d6c613e38795d0742bffbec39264acfe450eefd7d26b75c784", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:51e4e2a749cfa068c41775652adbcb1ffad0a0264b6121e7590a9406cbc86574", "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:20b811acc8caa27cd8ffe4cfd1e51758cdd611880be13628383816deee8168ed" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:02bdca6af3c8aa48ecfe1f24259cb24850e28b1614727e0e6abb7a47732d3237" } } diff --git a/deps/github.com/openshift/kubernetes/test/e2e/apimachinery/watchlist.go b/deps/github.com/openshift/kubernetes/test/e2e/apimachinery/watchlist.go index baf85229ac..3948590f60 100644 --- a/deps/github.com/openshift/kubernetes/test/e2e/apimachinery/watchlist.go +++ b/deps/github.com/openshift/kubernetes/test/e2e/apimachinery/watchlist.go @@ -103,11 +103,13 @@ var _ = SIGDescribe("API Streaming (aka. WatchList)", framework.WithFeatureGate( f.Namespace.Name, time.Duration(0), nil, - nil, + func(options *metav1.ListOptions) { + options.LabelSelector = "watchlist=true" + }, ) _ = addWellKnownSecrets(ctx, f) - expectedSecrets, err := metadataClient.Resource(v1.SchemeGroupVersion.WithResource("secrets")).Namespace(f.Namespace.Name).List(ctx, metav1.ListOptions{}) + expectedSecrets, err := metadataClient.Resource(v1.SchemeGroupVersion.WithResource("secrets")).Namespace(f.Namespace.Name).List(ctx, metav1.ListOptions{LabelSelector: "watchlist=true"}) framework.ExpectNoError(err) ginkgo.By("Starting the secret meta informer") @@ -131,7 +133,7 @@ var _ = SIGDescribe("API Streaming (aka. WatchList)", framework.WithFeatureGate( _, err = f.ClientSet.CoreV1().Secrets(f.Namespace.Name).Update(ctx, secret, metav1.UpdateOptions{}) framework.ExpectNoError(err) - expectedSecrets, err = metadataClient.Resource(v1.SchemeGroupVersion.WithResource("secrets")).Namespace(f.Namespace.Name).List(ctx, metav1.ListOptions{}) + expectedSecrets, err = metadataClient.Resource(v1.SchemeGroupVersion.WithResource("secrets")).Namespace(f.Namespace.Name).List(ctx, metav1.ListOptions{LabelSelector: "watchlist=true"}) framework.ExpectNoError(err) verifyStoreFor(ctx, verifyPartialObjectMetadataStore(toPointerSlice(expectedSecrets.Items), secretMetaInformer.Informer().GetStore())) }) diff --git a/packaging/crio.conf.d/10-microshift_amd64.conf b/packaging/crio.conf.d/10-microshift_amd64.conf index 3ccb625467..cce33b402a 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:57a30ae1662f7b1dda0d07bca7ddb93ecdd4af6c7ca19cf5cdd90e2564c1e191" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:40cf94e00c8e84d6c613e38795d0742bffbec39264acfe450eefd7d26b75c784" 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 249eae5892..61a72b9a4f 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:141f4a3fc9f1131744efbdf01e98b8ef1efdfeec36b1e008519de802dd27dae0" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e78f0dbb59944a39552e380ffd9cd6e3a5dc586ceffe8ea6750bfea3fe51205c" 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 973aaec4e5..948a5769cf 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,9 +1,14 @@ -- cluster-kube-apiserver-operator embedded-component d03062f8d205f1923362c008c86f9bcdd35f931c to 1741228b58952244aceb8e74d35f918431717191 - - 8ea08a7 2026-05-07T15:29:17Z rename ObserveServiceAccountIssuer variables - - 0e1bd5d 2026-05-07T15:29:17Z rename ServiceAccountIssuerController variables - - c4ff14b 2026-05-07T15:29:17Z ObserveServiceAccountIssuer event should report an empty issuer during the - - ff54284 2026-05-07T15:29:17Z operator should not override authentication config serviceAccountIssuer with the default one during +- api embedded-component e9fad7d4cba1537b8af99b972370e76370de72e9 to 694421e64aeeae4374e7e7394014ad40ab5a1f30 + - 5a03f8a5 2026-05-06T15:20:52+02:00 Add labelSelector to MachineSet status for scale subresource + - ab1df8ca 2026-04-29T12:52:48+02:00 Promote EVPN Feature Gate -- kubernetes image-arm64 80f28ac33ac111532fb8ba59b2e569085ee871b0 to 6b9ddbe6e09aa225e949baecde4145208bf94c8e +- kubernetes embedded-component 80f28ac33ac111532fb8ba59b2e569085ee871b0 to 6b9ddbe6e09aa225e949baecde4145208bf94c8e + - 93426635f 2026-05-11T15:35:17Z UPSTREAM: 138401: Improve WatchList test robustness + +- machine-config-operator embedded-component b7a8bf128b2775ea19c8191efa774f0660b2be70 to 864d1bc04264397caddb7ff1ffa43fc5502aa5e7 + - c1d06d81 2026-05-12T10:26:44Z Add fix for ossImagestream status + - d7901102 2026-04-30T16:16:01Z OCBPUGS-84652: Include RootCA in the temporal CC + +- kubernetes image-amd64 80f28ac33ac111532fb8ba59b2e569085ee871b0 to 6b9ddbe6e09aa225e949baecde4145208bf94c8e - 93426635f 2026-05-11T15:35:17Z UPSTREAM: 138401: Improve WatchList test robustness diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 02f5c8bbf9..6a22ca3e50 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -1,4 +1,4 @@ -https://github.com/openshift/api embedded-component e9fad7d4cba1537b8af99b972370e76370de72e9 +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 @@ -10,9 +10,9 @@ https://github.com/openshift/cluster-openshift-controller-manager-operator embed https://github.com/openshift/cluster-policy-controller embedded-component 44985a1306411101c84dd5081598fc928b432321 https://github.com/openshift/csi-external-snapshotter embedded-component d1bc3ffaa9759c13a06c2ec61c541342e71bd109 https://github.com/openshift/etcd embedded-component d8d67b8ce849f816d6d23c904098336632e2348f -https://github.com/openshift/kubernetes embedded-component 80f28ac33ac111532fb8ba59b2e569085ee871b0 +https://github.com/openshift/kubernetes embedded-component 6b9ddbe6e09aa225e949baecde4145208bf94c8e https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 72835e43c7754356645e41031f3a99926b4d42e6 -https://github.com/openshift/machine-config-operator embedded-component b7a8bf128b2775ea19c8191efa774f0660b2be70 +https://github.com/openshift/machine-config-operator embedded-component 864d1bc04264397caddb7ff1ffa43fc5502aa5e7 https://github.com/openshift/openshift-controller-manager embedded-component 26d20feae8892f648f5b06ed3f5492fe6ffb4532 https://github.com/openshift/operator-framework-olm embedded-component de6260e53055e10e216ec668d692a35554ab0585 https://github.com/openshift/route-controller-manager embedded-component 624742d93f3a7885cf7f70985f1e23ff60da580d @@ -23,7 +23,7 @@ https://github.com/openshift/csi-external-snapshotter image-amd64 d1bc3ffaa9759c https://github.com/openshift/router image-amd64 896390778ebe15f57f87e6ca78f11c96e64c2652 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 80f28ac33ac111532fb8ba59b2e569085ee871b0 +https://github.com/openshift/kubernetes image-amd64 6b9ddbe6e09aa225e949baecde4145208bf94c8e https://github.com/openshift/service-ca-operator image-amd64 9fff46a576033685f66fbb1121eb0a2f134a29be https://github.com/openshift/oc image-arm64 66dee73f66c4f048c333c6a77d76871872027896 https://github.com/openshift/coredns image-arm64 0dded2d232dab43c107b1dab9d0d9fdfd8259622 diff --git a/scripts/auto-rebase/last_rebase.sh b/scripts/auto-rebase/last_rebase.sh index e4b2a0a046..aa689dda06 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-11-232602" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.22.0-0.nightly-arm64-2026-05-13-030029" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.22.0-0.nightly-2026-05-13-154759" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.22.0-0.nightly-arm64-2026-05-14-030029"