Skip to content

Commit 379490a

Browse files
microshift-rebase-script[bot]ci-robot
microshift-rebase-script[bot]
and
ci-robot
authored
NO-ISSUE: rebase-release-4.18-4.18.0-0.nightly-2025-01-28-165333_amd64-2025-01-28_arm64-2025-01-28 (#4484)
* update last_rebase.sh * update changelog * update manifests * update buildfiles --------- Co-authored-by: ci-robot <[email protected]>
1 parent 0553925 commit 379490a

File tree

11 files changed

+125
-99
lines changed

11 files changed

+125
-99
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.18.0-0.nightly-arm64-2025-01-27-222549
1+
OCP_VERSION := 4.18.0-0.nightly-arm64-2025-01-28-222549

‎Makefile.version.x86_64.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-2025-01-27-102545
1+
OCP_VERSION := 4.18.0-0.nightly-2025-01-28-165333

‎assets/optional/multus/release-multus-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.18.0-0.nightly-arm64-2025-01-27-222549"
3+
"base": "4.18.0-0.nightly-arm64-2025-01-28-222549"
44
},
55
"images": {
66
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cff936abaaf77fcae90d16563afaffa5fabed681ff6a84cd0d07cd753f23483e",

‎assets/optional/multus/release-multus-x86_64.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.18.0-0.nightly-2025-01-27-102545"
3+
"base": "4.18.0-0.nightly-2025-01-28-165333"
44
},
55
"images": {
66
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:098bab222712ecdbf85e748e0b676814b0e08debfdbc15127b057b63c136fcab",

‎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.18.0-0.nightly-arm64-2025-01-27-222549"
3+
"base": "4.18.0-0.nightly-arm64-2025-01-28-222549"
44
},
55
"images": {
66
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:77b44abd29994f5e934a1158c909eaa4a944e10c12c580fca1ff1e18b13f0427",

‎assets/optional/operator-lifecycle-manager/release-olm-x86_64.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.18.0-0.nightly-2025-01-27-102545"
3+
"base": "4.18.0-0.nightly-2025-01-28-165333"
44
},
55
"images": {
66
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:47b0670fa1051335fd2d2c9e8361e4ed77c7760c33a2180b136f7c7f59863ec2",

‎assets/release/release-aarch64.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"release": {
3-
"base": "4.18.0-0.nightly-arm64-2025-01-27-222549"
3+
"base": "4.18.0-0.nightly-arm64-2025-01-28-222549"
44
},
55
"images": {
66
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c66f20a4028a99307e49e0c84d0417a6b8e1ed0d46449333994c0b38fa309931",
77
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:419f8e79712482517a331012d338610011aee0d4f8fba5f14608b9e42e63b651",
88
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0d81e311b5eb2db9e5c6ee2ddc7c76f05f6623f36127df7484a8fa8606e1767c",
99
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:258c0b8d31226677694d37fa634ffd12ad62089d1fca00e55fca1d0d7f4dfb5c",
10-
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c6f0fd6e9e2b2c83c1dea1dd1c827a3e2315381875f479f3d0d6cf52d6ca4f2c",
10+
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:38bac705b054760e265a95b9ab49e0bdb2b53e3e56782232486f78b84cbf1696",
1111
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e65271f4ebec47d27d680602c9c854578c1e055851561cf27b8d64113ebddc9d",
1212
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a8a9f8d1e9eb9ce227bb761ca924c1723e7204ac1c96b4a4abcb7ba9e25ecdda",
1313
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e",

‎assets/release/release-x86_64.json

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
{
22
"release": {
3-
"base": "4.18.0-0.nightly-2025-01-27-102545"
3+
"base": "4.18.0-0.nightly-2025-01-28-165333"
44
},
55
"images": {
66
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2b353d327072af12fb862132f03a255774a331f8e7a8bfc17254df8849d91f36",
77
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:487c0a8d5200bcdce484ab1169229d8fcb8e91a934be45afff7819c4f7612f57",
88
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1f141e6405f40db17d319d22fecc3162b27434fa837b3ce1f834db301b0b3615",
99
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:242b3d66438c42745f4ef318bdeaf3d793426f12962a42ea83e18d06c08aaf09",
10-
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:56ceadae9a793b39b6e3c2a20ab150e018a2af6a35805e33bad85fcc06a5e7d0",
10+
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ae8b7e6a47a543b701ab4c07feda78742c854be3720b7897c844ca6017596272",
1111
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8caff6ef59cd4a97b12a222b2b4b591a4e8d4e641a75f5481c136dbe9960a41f",
1212
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:898cae57123c5006d397b24af21b0f24a0c42c9b0be5ee8251e1824711f65820",
1313
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e",

‎scripts/auto-rebase/changelog.txt

Lines changed: 110 additions & 84 deletions
Large diffs are not rendered by default.

‎scripts/auto-rebase/commits.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5,14 +5,14 @@ https://github.com/openshift/cluster-ingress-operator embedded-component 8be1749
55
https://github.com/openshift/cluster-kube-apiserver-operator embedded-component 4babb3f18c19d2bef584a8389f34b8428cf52b9c
66
https://github.com/openshift/cluster-kube-controller-manager-operator embedded-component ce2c021f23f5d178da6ea35d98a229137e5a81c4
77
https://github.com/openshift/cluster-kube-scheduler-operator embedded-component e4c772cd344e538342a4e1cd91635b387e1c18ba
8-
https://github.com/openshift/cluster-network-operator embedded-component 3dcc293ae93174f099054b75a4d0cde5ca039f9b
8+
https://github.com/openshift/cluster-network-operator embedded-component 8d768a83424e930352ca565094c24208dadb4725
99
https://github.com/openshift/cluster-openshift-controller-manager-operator embedded-component f1711cf30f683ec0eaa187cd5168caae9e8c1254
1010
https://github.com/openshift/cluster-policy-controller embedded-component 5fd852525909ce6eab52972ba9ce8fcf56528eb9
1111
https://github.com/openshift/csi-external-snapshotter embedded-component 838d2484157f076bbb81f1b584898aec6f051c2f
1212
https://github.com/openshift/etcd embedded-component 914783cae63a13b90971c65e28c3349c1ecb7dfb
1313
https://github.com/openshift/kubernetes embedded-component 7665f4b7049dc15c6559d91d8db45cef318e4c0f
1414
https://github.com/openshift/kubernetes-kube-storage-version-migrator embedded-component 50d17147f15d8b216e7c41f91d1bd7d307ca8c73
15-
https://github.com/openshift/machine-config-operator embedded-component c3c615e27f62881947ba84a2d42454df86cfad48
15+
https://github.com/openshift/machine-config-operator embedded-component 158c393d63629581981a7feea2b3dbf8b284ea27
1616
https://github.com/openshift/openshift-controller-manager embedded-component 5bfc8081a65ea3e0d23306c0398143a9987d659e
1717
https://github.com/openshift/operator-framework-olm embedded-component 182471a8d72ee38d2ff82ce44db6903e66c4b22b
1818
https://github.com/openshift/route-controller-manager embedded-component 07daee4d2f0b5c7aaca56ee45ff6dfdf97680db0
@@ -22,14 +22,14 @@ https://github.com/openshift/coredns image-amd64 cb1abfaeb7b0c5df4f0c56b0a009b43
2222
https://github.com/openshift/csi-external-snapshotter image-amd64 838d2484157f076bbb81f1b584898aec6f051c2f
2323
https://github.com/openshift/router image-amd64 be319d0bb83f75b52b707df46422f6892dfaaa56
2424
https://github.com/openshift/kube-rbac-proxy image-amd64 526498ab32996a0f67a96530ad7173f955e3fbe2
25-
https://github.com/openshift/ovn-kubernetes image-amd64 f0ab7904387fc2588c5110f1ff9d7187d5ce3e11
25+
https://github.com/openshift/ovn-kubernetes image-amd64 1b2d4eb9e76916676bc10fdde5d683c7cd8bdff5
2626
https://github.com/openshift/kubernetes image-amd64 7665f4b7049dc15c6559d91d8db45cef318e4c0f
2727
https://github.com/openshift/service-ca-operator image-amd64 1f7d6472fea332fc307d9c8911f8c3cf57347755
2828
https://github.com/openshift/oc image-arm64 fd653741e664d1f498af2885f4f2f48cd401677e
2929
https://github.com/openshift/coredns image-arm64 cb1abfaeb7b0c5df4f0c56b0a009b439db1d0949
3030
https://github.com/openshift/csi-external-snapshotter image-arm64 838d2484157f076bbb81f1b584898aec6f051c2f
3131
https://github.com/openshift/router image-arm64 be319d0bb83f75b52b707df46422f6892dfaaa56
3232
https://github.com/openshift/kube-rbac-proxy image-arm64 526498ab32996a0f67a96530ad7173f955e3fbe2
33-
https://github.com/openshift/ovn-kubernetes image-arm64 f0ab7904387fc2588c5110f1ff9d7187d5ce3e11
33+
https://github.com/openshift/ovn-kubernetes image-arm64 1b2d4eb9e76916676bc10fdde5d683c7cd8bdff5
3434
https://github.com/openshift/kubernetes image-arm64 7665f4b7049dc15c6559d91d8db45cef318e4c0f
3535
https://github.com/openshift/service-ca-operator image-arm64 1f7d6472fea332fc307d9c8911f8c3cf57347755

0 commit comments

Comments
 (0)