From d45bf48a8c26cff74a747015cc4287ae4b6cfa63 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 9 Feb 2026 04:28:37 +0000 Subject: [PATCH 1/8] 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 507f9380e8..5e804277af 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.21.0-0.nightly-2026-02-03-172532" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.21.0-0.nightly-arm64-2026-02-04-232249" +./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.21.0-0.nightly-2026-02-05-184824" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.21.0-0.nightly-arm64-2026-02-09-023431" From bcaa286197151095f8b9eaeeda4d534dedfdcd05 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 9 Feb 2026 04:28:37 +0000 Subject: [PATCH 2/8] update changelog --- scripts/auto-rebase/changelog.txt | 23 ++++++++++++++++++++++- scripts/auto-rebase/commits.txt | 10 +++++----- 2 files changed, 27 insertions(+), 6 deletions(-) diff --git a/scripts/auto-rebase/changelog.txt b/scripts/auto-rebase/changelog.txt index b5bcd08e9a..31f7ad082f 100644 --- a/scripts/auto-rebase/changelog.txt +++ b/scripts/auto-rebase/changelog.txt @@ -1,3 +1,24 @@ -- kubernetes image-arm64 4d58ab3bbfecb4e7a3affaa3885d1d4c0ec87c0a to 0df353502309af2497270ddf993bb866e2f2b5a9 +- cluster-csi-snapshot-controller-operator embedded-component 186ad6f430ae3f8f8e777e912efa6670033857e5 to 43ad01e88038be54792f16f0d692b96da1244404 + - 5b2faae 2026-01-22T15:50:14+00:00 Generate manifest + - b5b8a65 2026-01-22T15:50:14+00:00 Re-add serving cert volume mount to ibm cloud managed manifest + +- cluster-kube-apiserver-operator embedded-component 41d526c4367b210b9868fe025d0a50e55f30ac64 to 1d68351b053987df54b4e6fef60b480b72cfd714 + - 1f7bd18 2026-01-20T22:45:14+00:00 SCC: allow image volume type for all SCCs + +- kubernetes embedded-component 4d58ab3bbfecb4e7a3affaa3885d1d4c0ec87c0a to 0df353502309af2497270ddf993bb866e2f2b5a9 + - cf8ec576c 2026-02-03T09:32:41+01:00 UPSTREAM: 136594: raise kubelet CSI init backoff to cover ~140s DNS delays + +- machine-config-operator embedded-component a3c57fb568ba9201394624595e88c3ba6a5bd165 to c3866b26598bbdd7ac883b2c2db42805d80b4759 + - 45b4f01c 2026-02-02T13:11:27-05:00 Merge pull request #5562 from andfasano/iri-followup-changes + - 7a295ffb 2026-02-02T13:11:14-05:00 Merge pull request #5608 from bfournie/e2e-test-iri-deletion + - e25b74b8 2026-01-29T19:35:25-05:00 Merge pull request #5545 from bfournie/AGENT-1412-iri-deletion-guard + - 1e78a10d 2026-01-29T12:29:20-05:00 Add minimal osimagestream package for ClusterVersion support + - 3c5c111a 2026-01-29T10:34:08-05:00 Merge pull request #5588 from andfasano/iri-e2e-tests + - 27dd147a 2026-01-29T10:25:36-05:00 Merge pull request #5543 from andfasano/fix-iri-load-registry-file + - 374fe9ca 2026-01-29T10:25:28-05:00 Merge pull request #5514 from andfasano/iri-fix-registry-service + - e8c59928 2026-01-29T10:25:20-05:00 Merge pull request #5483 from andfasano/iri-tls-cert + - ebd501ab 2026-01-20T11:37:20+00:00 Add: enable nodeip-configuration for platform external + +- kubernetes image-amd64 4d58ab3bbfecb4e7a3affaa3885d1d4c0ec87c0a to 0df353502309af2497270ddf993bb866e2f2b5a9 - cf8ec576c 2026-02-03T09:32:41+01:00 UPSTREAM: 136594: raise kubelet CSI init backoff to cover ~140s DNS delays diff --git a/scripts/auto-rebase/commits.txt b/scripts/auto-rebase/commits.txt index 1412aafb94..318bdfba2c 100644 --- a/scripts/auto-rebase/commits.txt +++ b/scripts/auto-rebase/commits.txt @@ -1,8 +1,8 @@ https://github.com/openshift/api embedded-component d1c4dc4fd37b8e8f6e4992cda4e84167a3f2cb8c -https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component 186ad6f430ae3f8f8e777e912efa6670033857e5 +https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component 43ad01e88038be54792f16f0d692b96da1244404 https://github.com/openshift/cluster-dns-operator embedded-component 41a53fed36e6e99c7c9ceb3a699c3547ee5d9bb9 https://github.com/openshift/cluster-ingress-operator embedded-component b62dd27c901d495e6e78b11968872c002cc2416f -https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 41d526c4367b210b9868fe025d0a50e55f30ac64 +https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 1d68351b053987df54b4e6fef60b480b72cfd714 https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 395de96705749de9c6a5f25747b9d5c3d5f65a8f https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 7809937c07c5dbfa272bfbe87d99e09104bf3fc9 https://github.com/openshift/cluster-network-operator embedded-component 05d65e63fd668e97c1b7f45837ba66075f478d6d @@ -10,9 +10,9 @@ https://github.com/openshift/cluster-openshift-controller-manager-operator embed https://github.com/openshift/cluster-policy-controller embedded-component 8b775487512fb543bff470ff1042bd3ac31b29be https://github.com/openshift/csi-external-snapshotter embedded-component 9098db0e434e0d986eeadd2ebe69119540a550d1 https://github.com/openshift/etcd embedded-component 806f690e1f140e0aea2eb05ef5f288b756b62895 -https://github.com/openshift/kubernetes embedded-component 4d58ab3bbfecb4e7a3affaa3885d1d4c0ec87c0a +https://github.com/openshift/kubernetes embedded-component 0df353502309af2497270ddf993bb866e2f2b5a9 https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component ce5ff17e9a81ce754567e6dd5053d13409c251e9 -https://github.com/openshift/machine-config-operator embedded-component a3c57fb568ba9201394624595e88c3ba6a5bd165 +https://github.com/openshift/machine-config-operator embedded-component c3866b26598bbdd7ac883b2c2db42805d80b4759 https://github.com/openshift/openshift-controller-manager embedded-component 438d52e79d691e016d66eabfe9a53c84229db40c https://github.com/openshift/operator-framework-olm embedded-component 67b24a854479ff5e92f98a928b07683bddfc91b6 https://github.com/openshift/route-controller-manager embedded-component 8a69194a461dc33d2ed67a220bca91d384d34df4 @@ -23,7 +23,7 @@ https://github.com/openshift/csi-external-snapshotter image-amd64 9098db0e434e0d https://github.com/openshift/router image-amd64 b231c65b5c06c1f74590ca8e77caecc6213beb6a https://github.com/openshift/kube-rbac-proxy image-amd64 cd636680e06a55395c26570dff0cb37277014388 https://github.com/openshift/ovn-kubernetes image-amd64 190e114128b9f358d1d6a700c464797d4c3e36af -https://github.com/openshift/kubernetes image-amd64 4d58ab3bbfecb4e7a3affaa3885d1d4c0ec87c0a +https://github.com/openshift/kubernetes image-amd64 0df353502309af2497270ddf993bb866e2f2b5a9 https://github.com/openshift/service-ca-operator image-amd64 e9622ba18c86bf24aceab0c19fdcb87339c14f44 https://github.com/openshift/oc image-arm64 19a2243fe780f1aa9b5c8d80bd413a8721cc2e8c https://github.com/openshift/coredns image-arm64 7486e9e4330c1e41d9a91e4673b7f2782efc112c From 84b2d8bb2366228a57630fdfceddef19c4016bc4 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 9 Feb 2026 04:29:38 +0000 Subject: [PATCH 3/8] update microshift/deps --- .../openshift/kubernetes/pkg/volume/csi/csi_plugin.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/deps/github.com/openshift/kubernetes/pkg/volume/csi/csi_plugin.go b/deps/github.com/openshift/kubernetes/pkg/volume/csi/csi_plugin.go index efeba1722a..23b6b41dd8 100644 --- a/deps/github.com/openshift/kubernetes/pkg/volume/csi/csi_plugin.go +++ b/deps/github.com/openshift/kubernetes/pkg/volume/csi/csi_plugin.go @@ -390,8 +390,8 @@ func initializeCSINode(host volume.VolumeHost, csiDriverInformer cache.SharedInd // after max retry steps. initBackoff := wait.Backoff{ Steps: 6, - Duration: 15 * time.Millisecond, - Factor: 6.0, + Duration: 30 * time.Millisecond, + Factor: 8.0, Jitter: 0.1, } err = wait.ExponentialBackoff(initBackoff, func() (bool, error) { From 0b7cbbb373049db98cba89da8dd869ff2f4c9884 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 9 Feb 2026 04:30:08 +0000 Subject: [PATCH 4/8] update microshift/vendor --- vendor/k8s.io/kubernetes/pkg/volume/csi/csi_plugin.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vendor/k8s.io/kubernetes/pkg/volume/csi/csi_plugin.go b/vendor/k8s.io/kubernetes/pkg/volume/csi/csi_plugin.go index efeba1722a..23b6b41dd8 100644 --- a/vendor/k8s.io/kubernetes/pkg/volume/csi/csi_plugin.go +++ b/vendor/k8s.io/kubernetes/pkg/volume/csi/csi_plugin.go @@ -390,8 +390,8 @@ func initializeCSINode(host volume.VolumeHost, csiDriverInformer cache.SharedInd // after max retry steps. initBackoff := wait.Backoff{ Steps: 6, - Duration: 15 * time.Millisecond, - Factor: 6.0, + Duration: 30 * time.Millisecond, + Factor: 8.0, Jitter: 0.1, } err = wait.ExponentialBackoff(initBackoff, func() (bool, error) { From 4f21effd0853082fbdc595e793910aaa544678ac Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 9 Feb 2026 04:30:15 +0000 Subject: [PATCH 5/8] 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 9297801bf9..40c166117c 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:e98a33cad231f335fbf3c3847d09ffacfb9b8d7c8d38d66cbab439d4459ad47a" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dc248c02585e41245eb8e16fea646a6f1013f5257f5152dab0fd4634073fe15d" 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 0561d32194..d36715f55e 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:6c5798afafe96f9c1de300cd8b709030655d1c92d03394b069b3f4100a0a4334" +pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2de0b60db55b71ba5aa8bf77d7634336f0b4256e721517b4ac58a8ba58dd30f0" pause_image_auth_file = "/etc/crio/openshift-pull-secret" pause_command = "/usr/bin/pod" From 25356b16c999f88b9152f393e8fa9ac8eb7e42ec Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 9 Feb 2026 04:30:16 +0000 Subject: [PATCH 6/8] update manifests --- .../multus/kustomization.aarch64.yaml | 4 ++-- .../multus/release-multus-aarch64.json | 6 +++--- .../multus/release-multus-x86_64.json | 2 +- ..._kube-apiserver-operator_00_scc-anyuid.yaml | 1 + ...e-apiserver-operator_00_scc-hostaccess.yaml | 1 + ...erver-operator_00_scc-hostmount-anyuid.yaml | 1 + ...iserver-operator_00_scc-hostnetwork-v2.yaml | 1 + ...-apiserver-operator_00_scc-hostnetwork.yaml | 1 + ...e-apiserver-operator_00_scc-nonroot-v2.yaml | 1 + ...kube-apiserver-operator_00_scc-nonroot.yaml | 1 + ...piserver-operator_00_scc-restricted-v2.yaml | 1 + ...piserver-operator_00_scc-restricted-v3.yaml | 1 + ...e-apiserver-operator_00_scc-restricted.yaml | 1 + .../kustomization.aarch64.yaml | 10 +++++----- .../release-olm-aarch64.json | 8 ++++---- .../release-olm-x86_64.json | 2 +- assets/release/release-aarch64.json | 18 +++++++++--------- assets/release/release-x86_64.json | 4 ++-- 18 files changed, 37 insertions(+), 27 deletions(-) diff --git a/assets/components/multus/kustomization.aarch64.yaml b/assets/components/multus/kustomization.aarch64.yaml index 566d02d024..efb7286e61 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:a936c0970ab66789c10a64cf57ae76bcab0f2f16b6b50e713373066f73d535b5 + digest: sha256:693f3e01ba2390f4941a10d466e763a10dd4b1d79f32e635c2fc64804af73d0d - name: containernetworking-plugins-microshift newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:bf017210bb8bfbefa027c830656e83b3db86e940e5ef1f62e67fdc84545cd118 + digest: sha256:9ddd1ead5984cf87cda5a3b58c46eddf3f6fff1b97a564532b6ae5802e39a286 diff --git a/assets/components/multus/release-multus-aarch64.json b/assets/components/multus/release-multus-aarch64.json index f9bf610add..8f0db52012 100644 --- a/assets/components/multus/release-multus-aarch64.json +++ b/assets/components/multus/release-multus-aarch64.json @@ -1,9 +1,9 @@ { "release": { - "base": "4.21.0-0.nightly-arm64-2026-02-04-232249" + "base": "4.21.0-0.nightly-arm64-2026-02-09-023431" }, "images": { - "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a936c0970ab66789c10a64cf57ae76bcab0f2f16b6b50e713373066f73d535b5", - "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bf017210bb8bfbefa027c830656e83b3db86e940e5ef1f62e67fdc84545cd118" + "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:693f3e01ba2390f4941a10d466e763a10dd4b1d79f32e635c2fc64804af73d0d", + "containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9ddd1ead5984cf87cda5a3b58c46eddf3f6fff1b97a564532b6ae5802e39a286" } } diff --git a/assets/components/multus/release-multus-x86_64.json b/assets/components/multus/release-multus-x86_64.json index 41732bde6c..b122e576ef 100644 --- a/assets/components/multus/release-multus-x86_64.json +++ b/assets/components/multus/release-multus-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.21.0-0.nightly-2026-02-03-172532" + "base": "4.21.0-0.nightly-2026-02-05-184824" }, "images": { "multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3ab4203333e071978d85f0f44f7342811d898cc388326db60afacd2395f8340e", diff --git a/assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_scc-anyuid.yaml b/assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_scc-anyuid.yaml index 3d1711b4b3..b66027053b 100644 --- a/assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_scc-anyuid.yaml +++ b/assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_scc-anyuid.yaml @@ -39,6 +39,7 @@ volumes: - downwardAPI - emptyDir - ephemeral +- image - persistentVolumeClaim - projected - secret diff --git a/assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_scc-hostaccess.yaml b/assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_scc-hostaccess.yaml index e560a0eda1..3ff0fef641 100644 --- a/assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_scc-hostaccess.yaml +++ b/assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_scc-hostaccess.yaml @@ -44,6 +44,7 @@ volumes: - emptyDir - ephemeral - hostPath +- image - persistentVolumeClaim - projected - secret diff --git a/assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_scc-hostmount-anyuid.yaml b/assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_scc-hostmount-anyuid.yaml index f48b0489ca..fafcd40b36 100644 --- a/assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_scc-hostmount-anyuid.yaml +++ b/assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_scc-hostmount-anyuid.yaml @@ -43,6 +43,7 @@ volumes: - emptyDir - ephemeral - hostPath +- image - nfs - persistentVolumeClaim - projected diff --git a/assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_scc-hostnetwork-v2.yaml b/assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_scc-hostnetwork-v2.yaml index 2b4b592fa1..c276599f70 100644 --- a/assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_scc-hostnetwork-v2.yaml +++ b/assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_scc-hostnetwork-v2.yaml @@ -44,6 +44,7 @@ volumes: - downwardAPI - emptyDir - ephemeral +- image - persistentVolumeClaim - projected - secret diff --git a/assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_scc-hostnetwork.yaml b/assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_scc-hostnetwork.yaml index 7a04423b03..2cd333f455 100644 --- a/assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_scc-hostnetwork.yaml +++ b/assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_scc-hostnetwork.yaml @@ -42,6 +42,7 @@ volumes: - downwardAPI - emptyDir - ephemeral +- image - persistentVolumeClaim - projected - secret diff --git a/assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_scc-nonroot-v2.yaml b/assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_scc-nonroot-v2.yaml index 9b9241162c..4f7db09989 100644 --- a/assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_scc-nonroot-v2.yaml +++ b/assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_scc-nonroot-v2.yaml @@ -45,6 +45,7 @@ volumes: - downwardAPI - emptyDir - ephemeral +- image - persistentVolumeClaim - projected - secret diff --git a/assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_scc-nonroot.yaml b/assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_scc-nonroot.yaml index c013326c48..74c4102bf1 100644 --- a/assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_scc-nonroot.yaml +++ b/assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_scc-nonroot.yaml @@ -42,6 +42,7 @@ volumes: - downwardAPI - emptyDir - ephemeral +- image - persistentVolumeClaim - projected - secret diff --git a/assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_scc-restricted-v2.yaml b/assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_scc-restricted-v2.yaml index 6c7517babd..da25a7fd13 100644 --- a/assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_scc-restricted-v2.yaml +++ b/assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_scc-restricted-v2.yaml @@ -44,6 +44,7 @@ volumes: - downwardAPI - emptyDir - ephemeral +- image - persistentVolumeClaim - projected - secret diff --git a/assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_scc-restricted-v3.yaml b/assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_scc-restricted-v3.yaml index 3685755954..9dfb4d2124 100644 --- a/assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_scc-restricted-v3.yaml +++ b/assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_scc-restricted-v3.yaml @@ -56,6 +56,7 @@ volumes: - downwardAPI - emptyDir - ephemeral +- image - persistentVolumeClaim - projected - secret diff --git a/assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_scc-restricted.yaml b/assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_scc-restricted.yaml index 7f1ba9e609..ed96926ca7 100644 --- a/assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_scc-restricted.yaml +++ b/assets/controllers/openshift-default-scc-manager/0000_20_kube-apiserver-operator_00_scc-restricted.yaml @@ -41,6 +41,7 @@ volumes: - downwardAPI - emptyDir - ephemeral +- image - persistentVolumeClaim - projected - secret diff --git a/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml b/assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml index ab950eb78a..d4c8d6af08 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:0043c8e63c3bcf98e33fda7e5f532143b4c8fdbce690606bf469e932d8552062 + digest: sha256:49d6c7dd5e53d17dcacbb1a771233cba3d279cf97d3cd31a56d521a39fa1ced8 - name: quay.io/operator-framework/configmap-operator-registry newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:eef5b8e84cce56cf085ed8f8a2ca544505242606d44691b6d0beced7c942bf9c + digest: sha256:5d6b149bfa878292ef3073cadc5f019972d798aded418617c4bdfd476368847d - name: quay.io/openshift/origin-kube-rbac-proxy newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev - digest: sha256:7aa46141209fdb1090d90f00d1a7753f31b9224e080b8c669883901846b32ca4 + digest: sha256:970113e34f562f531d52895dc0990133282f47a55630a978edd1cf968c3ef713 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:eef5b8e84cce56cf085ed8f8a2ca544505242606d44691b6d0beced7c942bf9c + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5d6b149bfa878292ef3073cadc5f019972d798aded418617c4bdfd476368847d - 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:0043c8e63c3bcf98e33fda7e5f532143b4c8fdbce690606bf469e932d8552062 + value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:49d6c7dd5e53d17dcacbb1a771233cba3d279cf97d3cd31a56d521a39fa1ced8 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 b1d51fe16b..47bf521d96 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.21.0-0.nightly-arm64-2026-02-04-232249" + "base": "4.21.0-0.nightly-arm64-2026-02-09-023431" }, "images": { - "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0043c8e63c3bcf98e33fda7e5f532143b4c8fdbce690606bf469e932d8552062", - "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:eef5b8e84cce56cf085ed8f8a2ca544505242606d44691b6d0beced7c942bf9c", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7aa46141209fdb1090d90f00d1a7753f31b9224e080b8c669883901846b32ca4" + "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:49d6c7dd5e53d17dcacbb1a771233cba3d279cf97d3cd31a56d521a39fa1ced8", + "operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5d6b149bfa878292ef3073cadc5f019972d798aded418617c4bdfd476368847d", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:970113e34f562f531d52895dc0990133282f47a55630a978edd1cf968c3ef713" } } 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 c948aecb8b..c8f79e8cfc 100644 --- a/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json +++ b/assets/optional/operator-lifecycle-manager/release-olm-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.21.0-0.nightly-2026-02-03-172532" + "base": "4.21.0-0.nightly-2026-02-05-184824" }, "images": { "operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f50ed1d01f799f00ce20f210b95774f2dffe7137757ecf86544c71a9f621f402", diff --git a/assets/release/release-aarch64.json b/assets/release/release-aarch64.json index dfc4f13c39..63288f758c 100644 --- a/assets/release/release-aarch64.json +++ b/assets/release/release-aarch64.json @@ -1,16 +1,16 @@ { "release": { - "base": "4.21.0-0.nightly-arm64-2026-02-04-232249" + "base": "4.21.0-0.nightly-arm64-2026-02-09-023431" }, "images": { - "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dc970cb4ede420e1d131a6146d256269ca6fb34b633c17315e6b202723765bd7", - "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7f886a3942b81b3318e288602c88de802278bb77c5d11ba758f1d86f2f028abf", - "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e53bc4c7a3fa7103778bd3f7bdc4b6be4b5e6a8450e38eee246caa75d9f8f44d", - "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7aa46141209fdb1090d90f00d1a7753f31b9224e080b8c669883901846b32ca4", - "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:87bd671167583b8f46388c7e5853509fc9c20439c1b5f57544117fc9e1b1b5b1", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6c5798afafe96f9c1de300cd8b709030655d1c92d03394b069b3f4100a0a4334", - "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c0f27acad2634255d689355942e8c0d87f624c269eca0f11b1fe20b56b22294a", + "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:87f6227e133202f9b6e44775d2ba706729b79368b4837f9e17cb7f12c2686fbc", + "coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f79f83f182fedd757f4f6bbd85618907c7c5c07f98bf67afc83d25ead61d688d", + "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:aac4545b395cce0c5691b6077c5942ab4c35ab8791ee496779c040af8c028c65", + "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:970113e34f562f531d52895dc0990133282f47a55630a978edd1cf968c3ef713", + "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6ed68ef5c3f83a3703e247be68ea71296d7bd843df04fbfe2b8cfb30adec3d8f", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2de0b60db55b71ba5aa8bf77d7634336f0b4256e721517b4ac58a8ba58dd30f0", + "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:86e816d85756742011a8c8a27c04f48307fdb23347281cecc37036dc8fa66fa2", "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:6c539e26ca346ca83a4c024a374f3874e858602b71794a1709b8a08356744b46" + "csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b28e91b9ed1a1fbf25bfa1d9b5f6964ffde23ac2a1758804a45b81265f533c53" } } diff --git a/assets/release/release-x86_64.json b/assets/release/release-x86_64.json index 5f218dc2e9..197b83d10a 100644 --- a/assets/release/release-x86_64.json +++ b/assets/release/release-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "4.21.0-0.nightly-2026-02-03-172532" + "base": "4.21.0-0.nightly-2026-02-05-184824" }, "images": { "cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0a68822ea4fb06b74890aebdb694cbba827a5c1b9519b5a4d2086a867464fa2b", @@ -8,7 +8,7 @@ "haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7639b8403341003825286c0fd45ab34d815585e8f4b5b4d1a424ccfc0292e017", "kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a5c047afb2066ca8740286ad2af8e1271ef78c2e5df73ed2365f586d6a101b33", "ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:148d9d31314b0ca3dd2667aadf51d9a65cc88cd872d21d29e4c85fe25cbf6410", - "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e98a33cad231f335fbf3c3847d09ffacfb9b8d7c8d38d66cbab439d4459ad47a", + "pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dc248c02585e41245eb8e16fea646a6f1013f5257f5152dab0fd4634073fe15d", "service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1415356cad67eea021d0adef8b7f8ac8524035a4acc3ae7080f26f8f3f7cc959", "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:978722d03bd0e1eb78e35c188516d960ed81c8b47a66e77ec7ea465634e44536" From 60cfa0abd1b5efee239977806e31c48cf81ca8c6 Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 9 Feb 2026 04:30:17 +0000 Subject: [PATCH 7/8] 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 a86bbf75ef..2904e67dd9 100644 --- a/Makefile.kube_git.var +++ b/Makefile.kube_git.var @@ -1,5 +1,5 @@ KUBE_GIT_MAJOR=1 KUBE_GIT_MINOR=34 KUBE_GIT_VERSION=v1.34.2 -KUBE_GIT_COMMIT=4d58ab3bbfecb4e7a3affaa3885d1d4c0ec87c0a +KUBE_GIT_COMMIT=0df353502309af2497270ddf993bb866e2f2b5a9 KUBE_GIT_TREE_STATE=clean diff --git a/Makefile.version.aarch64.var b/Makefile.version.aarch64.var index 525fb495e5..bafe8b1f1a 100644 --- a/Makefile.version.aarch64.var +++ b/Makefile.version.aarch64.var @@ -1 +1 @@ -OCP_VERSION := 4.21.0-0.nightly-arm64-2026-02-04-232249 +OCP_VERSION := 4.21.0-0.nightly-arm64-2026-02-09-023431 diff --git a/Makefile.version.x86_64.var b/Makefile.version.x86_64.var index 07d08a94c6..f286cb5a17 100644 --- a/Makefile.version.x86_64.var +++ b/Makefile.version.x86_64.var @@ -1 +1 @@ -OCP_VERSION := 4.21.0-0.nightly-2026-02-03-172532 +OCP_VERSION := 4.21.0-0.nightly-2026-02-05-184824 From 39f9f0e6c84c4c6f9b5656352fba807d2a4551ec Mon Sep 17 00:00:00 2001 From: ci-robot Date: Mon, 9 Feb 2026 04:30:41 +0000 Subject: [PATCH 8/8] Update AI Model Serving for MicroShift --- .../kserve/inferenceservice-config-microshift-patch.yaml | 5 +++-- .../kserve/overlays/odh/kustomization.yaml | 7 +++++++ .../ai-model-serving/kserve/overlays/odh/params.env | 2 ++ .../odh/patches/patch-inferenceservice-config.yaml | 5 +++-- .../ai-model-serving/release-ai-model-serving-x86_64.json | 5 +++-- assets/optional/ai-model-serving/runtimes/vllm-gaudi.yaml | 2 +- 6 files changed, 19 insertions(+), 7 deletions(-) diff --git a/assets/optional/ai-model-serving/kserve/inferenceservice-config-microshift-patch.yaml b/assets/optional/ai-model-serving/kserve/inferenceservice-config-microshift-patch.yaml index d779334936..90b542b8ef 100644 --- a/assets/optional/ai-model-serving/kserve/inferenceservice-config-microshift-patch.yaml +++ b/assets/optional/ai-model-serving/kserve/inferenceservice-config-microshift-patch.yaml @@ -13,9 +13,10 @@ metadata: namespace: kserve data: explainers: "{}" - oauthProxy: |- + oauthProxy: |- { - "image" : "$(oauth-proxy)", + "oauthProxyImage" : "$(oauth-proxy)", + "kubeRbacProxyImage" : "$(kube-rbac-proxy)", "memoryRequest": "64Mi", "memoryLimit": "128Mi", "cpuRequest": "100m", diff --git a/assets/optional/ai-model-serving/kserve/overlays/odh/kustomization.yaml b/assets/optional/ai-model-serving/kserve/overlays/odh/kustomization.yaml index cef82dd511..96af103d57 100644 --- a/assets/optional/ai-model-serving/kserve/overlays/odh/kustomization.yaml +++ b/assets/optional/ai-model-serving/kserve/overlays/odh/kustomization.yaml @@ -152,6 +152,13 @@ vars: apiVersion: v1 kind: ConfigMap name: kserve-parameters +- fieldref: + fieldpath: data.kube-rbac-proxy + name: kube-rbac-proxy + objref: + apiVersion: v1 + kind: ConfigMap + name: kserve-parameters - fieldref: fieldpath: data.kserve-llm-d-inference-scheduler name: kserve-llm-d-inference-scheduler diff --git a/assets/optional/ai-model-serving/kserve/overlays/odh/params.env b/assets/optional/ai-model-serving/kserve/overlays/odh/params.env index fffc4e5724..cfe95b7b15 100644 --- a/assets/optional/ai-model-serving/kserve/overlays/odh/params.env +++ b/assets/optional/ai-model-serving/kserve/overlays/odh/params.env @@ -6,3 +6,5 @@ kserve-llm-d=ghcr.io/llm-d/llm-d-dev:sha-b3f0b0d kserve-llm-d-inference-scheduler=quay.io/opendatahub/llm-d-inference-scheduler:odh-v2.33 kserve-llm-d-routing-sidecar=quay.io/opendatahub/llm-d-routing-sidecar:odh-v2.33 oauth-proxy=registry.redhat.io/openshift4/ose-oauth-proxy@sha256:bd49cfc8452b3d96467cc222db9487e120abc6cc5ba81349c6b3703706f36a08 +kube-rbac-proxy=registry.redhat.io/rhoai/odh-kube-auth-proxy-rhel9@sha256:1f4b2b9bb5061faf17299c2ae2405ab408e2b7ce349d9831eb6045990e6da005 + diff --git a/assets/optional/ai-model-serving/kserve/overlays/odh/patches/patch-inferenceservice-config.yaml b/assets/optional/ai-model-serving/kserve/overlays/odh/patches/patch-inferenceservice-config.yaml index 887ea13f15..8301667aa4 100644 --- a/assets/optional/ai-model-serving/kserve/overlays/odh/patches/patch-inferenceservice-config.yaml +++ b/assets/optional/ai-model-serving/kserve/overlays/odh/patches/patch-inferenceservice-config.yaml @@ -5,9 +5,10 @@ metadata: namespace: kserve data: explainers: "{}" - oauthProxy: |- + oauthProxy: |- { - "image" : "$(oauth-proxy)", + "oauthProxyImage" : "$(oauth-proxy)", + "kubeRbacProxyImage" : "$(kube-rbac-proxy)", "memoryRequest": "64Mi", "memoryLimit": "128Mi", "cpuRequest": "100m", diff --git a/assets/optional/ai-model-serving/release-ai-model-serving-x86_64.json b/assets/optional/ai-model-serving/release-ai-model-serving-x86_64.json index 5fa5c8628f..467eebcc78 100644 --- a/assets/optional/ai-model-serving/release-ai-model-serving-x86_64.json +++ b/assets/optional/ai-model-serving/release-ai-model-serving-x86_64.json @@ -1,6 +1,6 @@ { "release": { - "base": "2.25.1" + "base": "2.25.2" }, "images": { "ray-tls-generator-image": "registry.redhat.io/ubi9/ubi-minimal:latest", @@ -21,6 +21,7 @@ "kserve-llm-d": "ghcr.io/llm-d/llm-d-dev:sha-b3f0b0d", "kserve-llm-d-inference-scheduler": "quay.io/opendatahub/llm-d-inference-scheduler:odh-v2.33", "kserve-llm-d-routing-sidecar": "quay.io/opendatahub/llm-d-routing-sidecar:odh-v2.33", - "oauth-proxy": "registry.redhat.io/openshift4/ose-oauth-proxy@sha256:bd49cfc8452b3d96467cc222db9487e120abc6cc5ba81349c6b3703706f36a08" + "oauth-proxy": "registry.redhat.io/openshift4/ose-oauth-proxy@sha256:bd49cfc8452b3d96467cc222db9487e120abc6cc5ba81349c6b3703706f36a08", + "kube-rbac-proxy": "registry.redhat.io/rhoai/odh-kube-auth-proxy-rhel9@sha256:1f4b2b9bb5061faf17299c2ae2405ab408e2b7ce349d9831eb6045990e6da005" } } diff --git a/assets/optional/ai-model-serving/runtimes/vllm-gaudi.yaml b/assets/optional/ai-model-serving/runtimes/vllm-gaudi.yaml index ac69d08634..3026a19998 100644 --- a/assets/optional/ai-model-serving/runtimes/vllm-gaudi.yaml +++ b/assets/optional/ai-model-serving/runtimes/vllm-gaudi.yaml @@ -5,7 +5,7 @@ metadata: annotations: openshift.io/display-name: vLLM Intel Gaudi Accelerator ServingRuntime for KServe opendatahub.io/recommended-accelerators: '["habana.ai/gaudi"]' - opendatahub.io/runtime-version: 'v0.8.5' + opendatahub.io/runtime-version: 'v0.13.0' labels: opendatahub.io/dashboard: 'true' spec: