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.17.0-0.nightly-arm64-2026-01-11-221853
OCP_VERSION := 4.17.0-0.nightly-arm64-2026-01-14-203227
4 changes: 2 additions & 2 deletions assets/optional/multus/kustomization.aarch64.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
images:
- name: multus-cni-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:47e7aec7f0f64f0742e52fbd43100901f46c0c4747af9b143d451c6f7591bd87
digest: sha256:9b2ac5c38a95ffda2bb6e40d0168d94183e7cad2da02cc3daecbb7e790b6f93e
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:bbdeecb54759eed227d558a5bdf945a82cc8872b0e78016a983013e4b35d529c
digest: sha256:dc77ee000b0904922c06c4ca01d1e9922d72891c358474709eb5f859b74b69d6
6 changes: 3 additions & 3 deletions assets/optional/multus/release-multus-aarch64.json
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"release": {
"base": "4.17.0-0.nightly-arm64-2026-01-11-221853"
"base": "4.17.0-0.nightly-arm64-2026-01-14-203227"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:47e7aec7f0f64f0742e52fbd43100901f46c0c4747af9b143d451c6f7591bd87",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bbdeecb54759eed227d558a5bdf945a82cc8872b0e78016a983013e4b35d529c"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9b2ac5c38a95ffda2bb6e40d0168d94183e7cad2da02cc3daecbb7e790b6f93e",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dc77ee000b0904922c06c4ca01d1e9922d72891c358474709eb5f859b74b69d6"
}
}
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:48b4c18573d6353f44d0fb0b16eb35da699600da2b1e6be58829928d1c87036a
digest: sha256:a1d4cf42bceb3e6a4815dc7f665a3a577d6fe06db8f9eaec973da25a81f20344
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:157cfed42566dc150ef35bab937d74adcc48c4fcaf1dc100225ccc5c14dff627
digest: sha256:c0876b2485bba3c6b51a0084237a10b17cbc660663eafef423c56419f19a169d
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:9c2da680964ee8f556932eccf6805cf795e18a373020be3bd3fe61be829c7251
digest: sha256:1f0cce74be4ddeaec91630fe523ffc18556a01ae2ac9e22dadd8e24277bda65a

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:157cfed42566dc150ef35bab937d74adcc48c4fcaf1dc100225ccc5c14dff627
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c0876b2485bba3c6b51a0084237a10b17cbc660663eafef423c56419f19a169d
- 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:48b4c18573d6353f44d0fb0b16eb35da699600da2b1e6be58829928d1c87036a
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a1d4cf42bceb3e6a4815dc7f665a3a577d6fe06db8f9eaec973da25a81f20344
target:
kind: Deployment
labelSelector: app=catalog-operator
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "4.17.0-0.nightly-arm64-2026-01-11-221853"
"base": "4.17.0-0.nightly-arm64-2026-01-14-203227"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:48b4c18573d6353f44d0fb0b16eb35da699600da2b1e6be58829928d1c87036a",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:157cfed42566dc150ef35bab937d74adcc48c4fcaf1dc100225ccc5c14dff627",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9c2da680964ee8f556932eccf6805cf795e18a373020be3bd3fe61be829c7251"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a1d4cf42bceb3e6a4815dc7f665a3a577d6fe06db8f9eaec973da25a81f20344",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c0876b2485bba3c6b51a0084237a10b17cbc660663eafef423c56419f19a169d",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1f0cce74be4ddeaec91630fe523ffc18556a01ae2ac9e22dadd8e24277bda65a"
}
}
20 changes: 10 additions & 10 deletions assets/release/release-aarch64.json
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"release": {
"base": "4.17.0-0.nightly-arm64-2026-01-11-221853"
"base": "4.17.0-0.nightly-arm64-2026-01-14-203227"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:314e19710862e67a377fec4020cc0f7687e86575d0ed2f34a71bfdd95eb7012a",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7cd556c0e71a319134b603102ecea38b07ba380184360622a452c1a4d0563825",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7a8ae0542fc345cf9a780a07a86fc0173bc1b4d355265b8306fb61c4d30792ae",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9c2da680964ee8f556932eccf6805cf795e18a373020be3bd3fe61be829c7251",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fc22694811fa0cce5f6e728173826b32a8695ce819021c637e4635a2a5ba5559",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9de8314195c7065bd094b76e358841c5bd39c1460b13c402a53cdcb71aee65a9",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a10a921fbe4eab416fa362f2fa7a0100b5311f839f8d944dc250748747987845",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a2f4cf9accdf41e869afac3801881f2c523c1b94cb401e4c618f41c315cc5f47",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:257557b9f4a28c6dd8e9d43b007d563649c1f53a120154f5ad5602abf14e5e50",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f833006c803eb2568db59d7383ce99ee399eb8cf6779f7ddf8128a8aed078dce",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1f0cce74be4ddeaec91630fe523ffc18556a01ae2ac9e22dadd8e24277bda65a",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5950e0b8f5260ba9a0c65051dc6acd38aa7f5b7c04275a0aecb4055b82b4202c",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0b35f08d6b65e25aacbf7ab4e8a301deea0770a46e2eee1a6cfdaeb4a3160008",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f14493032189e265d853caecaef90614f5aacd93533622ccd8ed5a150d874afe",
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b3482c354371c262c4f9fcb329dbc7f6f204bf67dabeb1fd3aecb5ae304679e0",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6b3776fecce3413845453b709c7254a3c6e8a44bdc55ec76f6b5579e3923953b"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:377c3b4002341a3d0bc7fc4a2363d24a478b61f1297f8b9a074392b360e0c8fa",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a73b3fbd46d12b57ce7a136fb23ce9cb0adb0dbb21d04c90acbddceba49fc166"
}
}
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 @@ -25,6 +25,6 @@ plugin_dirs = [
# 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:9de8314195c7065bd094b76e358841c5bd39c1460b13c402a53cdcb71aee65a9"
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0b35f08d6b65e25aacbf7ab4e8a301deea0770a46e2eee1a6cfdaeb4a3160008"
pause_image_auth_file = "/etc/crio/openshift-pull-secret"
pause_command = "/usr/bin/pod"
5 changes: 2 additions & 3 deletions scripts/auto-rebase/changelog.txt
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
- ovn-kubernetes image-arm64 5190b4a6433b4a18f29ba1a5df541ba95e225e04 to 6b42cd2527741cec0876136e986011a648934647
- 5bf99c79 2026-01-07T15:22:29+05:30 MultiNetPol: Process update only when spec fields and/or related annotations are updated
- a9f8d6f4 2026-01-07T15:04:17+05:30 NetPol: Process update only when spec fields and/or related annotation are updated
- ovn-kubernetes image-arm64 6b42cd2527741cec0876136e986011a648934647 to fc112155baeb6423e0b9969e08bb1160d736f43f
- a332dcf8 2025-12-18T07:37:04+02:00 OCPBUGS-68144: CVE-2025-65637 Bump github.com/sirupsen/logrus to v1.9.1 through indirect dependency conversion

2 changes: 1 addition & 1 deletion scripts/auto-rebase/commits.txt
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,6 @@ https://github.com/openshift/csi-external-snapshotter image-arm64 080f6bdb8ffdbf
https://github.com/openshift/csi-external-snapshotter image-arm64 080f6bdb8ffdbfe2556370ce5bc95ac973e1ad95
https://github.com/openshift/router image-arm64 1e29d8cc87a1c9e6645a4b9aa01197d90e366152
https://github.com/openshift/kube-rbac-proxy image-arm64 f708b5ecf87b948864e4f68d0724cda5de13a9d9
https://github.com/openshift/ovn-kubernetes image-arm64 6b42cd2527741cec0876136e986011a648934647
https://github.com/openshift/ovn-kubernetes image-arm64 fc112155baeb6423e0b9969e08bb1160d736f43f
https://github.com/openshift/kubernetes image-arm64 ef8f548afe29ceeb65b386ed968bf33d17e4b7c2
https://github.com/openshift/service-ca-operator image-arm64 6ce6cceb6618a193b7a61b9bfbc7f559187dbb9e
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.17.0-0.nightly-2026-01-08-141429" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2026-01-11-221853"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.17.0-0.nightly-2026-01-08-141429" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.17.0-0.nightly-arm64-2026-01-14-203227"