Skip to content

Commit 0f2a22d

Browse files
microshift-rebase-script[bot]ci-robot
andauthored
NO-ISSUE: rebase-release-4.18-4.18.0-0.nightly-2026-01-08-115801_amd64-2026-01-08_arm64-2026-01-14 (#6086)
* update last_rebase.sh * update changelog * update component images * update manifests * update buildfiles --------- Co-authored-by: ci-robot <ci-robot@openshift.io>
1 parent c31f177 commit 0f2a22d

9 files changed

Lines changed: 26 additions & 29 deletions

File tree

Makefile.version.aarch64.var

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
OCP_VERSION := 4.18.0-0.nightly-arm64-2026-01-12-035301
1+
OCP_VERSION := 4.18.0-0.nightly-arm64-2026-01-14-232456

assets/optional/multus/kustomization.aarch64.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
images:
33
- name: multus-cni-microshift
44
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
5-
digest: sha256:f866a3522335d552e202e4e9ed37c41d2417441d7cf1562eb9429c2813cb7359
5+
digest: sha256:deb2eebaeff01d5ad4241313aa7295163a27d0b87694ef2dc3b0ea7ef6587eee
66
- name: containernetworking-plugins-microshift
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:d04b6e8115c268cf7b9bd5f90e3d80ebfde9592e42672fa7fee255b71739f632
8+
digest: sha256:359850b757cc59b0bb60793c065c77aaca7cfa185989b06bfdf01a005cb6cccf
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"release": {
3-
"base": "4.18.0-0.nightly-arm64-2026-01-12-035301"
3+
"base": "4.18.0-0.nightly-arm64-2026-01-14-232456"
44
},
55
"images": {
6-
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f866a3522335d552e202e4e9ed37c41d2417441d7cf1562eb9429c2813cb7359",
7-
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d04b6e8115c268cf7b9bd5f90e3d80ebfde9592e42672fa7fee255b71739f632"
6+
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:deb2eebaeff01d5ad4241313aa7295163a27d0b87694ef2dc3b0ea7ef6587eee",
7+
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:359850b757cc59b0bb60793c065c77aaca7cfa185989b06bfdf01a005cb6cccf"
88
}
99
}

assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,26 +2,26 @@
22
images:
33
- name: quay.io/operator-framework/olm
44
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
5-
digest: sha256:0924d88652b3958e88f859b206fb17e49567069af151ae8ee2b3f87dfb58cba1
5+
digest: sha256:d773980e58f53a75838869abf2438a1d312e52bf78c753466020f6f2fff053a8
66
- name: quay.io/operator-framework/configmap-operator-registry
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:b99375b2de2663cc92507f06fd60d4043e9c02ca786f8682303809fbe8077715
8+
digest: sha256:212099c5f12e9af7cfdf634becd58dfd6ba400beebc0effecfff65f97d83cd3b
99
- name: quay.io/openshift/origin-kube-rbac-proxy
1010
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
11-
digest: sha256:a2dd2271181dad3ec452e11d1dc88fe3fcb8906e090ebf8987e91a10dfa4b2a8
11+
digest: sha256:d3ba0cab31f171dd3e5a9b9eebdc3ba016dfd87b7fb35e02cad6d9fbac876dea
1212

1313
patches:
1414
- patch: |-
1515
- op: add
1616
path: /spec/template/spec/containers/0/env/-
1717
value:
1818
name: OPERATOR_REGISTRY_IMAGE
19-
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b99375b2de2663cc92507f06fd60d4043e9c02ca786f8682303809fbe8077715
19+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:212099c5f12e9af7cfdf634becd58dfd6ba400beebc0effecfff65f97d83cd3b
2020
- op: add
2121
path: /spec/template/spec/containers/0/env/-
2222
value:
2323
name: OLM_IMAGE
24-
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0924d88652b3958e88f859b206fb17e49567069af151ae8ee2b3f87dfb58cba1
24+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d773980e58f53a75838869abf2438a1d312e52bf78c753466020f6f2fff053a8
2525
target:
2626
kind: Deployment
2727
labelSelector: app=catalog-operator
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"release": {
3-
"base": "4.18.0-0.nightly-arm64-2026-01-12-035301"
3+
"base": "4.18.0-0.nightly-arm64-2026-01-14-232456"
44
},
55
"images": {
6-
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0924d88652b3958e88f859b206fb17e49567069af151ae8ee2b3f87dfb58cba1",
7-
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b99375b2de2663cc92507f06fd60d4043e9c02ca786f8682303809fbe8077715",
8-
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a2dd2271181dad3ec452e11d1dc88fe3fcb8906e090ebf8987e91a10dfa4b2a8"
6+
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d773980e58f53a75838869abf2438a1d312e52bf78c753466020f6f2fff053a8",
7+
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:212099c5f12e9af7cfdf634becd58dfd6ba400beebc0effecfff65f97d83cd3b",
8+
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d3ba0cab31f171dd3e5a9b9eebdc3ba016dfd87b7fb35e02cad6d9fbac876dea"
99
}
1010
}
Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
{
22
"release": {
3-
"base": "4.18.0-0.nightly-arm64-2026-01-12-035301"
3+
"base": "4.18.0-0.nightly-arm64-2026-01-14-232456"
44
},
55
"images": {
6-
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0274f022a5ac53157e8e5471ee6581dbc5c4eec055637f8f3191408c5ed52055",
7-
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:15da8db827e8b5e3b58e10713900baf4a33ba3c4e21e3a2664f4f5f996007475",
8-
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:768f03e31797c32e33a025b86bbe9f73038852938bdd0a74068ef63acec28578",
9-
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a2dd2271181dad3ec452e11d1dc88fe3fcb8906e090ebf8987e91a10dfa4b2a8",
10-
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ed90704b0ee824200d00d385130dde30251bbae76912a1a2159fd3e041090c0c",
11-
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:44589b421474318c6743789971921e6d74095873e3a74db0ff5f4380ba6a8e84",
12-
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2ceb24dcab0a2f4b58ba01765e7ad6beb67445a710cfb6f81991bae281c5d4af",
6+
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a487c7f2a591bd5e5a0f8853879f18d141a432edcbc5fc34a23e43663ec6e257",
7+
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3f12e99468e4fcfc93324cab159aa659a69762dced8cf88a6a2cc185ad2b9eff",
8+
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a9d7d222f14e8f525bccdd432109a6ad6a0d4739a74e61eddc528c09342501ee",
9+
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d3ba0cab31f171dd3e5a9b9eebdc3ba016dfd87b7fb35e02cad6d9fbac876dea",
10+
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6751d98158f2fea0451187e910ecc558dc80baabc6f7d238a4b5143818b48f3c",
11+
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4b9aa7adedb9731fbd66ed6cf5d2e6a1d23a5e3defba65dd47b2a5b5da710c5f",
12+
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6b4e0ee4d9a1c08d56607b03ad48b66e5fe49d70a129b79b137c59d94951107c",
1313
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e",
14-
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d2c3b82e209026996e93f202ebd6f3b1b337d1759f8c92ec4e130c56a92f2e84"
14+
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c02a4b70c083cfc909e85356296ba6ecd6a2d036ee45bb1a5c191628e8058dce"
1515
}
1616
}

packaging/crio.conf.d/10-microshift_arm64.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,6 @@ plugin_dirs = [
2525
# for community builds on top of OKD, this setting has no effect
2626
[crio.image]
2727
global_auth_file="/etc/crio/openshift-pull-secret"
28-
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:44589b421474318c6743789971921e6d74095873e3a74db0ff5f4380ba6a8e84"
28+
pause_image = "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4b9aa7adedb9731fbd66ed6cf5d2e6a1d23a5e3defba65dd47b2a5b5da710c5f"
2929
pause_image_auth_file = "/etc/crio/openshift-pull-secret"
3030
pause_command = "/usr/bin/pod"

scripts/auto-rebase/changelog.txt

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +0,0 @@
1-
- ovn-kubernetes image-arm64 45c973d9aeb907885878f92e3e16a142427e8477 to 70a2d777ecb661c3267d24092381518f0420fa9a
2-
- 0eb16983 2025-11-26T14:56:03+08:00 Fix conntrack reconciliation to use service port instead of endpoint port
3-

scripts/auto-rebase/last_rebase.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
#!/bin/bash -x
2-
./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"
2+
./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"

0 commit comments

Comments
 (0)