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.18.0-0.nightly-arm64-2026-01-12-035301
OCP_VERSION := 4.18.0-0.nightly-arm64-2026-01-14-232456
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:f866a3522335d552e202e4e9ed37c41d2417441d7cf1562eb9429c2813cb7359
digest: sha256:deb2eebaeff01d5ad4241313aa7295163a27d0b87694ef2dc3b0ea7ef6587eee
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:d04b6e8115c268cf7b9bd5f90e3d80ebfde9592e42672fa7fee255b71739f632
digest: sha256:359850b757cc59b0bb60793c065c77aaca7cfa185989b06bfdf01a005cb6cccf
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.18.0-0.nightly-arm64-2026-01-12-035301"
"base": "4.18.0-0.nightly-arm64-2026-01-14-232456"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f866a3522335d552e202e4e9ed37c41d2417441d7cf1562eb9429c2813cb7359",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d04b6e8115c268cf7b9bd5f90e3d80ebfde9592e42672fa7fee255b71739f632"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:deb2eebaeff01d5ad4241313aa7295163a27d0b87694ef2dc3b0ea7ef6587eee",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:359850b757cc59b0bb60793c065c77aaca7cfa185989b06bfdf01a005cb6cccf"
}
}
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:0924d88652b3958e88f859b206fb17e49567069af151ae8ee2b3f87dfb58cba1
digest: sha256:d773980e58f53a75838869abf2438a1d312e52bf78c753466020f6f2fff053a8
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:b99375b2de2663cc92507f06fd60d4043e9c02ca786f8682303809fbe8077715
digest: sha256:212099c5f12e9af7cfdf634becd58dfd6ba400beebc0effecfff65f97d83cd3b
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:a2dd2271181dad3ec452e11d1dc88fe3fcb8906e090ebf8987e91a10dfa4b2a8
digest: sha256:d3ba0cab31f171dd3e5a9b9eebdc3ba016dfd87b7fb35e02cad6d9fbac876dea

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:b99375b2de2663cc92507f06fd60d4043e9c02ca786f8682303809fbe8077715
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:212099c5f12e9af7cfdf634becd58dfd6ba400beebc0effecfff65f97d83cd3b
- 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:0924d88652b3958e88f859b206fb17e49567069af151ae8ee2b3f87dfb58cba1
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d773980e58f53a75838869abf2438a1d312e52bf78c753466020f6f2fff053a8
target:
kind: Deployment
labelSelector: app=catalog-operator
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "4.18.0-0.nightly-arm64-2026-01-12-035301"
"base": "4.18.0-0.nightly-arm64-2026-01-14-232456"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0924d88652b3958e88f859b206fb17e49567069af151ae8ee2b3f87dfb58cba1",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b99375b2de2663cc92507f06fd60d4043e9c02ca786f8682303809fbe8077715",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a2dd2271181dad3ec452e11d1dc88fe3fcb8906e090ebf8987e91a10dfa4b2a8"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d773980e58f53a75838869abf2438a1d312e52bf78c753466020f6f2fff053a8",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:212099c5f12e9af7cfdf634becd58dfd6ba400beebc0effecfff65f97d83cd3b",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d3ba0cab31f171dd3e5a9b9eebdc3ba016dfd87b7fb35e02cad6d9fbac876dea"
}
}
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.18.0-0.nightly-arm64-2026-01-12-035301"
"base": "4.18.0-0.nightly-arm64-2026-01-14-232456"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0274f022a5ac53157e8e5471ee6581dbc5c4eec055637f8f3191408c5ed52055",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:15da8db827e8b5e3b58e10713900baf4a33ba3c4e21e3a2664f4f5f996007475",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:768f03e31797c32e33a025b86bbe9f73038852938bdd0a74068ef63acec28578",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a2dd2271181dad3ec452e11d1dc88fe3fcb8906e090ebf8987e91a10dfa4b2a8",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ed90704b0ee824200d00d385130dde30251bbae76912a1a2159fd3e041090c0c",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:44589b421474318c6743789971921e6d74095873e3a74db0ff5f4380ba6a8e84",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2ceb24dcab0a2f4b58ba01765e7ad6beb67445a710cfb6f81991bae281c5d4af",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a487c7f2a591bd5e5a0f8853879f18d141a432edcbc5fc34a23e43663ec6e257",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3f12e99468e4fcfc93324cab159aa659a69762dced8cf88a6a2cc185ad2b9eff",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a9d7d222f14e8f525bccdd432109a6ad6a0d4739a74e61eddc528c09342501ee",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d3ba0cab31f171dd3e5a9b9eebdc3ba016dfd87b7fb35e02cad6d9fbac876dea",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6751d98158f2fea0451187e910ecc558dc80baabc6f7d238a4b5143818b48f3c",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4b9aa7adedb9731fbd66ed6cf5d2e6a1d23a5e3defba65dd47b2a5b5da710c5f",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6b4e0ee4d9a1c08d56607b03ad48b66e5fe49d70a129b79b137c59d94951107c",
"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:d2c3b82e209026996e93f202ebd6f3b1b337d1759f8c92ec4e130c56a92f2e84"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c02a4b70c083cfc909e85356296ba6ecd6a2d036ee45bb1a5c191628e8058dce"
}
}
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:44589b421474318c6743789971921e6d74095873e3a74db0ff5f4380ba6a8e84"
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4b9aa7adedb9731fbd66ed6cf5d2e6a1d23a5e3defba65dd47b2a5b5da710c5f"
pause_image_auth_file = "/etc/crio/openshift-pull-secret"
pause_command = "/usr/bin/pod"
3 changes: 0 additions & 3 deletions scripts/auto-rebase/changelog.txt
Original file line number Diff line number Diff line change
@@ -1,3 +0,0 @@
- ovn-kubernetes image-arm64 45c973d9aeb907885878f92e3e16a142427e8477 to 70a2d777ecb661c3267d24092381518f0420fa9a
- 0eb16983 2025-11-26T14:56:03+08:00 Fix conntrack reconciliation to use service port instead of endpoint port

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.18.0-0.nightly-2026-01-08-115801" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2026-01-12-035301"
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.18.0-0.nightly-2026-01-08-115801" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.18.0-0.nightly-arm64-2026-01-14-232456"