Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile.version.aarch64.var
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.16.0-0.nightly-arm64-2026-03-05-150049
OCP_VERSION := 4.16.0-0.nightly-arm64-2026-03-21-032605
2 changes: 1 addition & 1 deletion Makefile.version.x86_64.var
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.16.0-0.nightly-2026-03-02-150537
OCP_VERSION := 4.16.0-0.nightly-2026-03-18-192836
2 changes: 1 addition & 1 deletion assets/optional/multus/release-multus-aarch64.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.16.0-0.nightly-arm64-2026-03-05-150049"
"base": "4.16.0-0.nightly-arm64-2026-03-21-032605"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b95c3f96403c4125f15209bf23dc4e2ef676213f3170864cdaf71eeed77e0f51",
Expand Down
2 changes: 1 addition & 1 deletion assets/optional/multus/release-multus-x86_64.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"release": {
"base": "4.16.0-0.nightly-2026-03-02-150537"
"base": "4.16.0-0.nightly-2026-03-18-192836"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6a38f2b9dd42773a6622d5ad8fe1ce0dacc2c185974f21638ddb232356ec213e",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,26 @@
images:
- name: quay.io/operator-framework/olm
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:2d85690e0649559e51c7c908da6bbbbd09b74b7d7c9e6926a3f166cd2dd6b0d4
digest: sha256:c0ba7123f81b89040e9983a390e8de66ef86f0ec3e29e791e86a6fc4f62af6ee
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:666d717307ca7b2090893cfd2ff144dc26b5e0464c9e2d9416bb82b3ca075f58
digest: sha256:e7871d3413e864b9ec39d7cf0e99f6d8cdb8d4d38a8ae94819a45991deeced1d
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:9660e6edbe06910e78d10a720b587c439af4f47f9d69bec2402fcb7c91316541
digest: sha256:b00341b6f256ddd447df8aa4e380d3fd9524ed680b6028d4beefb78d9a3bf83f

patches:
- patch: |-
- op: add
path: /spec/template/spec/containers/0/env/-
value:
name: OPERATOR_REGISTRY_IMAGE
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:666d717307ca7b2090893cfd2ff144dc26b5e0464c9e2d9416bb82b3ca075f58
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e7871d3413e864b9ec39d7cf0e99f6d8cdb8d4d38a8ae94819a45991deeced1d
- 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:2d85690e0649559e51c7c908da6bbbbd09b74b7d7c9e6926a3f166cd2dd6b0d4
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c0ba7123f81b89040e9983a390e8de66ef86f0ec3e29e791e86a6fc4f62af6ee
target:
kind: Deployment
labelSelector: app=catalog-operator
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,26 @@
images:
- name: quay.io/operator-framework/olm
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:6c9608b8fea2733bea9a33c0f0d57573b88c907b8b73772f2a3a8d24d8e9c6d9
digest: sha256:5c570c841b8c0bc5ee5819d8d3c1076fcebb1b3db41a84e81649c61d79b2f7ff
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:17b5b9b051cf9284aa0727959230cc44603a02eb4ae27afc84bbab3ee57b3f3a
digest: sha256:5a35360bb1662562cfb897f0a2a7a9d021a08d128bf337ecc1514bb519ab9e8c
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:fd5bd86600bc476209b7e98fb108ea05778cbe649cb90a45ca22ddc7261abe47
digest: sha256:567c279b2f8e171e921a163421f19ce971b0de1e5298a9cf675728f98f5fa53d

patches:
- patch: |-
- op: add
path: /spec/template/spec/containers/0/env/-
value:
name: OPERATOR_REGISTRY_IMAGE
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:17b5b9b051cf9284aa0727959230cc44603a02eb4ae27afc84bbab3ee57b3f3a
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5a35360bb1662562cfb897f0a2a7a9d021a08d128bf337ecc1514bb519ab9e8c
- 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:6c9608b8fea2733bea9a33c0f0d57573b88c907b8b73772f2a3a8d24d8e9c6d9
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5c570c841b8c0bc5ee5819d8d3c1076fcebb1b3db41a84e81649c61d79b2f7ff
target:
kind: Deployment
labelSelector: app=catalog-operator
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "4.16.0-0.nightly-arm64-2026-03-05-150049"
"base": "4.16.0-0.nightly-arm64-2026-03-21-032605"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2d85690e0649559e51c7c908da6bbbbd09b74b7d7c9e6926a3f166cd2dd6b0d4",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:666d717307ca7b2090893cfd2ff144dc26b5e0464c9e2d9416bb82b3ca075f58",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9660e6edbe06910e78d10a720b587c439af4f47f9d69bec2402fcb7c91316541"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c0ba7123f81b89040e9983a390e8de66ef86f0ec3e29e791e86a6fc4f62af6ee",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e7871d3413e864b9ec39d7cf0e99f6d8cdb8d4d38a8ae94819a45991deeced1d",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b00341b6f256ddd447df8aa4e380d3fd9524ed680b6028d4beefb78d9a3bf83f"
}
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "4.16.0-0.nightly-2026-03-02-150537"
"base": "4.16.0-0.nightly-2026-03-18-192836"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6c9608b8fea2733bea9a33c0f0d57573b88c907b8b73772f2a3a8d24d8e9c6d9",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:17b5b9b051cf9284aa0727959230cc44603a02eb4ae27afc84bbab3ee57b3f3a",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fd5bd86600bc476209b7e98fb108ea05778cbe649cb90a45ca22ddc7261abe47"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5c570c841b8c0bc5ee5819d8d3c1076fcebb1b3db41a84e81649c61d79b2f7ff",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5a35360bb1662562cfb897f0a2a7a9d021a08d128bf337ecc1514bb519ab9e8c",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:567c279b2f8e171e921a163421f19ce971b0de1e5298a9cf675728f98f5fa53d"
}
}
6 changes: 3 additions & 3 deletions assets/release/release-aarch64.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"release": {
"base": "4.16.0-0.nightly-arm64-2026-03-05-150049"
"base": "4.16.0-0.nightly-arm64-2026-03-21-032605"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d3c2e7e34d77bbc94a7ec05a3ce1dd1dc772fc92193ef17396d8d9dc206869ad",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5d99d041848d79d184aad1777693d24684d196cf600127cf76a20086fe3681f3",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f7ade3af84c4125bc68994408ff3fd1cc1a7ab9aa7970ed367146b6db6420686",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9660e6edbe06910e78d10a720b587c439af4f47f9d69bec2402fcb7c91316541",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b00341b6f256ddd447df8aa4e380d3fd9524ed680b6028d4beefb78d9a3bf83f",
"openssl": "registry.redhat.io/ubi9@sha256:ed84f34cd929ea6b0c247b6daef54dd79602804a32480a052951021caf429494",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9b246cf178eded47f0e623e446c09758336f8b0b88f105a8be612e22efc483f5",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:653206ee43028aa4e4304b5805b6da767db16911affd26bf4179a5e50df193dc",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6fb6de095ea3532d525e2e278b2e3456da13fbc94b177be608623966e2f84541",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ec3df995657a8905503c24050b58a7e719f6caba2708b13383cffeb8468bd076",
"topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:ce0c78c2867fb0b73c4911ae6afd5aaf9a413480cfcf4f31f46f2387c3df97e0",
Expand Down
8 changes: 4 additions & 4 deletions assets/release/release-x86_64.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
{
"release": {
"base": "4.16.0-0.nightly-2026-03-02-150537"
"base": "4.16.0-0.nightly-2026-03-18-192836"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a55b94f1ed53a75164f0266529c89b821ce0b15cc33fb9f472b4df66e87e81df",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:82166c80a11d10dc8db6152d023f839142132ae2ccb6f28f7664e31e103e449d",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0fc0cb9c0104d0cc63374bc62eaebfa1c6ae51854f9641a61b01bbe88b81a024",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:32346b5ba3ea5514e2aef76c92e0113272d84e430c0bca75606b3a6fdf67b05d",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fd5bd86600bc476209b7e98fb108ea05778cbe649cb90a45ca22ddc7261abe47",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:567c279b2f8e171e921a163421f19ce971b0de1e5298a9cf675728f98f5fa53d",
"openssl": "registry.redhat.io/ubi9@sha256:ed84f34cd929ea6b0c247b6daef54dd79602804a32480a052951021caf429494",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e5c6560e6556de5375adfa0bae864285814dba95b467d470b30688ee8c0be85f",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:22e2a2e56971689dc0d750fd293fadeedd25d156e31fa86e93112f8ae9335c14",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:382a785a55e5af76400b35f23f5612c5ff841d37c51a38ee1b01212fb9280099",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a0f2a874bcad541b6a48edef47ca4082d72abf80839600d30a1b29acfd03789c",
"topolvm_csi": "registry.redhat.io/lvms4/topolvm-rhel9@sha256:ce0c78c2867fb0b73c4911ae6afd5aaf9a413480cfcf4f31f46f2387c3df97e0",
Expand Down
21 changes: 19 additions & 2 deletions scripts/auto-rebase/changelog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
- machine-config-operator embedded-component 67c9ad546b13e9f04f96524c8bbbb405725b7d61 to db322cdf1be3b509603c7e6920ea7864728589f4
- 6fe89999 2026-02-23T23:15:11+00:00 fixes exposure of sensitive data in log files
- cluster-kube-apiserver-operator embedded-component 511bc434f628cf364966b53a5d350908e51d4b9c to d0b79035dcec4011d4968e4701f8ff13d921cf2e
- 60d7745 2026-02-11T16:06:33+00:00 OCPBUGS-68064: CVE-2025-65637 openshift4/ose-cluster-kube-apiserver-rhel9-operator: github.com/sirupsen/logrus: Denial-of-Service due to large single-line payload [openshift-4.16.z]

- cluster-kube-scheduler-operator embedded-component 630f63bc7a30d2662bbb5115233144079de6eef6 to 39dd141c918da30da848fdb87ee333f909a16b84
- 332e97c 2026-03-03T14:46:12+01:00 chore: update OWNERS

- machine-config-operator embedded-component db322cdf1be3b509603c7e6920ea7864728589f4 to 78fbacbd0f5193fd96d988dc861f92152ce9bbd2
- 277326a4 2026-02-24T22:30:18+00:00 fix pull secret log spam make verify error

- operator-framework-olm embedded-component 5a6ac6fc8284c8ed88db3e2ce42d845cccf95c16 to ba51f79a26f4e32659da4627cb3c577d924ac8f4
- 72d3e6f3 2026-03-09T00:46:17+00:00 Remove the collect-profiles info from the microshift kustomization file

- ovn-kubernetes image-amd64 6c926c1045cf177a1790b1321aa466857d7228b8 to 691532c6b15c410686e6ca9048f27d8a819d3d0c
- b47b0d7c 2026-03-03T23:41:14+05:30 Add a e2e test for NodePort service
- 1fe7b3bd 2026-03-03T23:40:25+05:30 Clear stale conntrack UDP entries for nodePorts

- ovn-kubernetes image-arm64 6c926c1045cf177a1790b1321aa466857d7228b8 to 691532c6b15c410686e6ca9048f27d8a819d3d0c
- b47b0d7c 2026-03-03T23:41:14+05:30 Add a e2e test for NodePort service
- 1fe7b3bd 2026-03-03T23:40:25+05:30 Clear stale conntrack UDP entries for nodePorts

12 changes: 6 additions & 6 deletions scripts/auto-rebase/commits.txt
Original file line number Diff line number Diff line change
@@ -1,19 +1,19 @@
https://github.com/openshift/cluster-csi-snapshot-controller-operator embedded-component 439826e1a723c094717877db0f2ca1848d0fb10a
https://github.com/openshift/cluster-dns-operator embedded-component a4b1cfb4927052f4e21e919d0af05f78ca4fcace
https://github.com/openshift/cluster-ingress-operator embedded-component 1708977af70b2de62642dadd29d6f2f25a0240fd
https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 511bc434f628cf364966b53a5d350908e51d4b9c
https://github.com/openshift/cluster-kube-apiserver-operator embedded-component d0b79035dcec4011d4968e4701f8ff13d921cf2e
https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component b3faac1f48914e94fa9af074f387c871dad84a9c
https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 630f63bc7a30d2662bbb5115233144079de6eef6
https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 39dd141c918da30da848fdb87ee333f909a16b84
https://github.com/openshift/cluster-network-operator embedded-component ab21214d8dc49e36a0b69620484c55d22ddeb02d
https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component 2ed3cf9965f8e6832cffde84f3de2fe210b79b49
https://github.com/openshift/cluster-policy-controller embedded-component eaea543f4c845a7b65705f12e162cc121bb12f88
https://github.com/openshift/csi-external-snapshotter embedded-component ee32ba01e1f89bac057611ad4580589652f250a3
https://github.com/openshift/etcd embedded-component e7911c0d19925c0a67328052a8580a80fb40cb5b
https://github.com/openshift/kubernetes embedded-component 41c4e9ba94f4f1bfece6b81f287a9e3cf63e79cd
https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 6f2133209d90d822e79d679ed483eeb755ceaaf8
https://github.com/openshift/machine-config-operator embedded-component db322cdf1be3b509603c7e6920ea7864728589f4
https://github.com/openshift/machine-config-operator embedded-component 78fbacbd0f5193fd96d988dc861f92152ce9bbd2
https://github.com/openshift/openshift-controller-manager embedded-component 90f73f7ea939b221b79684ebe6d2feb843fc1f83
https://github.com/openshift/operator-framework-olm embedded-component 5a6ac6fc8284c8ed88db3e2ce42d845cccf95c16
https://github.com/openshift/operator-framework-olm embedded-component ba51f79a26f4e32659da4627cb3c577d924ac8f4
https://github.com/openshift/route-controller-manager embedded-component 5da234dd58c092cba019807979f9c29664ddb860
https://github.com/openshift/service-ca-operator embedded-component 538c7b98a689e573b61e1abb1cb649da470c5fac
https://github.com/openshift/oc image-amd64 6f88b5846ab96ac1808c20038646d4dd669395cb
Expand All @@ -23,7 +23,7 @@ https://github.com/openshift/csi-external-snapshotter image-amd64 ee32ba01e1f89b
https://github.com/openshift/csi-external-snapshotter image-amd64 ee32ba01e1f89bac057611ad4580589652f250a3
https://github.com/openshift/router image-amd64 7c4b47201b75421631739feb42e7ae86ae047739
https://github.com/openshift/kube-rbac-proxy image-amd64 c38f4734c6b6931c75d46674122fb4b838b6e64b
https://github.com/openshift/ovn-kubernetes image-amd64 6c926c1045cf177a1790b1321aa466857d7228b8
https://github.com/openshift/ovn-kubernetes image-amd64 691532c6b15c410686e6ca9048f27d8a819d3d0c
https://github.com/openshift/kubernetes image-amd64 41c4e9ba94f4f1bfece6b81f287a9e3cf63e79cd
https://github.com/openshift/service-ca-operator image-amd64 538c7b98a689e573b61e1abb1cb649da470c5fac
https://github.com/openshift/oc image-arm64 6f88b5846ab96ac1808c20038646d4dd669395cb
Expand All @@ -33,6 +33,6 @@ https://github.com/openshift/csi-external-snapshotter image-arm64 ee32ba01e1f89b
https://github.com/openshift/csi-external-snapshotter image-arm64 ee32ba01e1f89bac057611ad4580589652f250a3
https://github.com/openshift/router image-arm64 7c4b47201b75421631739feb42e7ae86ae047739
https://github.com/openshift/kube-rbac-proxy image-arm64 c38f4734c6b6931c75d46674122fb4b838b6e64b
https://github.com/openshift/ovn-kubernetes image-arm64 6c926c1045cf177a1790b1321aa466857d7228b8
https://github.com/openshift/ovn-kubernetes image-arm64 691532c6b15c410686e6ca9048f27d8a819d3d0c
https://github.com/openshift/kubernetes image-arm64 41c4e9ba94f4f1bfece6b81f287a9e3cf63e79cd
https://github.com/openshift/service-ca-operator image-arm64 538c7b98a689e573b61e1abb1cb649da470c5fac
2 changes: 1 addition & 1 deletion scripts/auto-rebase/last_rebase.sh
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
#!/bin/bash -x
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.16.0-0.nightly-2026-03-02-150537" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.16.0-0.nightly-arm64-2026-03-05-150049"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.16.0-0.nightly-2026-03-18-192836" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.16.0-0.nightly-arm64-2026-03-21-032605"