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.20.0-0.nightly-arm64-2026-01-11-220946
OCP_VERSION := 4.20.0-0.nightly-arm64-2026-01-15-004507
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.20.0-0.nightly-2026-01-08-043322
OCP_VERSION := 4.20.0-0.nightly-2026-01-13-225320
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:821a546a87e9b50cb1725e0021a5deee571d43fff5a4e03cdad1751d71156035
digest: sha256:80d5ec1847996bd9f136f5bfa3655ff957b56307fa96912d2108a068853608eb
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:79e4ab0f20e25d3b12363976f70dec625c786df1dd7289a73e448da4ea671623
digest: sha256:00b9a9e593418ae5a37cb780bcc280a3dbc5e36e1b298ca9163ab3f75266115e
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:24127f76ac73fde9fe95b252da059e950162e582df9fa9feca94886e35db88da
digest: sha256:2d927817c5bb898f2ad46efae681e24aa759001bddf4932c6907504692991e41

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:79e4ab0f20e25d3b12363976f70dec625c786df1dd7289a73e448da4ea671623
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:00b9a9e593418ae5a37cb780bcc280a3dbc5e36e1b298ca9163ab3f75266115e
- 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:821a546a87e9b50cb1725e0021a5deee571d43fff5a4e03cdad1751d71156035
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:80d5ec1847996bd9f136f5bfa3655ff957b56307fa96912d2108a068853608eb
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:9321bb549b5a61a283222a4347383ca5cbddc5aa6994eb513050ee1ec8fd5d4a
digest: sha256:944d413e70965f34a6f9129560bb144e7777274bac5711d7df8ebcbce2125535
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:dbff67a0ba89d42be9922495beafaf5043ba01c1ea1cd92bfa0f3e6a139ec2d8
digest: sha256:d456cd94a33bccacf2e75649c628169d398df9d668e768c1edc8cd34d5c34086
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:d211689c6fca13bcba2091e9a6ca3e4bc37c1bc1b8bbbb2f0278767868093fb9
digest: sha256:b6dd9541ca448fe12af3991fa58d37afb74cdeb8b13beed7badccff1261d344b

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:dbff67a0ba89d42be9922495beafaf5043ba01c1ea1cd92bfa0f3e6a139ec2d8
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d456cd94a33bccacf2e75649c628169d398df9d668e768c1edc8cd34d5c34086
- 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:9321bb549b5a61a283222a4347383ca5cbddc5aa6994eb513050ee1ec8fd5d4a
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:944d413e70965f34a6f9129560bb144e7777274bac5711d7df8ebcbce2125535
target:
kind: Deployment
labelSelector: app=catalog-operator
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "4.20.0-0.nightly-arm64-2026-01-11-220946"
"base": "4.20.0-0.nightly-arm64-2026-01-15-004507"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:821a546a87e9b50cb1725e0021a5deee571d43fff5a4e03cdad1751d71156035",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:79e4ab0f20e25d3b12363976f70dec625c786df1dd7289a73e448da4ea671623",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:24127f76ac73fde9fe95b252da059e950162e582df9fa9feca94886e35db88da"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:80d5ec1847996bd9f136f5bfa3655ff957b56307fa96912d2108a068853608eb",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:00b9a9e593418ae5a37cb780bcc280a3dbc5e36e1b298ca9163ab3f75266115e",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2d927817c5bb898f2ad46efae681e24aa759001bddf4932c6907504692991e41"
}
}
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "4.20.0-0.nightly-2026-01-08-043322"
"base": "4.20.0-0.nightly-2026-01-13-225320"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9321bb549b5a61a283222a4347383ca5cbddc5aa6994eb513050ee1ec8fd5d4a",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dbff67a0ba89d42be9922495beafaf5043ba01c1ea1cd92bfa0f3e6a139ec2d8",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d211689c6fca13bcba2091e9a6ca3e4bc37c1bc1b8bbbb2f0278767868093fb9"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:944d413e70965f34a6f9129560bb144e7777274bac5711d7df8ebcbce2125535",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d456cd94a33bccacf2e75649c628169d398df9d668e768c1edc8cd34d5c34086",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b6dd9541ca448fe12af3991fa58d37afb74cdeb8b13beed7badccff1261d344b"
}
}
18 changes: 9 additions & 9 deletions assets/release/release-aarch64.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"release": {
"base": "4.20.0-0.nightly-arm64-2026-01-11-220946"
"base": "4.20.0-0.nightly-arm64-2026-01-15-004507"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e5e6bdfdcd4325856d18f779a6c341e69562712200156a463613a096f1769b59",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:92200844d0c49f8ce67942a4ff36f073d74f8797fa3f52fefffdd7997e5b28dc",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:eab47e3a20c629e5c2f1154afadd4f9cd9703641d2d085923e68d8c4d2f7088e",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:24127f76ac73fde9fe95b252da059e950162e582df9fa9feca94886e35db88da",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:59fe8a463d7d9812de26d1cb8bdb1ccc6e56380ba0131ce839923592d516f267",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:73fd8fc33cc9daa3eb3a54b48e30f3db650d37e0355dc9472d8ccda6741c5707",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7750c95956405a0c086587cc9c92e77ce96d2524534ea5d5bf39e6649f25d155",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5c1f3f256b7200255c011b62f45c93819ea131186624bcada2f1633fe2ecb7e0",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0a4393d4a8bc521436e69571231fd83c5a400abd6fa509d1a63683de4fb683bb",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:81f242d864beb24af9bfc9c6be7b61760e152ad8d6f659dee6c7a6cf00ad43d8",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2d927817c5bb898f2ad46efae681e24aa759001bddf4932c6907504692991e41",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cbca2538c631649862724f184180f5c112ce8cda4ce93514675cc6325892b80d",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1577448c758068ace55fc89c63219e3ef82b871bf2ad2d46da9bacee9313a50f",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c55bc171bc0bc1856130f195b848cea99a0a12c6f139b2c88362c9335c225561",
"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:27035fb019b662a15df7081ede462ef1cbb563b80ce38dcc93ca8854f00a7375"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fc63d233de1ab5de0d22a3d54b48ef934a8dc8cdbf9074c496a511232e41fcd2"
}
}
18 changes: 9 additions & 9 deletions assets/release/release-x86_64.json
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"release": {
"base": "4.20.0-0.nightly-2026-01-08-043322"
"base": "4.20.0-0.nightly-2026-01-13-225320"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bdfac0956fcbcf77fcc2d7921bf92ba6ab1636127060776fd9340d8bf6602a34",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0b8c13edbf1678c977192c7fae7e46a4043676dd6476a4459aa1956684e1ab78",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4b9f14cf36ebd43400771dbd370556c107f276a63df5190448cb43258edebca9",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d211689c6fca13bcba2091e9a6ca3e4bc37c1bc1b8bbbb2f0278767868093fb9",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:15bea4558e19d3560456c14c75062eddd4905ebecab584dc4045909e034019a3",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:66b21dd12650a5ca7692e616aa9074e259939671191d30e79c505788b3cfad8e",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:84a95fa06a3867fd716469f9709abdceffbfa8a912df069dc58a28ad0f879245",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6dab38d2826ec666ff0c67358425952e0e33c76b97546b29659bb0e887e97808",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a3f25936f1b2d622a23a4804fdd85a31643997c0ba84b60370dee996943e0903",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:394f9cdf6bee0ab93fce7c861dc745e8612e6878f302a6d7ec179faef3ee3b32",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b6dd9541ca448fe12af3991fa58d37afb74cdeb8b13beed7badccff1261d344b",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:63b079b0161aeed28296dacceeb7a426a509b7b7aa83c45690591302a17fd39a",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:23f81b597b1787f0cf7a77fd7583e4eb19a793041da1e79828e3ce35de65e282",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:16f5113f33257dab152668e9b16beafa85763823c5927f6906254940a5a678ae",
"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:c0ca2fe1b5a902d5713455cddd7dd2bc60f438ce71008fbd6a5a020a7700981c"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:078bc5812cece9bf649128cf9d27f5996dc7ed0d5eb99b8997df8169d6805dd2"
}
}
2 changes: 1 addition & 1 deletion packaging/crio.conf.d/10-microshift_amd64.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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:66b21dd12650a5ca7692e616aa9074e259939671191d30e79c505788b3cfad8e"
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:23f81b597b1787f0cf7a77fd7583e4eb19a793041da1e79828e3ce35de65e282"
pause_image_auth_file = "/etc/crio/openshift-pull-secret"
pause_command = "/usr/bin/pod"
2 changes: 1 addition & 1 deletion packaging/crio.conf.d/10-microshift_arm64.conf
Original file line number Diff line number Diff line change
Expand Up @@ -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:73fd8fc33cc9daa3eb3a54b48e30f3db650d37e0355dc9472d8ccda6741c5707"
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1577448c758068ace55fc89c63219e3ef82b871bf2ad2d46da9bacee9313a50f"
pause_image_auth_file = "/etc/crio/openshift-pull-secret"
pause_command = "/usr/bin/pod"
17 changes: 4 additions & 13 deletions scripts/auto-rebase/changelog.txt
Original file line number Diff line number Diff line change
@@ -1,15 +1,6 @@
- api embedded-component 1cb53e34ca33d020c765093c21c9b7f4502cbea7 to 50517c6f4bfdbf9fc2cb291fd97cce150a3237ca
- b93b7907 2025-10-23T13:58:30+03:00 network, virt: graduate preconfigured UDN addresses feature gate
- cluster-network-operator embedded-component dbd9826dbe5373bd3605dfef606d118ffc65b830 to b54bbb1659c4078cb467b69d260f5eee100c6284
- 6386725 2026-01-12T17:27:12+00:00 OCPBUGS-72411: use net.JoinHostPort for URL construction

- cluster-network-operator embedded-component 698e349cb60e84967bf93345d1b0802dd15ccc1a to dbd9826dbe5373bd3605dfef606d118ffc65b830
- ec1f517 2025-12-18T09:55:06+02:00 Add kubevirt platform to dual-stack supported platforms

- machine-config-operator embedded-component 5c5e056e2484d1e3265eef638f2a326958b166f5 to 8af0c84e6fcc34c60768b3955366a78a440b7a85
- 704f74a5 2026-01-06T16:15:48+05:30 Remove the dead code of setting the operator status for cgroupv1 clusters
- 84ef367e 2026-01-05T09:49:43-05:00 msbic: skip update if arch annotation not found
- 4a1982eb 2026-01-05T09:46:34-05:00 boot_image: add event based queueing
- 6cb98619 2026-01-05T09:46:18-05:00 controller: rename msbic to boot image controller

- ovn-kubernetes image-amd64 6c78b6defbd606f8fdf002d7cc37e3d49c7bcd98 to 1faf1ac5bb2e604f745d93a5fe70bec93024ad7f
- 0eb16983 2025-11-26T14:56:03+08:00 Fix conntrack reconciliation to use service port instead of endpoint port
- machine-config-operator embedded-component 8af0c84e6fcc34c60768b3955366a78a440b7a85 to 117708020d5d2549b72a2046aebfdc0064dd8d41
- f6941f67 2025-12-17T22:08:24+00:00 OCPBUGS-59925: Fix keepalived SIGTERM handling

4 changes: 2 additions & 2 deletions scripts/auto-rebase/commits.txt
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,14 @@ https://github.com/openshift/cluster-ingress-operator embedded-component 24ef5ae
https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 974542ae2ef86a631546b3a48fd0da3c2e3b74dd
https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component 438c9dba80ddadeabe9efe4a654297a7b550b2b8
https://github.com/openshift/cluster-kube-scheduler-operator embedded-component 58cbd296eecc61c0871739588ae65af9c05e87a6
https://github.com/openshift/cluster-network-operator embedded-component dbd9826dbe5373bd3605dfef606d118ffc65b830
https://github.com/openshift/cluster-network-operator embedded-component b54bbb1659c4078cb467b69d260f5eee100c6284
https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component aa455c043152123595c2b4f72e02279aad9dd48a
https://github.com/openshift/cluster-policy-controller embedded-component 47c783103216aa5e1242632127a5d8f98b8b7455
https://github.com/openshift/csi-external-snapshotter embedded-component 42604822c25eb2aa0ecb017c24e328221b238eb9
https://github.com/openshift/etcd embedded-component eac09c01677bb03daed156d407be27785fd61e0d
https://github.com/openshift/kubernetes embedded-component 33a825ebe5da727e8ccce0fb3c9d33fce7c6bdd9
https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 0f8a4eb84ace9b746cf25d51d80dacf34ca5f953
https://github.com/openshift/machine-config-operator embedded-component 8af0c84e6fcc34c60768b3955366a78a440b7a85
https://github.com/openshift/machine-config-operator embedded-component 117708020d5d2549b72a2046aebfdc0064dd8d41
https://github.com/openshift/openshift-controller-manager embedded-component d9e543dd31e981f279c447e4f92f0dac3f665f9e
https://github.com/openshift/operator-framework-olm embedded-component 0d95a7ef5d73153f5593e67bc41c0c7a53567ee6
https://github.com/openshift/route-controller-manager embedded-component bf2fa662f57f233d8541f94c4953e0dcd7a5ab20
Expand Down
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.20.0-0.nightly-2026-01-08-043322" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.20.0-0.nightly-arm64-2026-01-11-220946"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.20.0-0.nightly-2026-01-13-225320" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.20.0-0.nightly-arm64-2026-01-15-004507"