Skip to content

Commit a7eaa13

Browse files
microshift-rebase-script[bot]ci-robot
andauthored
NO-ISSUE: rebase-release-4.22-4.22.0-0.nightly-2026-03-25-221249_amd64-2026-03-25_arm64-2026-03-27 (#6413)
* update last_rebase.sh * update changelog * update etcd/vendor * update manifests * update buildfiles --------- Co-authored-by: ci-robot <ci-robot@openshift.io>
1 parent e4c6367 commit a7eaa13

File tree

9 files changed

+28
-350
lines changed

9 files changed

+28
-350
lines changed

Makefile.version.aarch64.var

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
OCP_VERSION := 4.22.0-0.nightly-arm64-2026-03-26-011910
1+
OCP_VERSION := 4.22.0-0.nightly-arm64-2026-03-27-033011

assets/components/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:44471bfde39c7d70be1369abe9c902e7e059fa7ba64a7d04ac540b1f63aff26d
5+
digest: sha256:bbe8926551e22ba1c6ea275ddf2c42857ce737b00bb0cfbb548eb2ade4269ebd
66
- name: containernetworking-plugins-microshift
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:e93013927c1dcfc3e160a4fa97a1f59945631d715d4ba000397394453434a518
8+
digest: sha256:7677885ccb9c85656453106dd79ff2d05a7401484a0fa194261b96bdfebe29a0
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
{
22
"release": {
3-
"base": "4.22.0-0.nightly-arm64-2026-03-26-011910"
3+
"base": "4.22.0-0.nightly-arm64-2026-03-27-033011"
44
},
55
"images": {
6-
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:44471bfde39c7d70be1369abe9c902e7e059fa7ba64a7d04ac540b1f63aff26d",
7-
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e93013927c1dcfc3e160a4fa97a1f59945631d715d4ba000397394453434a518"
6+
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bbe8926551e22ba1c6ea275ddf2c42857ce737b00bb0cfbb548eb2ade4269ebd",
7+
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7677885ccb9c85656453106dd79ff2d05a7401484a0fa194261b96bdfebe29a0"
88
}
99
}

assets/optional/operator-lifecycle-manager/release-olm-aarch64.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"release": {
3-
"base": "4.22.0-0.nightly-arm64-2026-03-26-011910"
3+
"base": "4.22.0-0.nightly-arm64-2026-03-27-033011"
44
},
55
"images": {
66
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:439df7ed248d77342aa66d8edfdf633c62f9317bdb018d084881d2b41b1ba32f",

assets/release/release-aarch64.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
11
{
22
"release": {
3-
"base": "4.22.0-0.nightly-arm64-2026-03-26-011910"
3+
"base": "4.22.0-0.nightly-arm64-2026-03-27-033011"
44
},
55
"images": {
66
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:03f6bd02bcda4785a4a5936789229e9b9a374fc6dbda82fc6f570ae779fb0c40",
77
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7d75ffa2d71fb253191d6eedb442658dd7f5ea6842f00f6d165c43c6f00bc187",
88
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7ff7a257b7d8571bfab13ea59088420ed8b3831b3ec584b0b776d13a7d467547",
99
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:379f906d6e3970fca176447c41e5b3e4b140986e47bedda5876b850726aa6a6d",
10-
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0a40e8efe4682b456ca8b41b92b4b67485e23828cee926a5839dcf37fa6783af",
10+
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:75db072661ab106e22d5619071d0df1767b9ddc39234be6c749c542c74a45bf4",
1111
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bd914bc1e8c9c9056fc354de856916e784a48bd7fa7ad0b18cad9e0db6763d8b",
12-
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fcf85f9047d96ff479b7ce6c8e37f009a9a0e1dc8b9109ace0167b8805e05a9f",
12+
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:17634fad6daabe6221f46c99d7ed8895843a7f8df50086642501a090897c3d82",
1313
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:3766640b19c336b443619ecdb35f36b479c79ea71b21de97febf024a5eaf6c84",
1414
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:50ca2913bf7fa207163269c13053924310e467eaae5ac745539dacb43aea8ec9"
1515
}

etcd/vendor/github.com/openshift/microshift/pkg/config/config.go

Lines changed: 10 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

scripts/auto-rebase/changelog.txt

Lines changed: 5 additions & 337 deletions
Large diffs are not rendered by default.

scripts/auto-rebase/commits.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,6 @@ https://github.com/openshift/coredns image-arm64 0dded2d232dab43c107b1dab9d0d9fd
3030
https://github.com/openshift/csi-external-snapshotter image-arm64 d1bc3ffaa9759c13a06c2ec61c541342e71bd109
3131
https://github.com/openshift/router image-arm64 8b94c5cd90c435e6b3cf137dc35fcbddb4c048a3
3232
https://github.com/openshift/kube-rbac-proxy image-arm64 d12e274605248f6c59373240a7eae7a7a357dcb3
33-
https://github.com/openshift/ovn-kubernetes image-arm64 051683259bf47d709be19a78c5f218223da54dee
33+
https://github.com/openshift/ovn-kubernetes image-arm64 cca0923d6f0ea9d09e77a8085d83a32e35055af0
3434
https://github.com/openshift/kubernetes image-arm64 2b19898a979eb1ff0cd87ec5d49106e555e70ce6
35-
https://github.com/openshift/service-ca-operator image-arm64 661be3215fe08bc35f4c9eab23a8f75c5f204203
35+
https://github.com/openshift/service-ca-operator image-arm64 dda95b7cb4e6810b5f604599d99c64af6c2d56cf

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.22.0-0.nightly-2026-03-25-221249" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.22.0-0.nightly-arm64-2026-03-26-011910"
2+
./scripts/auto-rebase/rebase.sh to "registry.ci.openshift.org/ocp/release:4.22.0-0.nightly-2026-03-25-221249" "registry.ci.openshift.org/ocp-arm64/release-arm64:4.22.0-0.nightly-arm64-2026-03-27-033011"

0 commit comments

Comments
 (0)