Skip to content

Commit 80fa539

Browse files
microshift-rebase-script[bot]ci-robot
andauthored
NO-ISSUE: rebase-release-4.18-4.18.0-0.nightly-2025-10-05-181752_amd64-2025-10-05_arm64-2025-10-05 (#5556)
* update last_rebase.sh * update changelog * update manifests * update buildfiles --------- Co-authored-by: ci-robot <[email protected]>
1 parent f94b6db commit 80fa539

15 files changed

+373
-52
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-09-28-022740
1+
OCP_VERSION := 4.18.0-0.nightly-arm64-2025-10-05-215215

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-09-27-231748
1+
OCP_VERSION := 4.18.0-0.nightly-2025-10-05-181752

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:29a44498c840a16e028f7e68d35430b6f8cd01b9e52a5a92a6c315cc330e9985
5+
digest: sha256:b3b33a5cd41d03ff68cd754669ae25d96f63c1073dd04a717214e646638395ff
66
- name: containernetworking-plugins-microshift
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:0211e18ccd717b96faf8352d983630d4414612f446241f602c77966ded955f10
8+
digest: sha256:1e82328edf1fb090fb781a63a5b3f958cde0346df470d06ccc0e880a8ede5978

assets/optional/multus/kustomization.x86_64.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:bed28d0c0111b591907ed1903636b3f9e98476ec4b2c19c3366cc36e8c5d600a
5+
digest: sha256:bced6a803f3c589a627b2843717b17db93ed172ad6150f45e276e9da05e3e946
66
- name: containernetworking-plugins-microshift
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:9ecd4bc57d3130fdbd8c8072c51adf2d29c5d2fa684e3781f5b71e4525c7db96
8+
digest: sha256:3fbde25c2df3b8c6e42c5adf23197932dd2f2fcc748bc35299d0e3debf6039ce
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-2025-09-28-022740"
3+
"base": "4.18.0-0.nightly-arm64-2025-10-05-215215"
44
},
55
"images": {
6-
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:29a44498c840a16e028f7e68d35430b6f8cd01b9e52a5a92a6c315cc330e9985",
7-
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0211e18ccd717b96faf8352d983630d4414612f446241f602c77966ded955f10"
6+
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b3b33a5cd41d03ff68cd754669ae25d96f63c1073dd04a717214e646638395ff",
7+
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1e82328edf1fb090fb781a63a5b3f958cde0346df470d06ccc0e880a8ede5978"
88
}
99
}
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-2025-09-27-231748"
3+
"base": "4.18.0-0.nightly-2025-10-05-181752"
44
},
55
"images": {
6-
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bed28d0c0111b591907ed1903636b3f9e98476ec4b2c19c3366cc36e8c5d600a",
7-
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9ecd4bc57d3130fdbd8c8072c51adf2d29c5d2fa684e3781f5b71e4525c7db96"
6+
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bced6a803f3c589a627b2843717b17db93ed172ad6150f45e276e9da05e3e946",
7+
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3fbde25c2df3b8c6e42c5adf23197932dd2f2fcc748bc35299d0e3debf6039ce"
88
}
99
}

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@ images:
55
digest: sha256:cf60f1fe3cda5725ff39864ab15167fb647f4148e941ce094d0257d02c46381d
66
- name: quay.io/operator-framework/configmap-operator-registry
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:1c128acddf88d49b8fcb65d127d342c535056efeb73ea13d5f8dbdb2bb2d0830
8+
digest: sha256:294543261d5cc46880248bca4039e10a1325f2efc4d1554b78c15fa866d80615
99
- name: quay.io/openshift/origin-kube-rbac-proxy
1010
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
11-
digest: sha256:5649e151f092113dece6884654f08760e7245a324e40a289bb695b68f6838631
11+
digest: sha256:8956ea074ee4d10d8440b040e043f5f0cd7c7c7e184c0d682555e6323f9dcc5f
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:1c128acddf88d49b8fcb65d127d342c535056efeb73ea13d5f8dbdb2bb2d0830
19+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:294543261d5cc46880248bca4039e10a1325f2efc4d1554b78c15fa866d80615
2020
- op: add
2121
path: /spec/template/spec/containers/0/env/-
2222
value:

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,18 +5,18 @@ images:
55
digest: sha256:9542862c74d2cddbf6f10a9f967595436c1fc5b05169969baf558a37a425a868
66
- name: quay.io/operator-framework/configmap-operator-registry
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:a2ed3a56ac3e411dffa5a6d960e8ab570b62cc00a560c485d3eb5c4eb34c9cc5
8+
digest: sha256:2b656b5ac688c59411eb1da53260c314493c3326215a22d9d5e541ad4898c7dd
99
- name: quay.io/openshift/origin-kube-rbac-proxy
1010
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
11-
digest: sha256:f22b65e5c744a32d3955dd7c36d809e3114a8aa501b44c00330dfda886c21169
11+
digest: sha256:374cc216fb1cc6f0a3570c9e525e04e8674c6ae8281a315668d7ac44c1e1ac1f
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:a2ed3a56ac3e411dffa5a6d960e8ab570b62cc00a560c485d3eb5c4eb34c9cc5
19+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2b656b5ac688c59411eb1da53260c314493c3326215a22d9d5e541ad4898c7dd
2020
- op: add
2121
path: /spec/template/spec/containers/0/env/-
2222
value:
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"release": {
3-
"base": "4.18.0-0.nightly-arm64-2025-09-28-022740"
3+
"base": "4.18.0-0.nightly-arm64-2025-10-05-215215"
44
},
55
"images": {
66
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cf60f1fe3cda5725ff39864ab15167fb647f4148e941ce094d0257d02c46381d",
7-
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1c128acddf88d49b8fcb65d127d342c535056efeb73ea13d5f8dbdb2bb2d0830",
8-
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5649e151f092113dece6884654f08760e7245a324e40a289bb695b68f6838631"
7+
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:294543261d5cc46880248bca4039e10a1325f2efc4d1554b78c15fa866d80615",
8+
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8956ea074ee4d10d8440b040e043f5f0cd7c7c7e184c0d682555e6323f9dcc5f"
99
}
1010
}
Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
{
22
"release": {
3-
"base": "4.18.0-0.nightly-2025-09-27-231748"
3+
"base": "4.18.0-0.nightly-2025-10-05-181752"
44
},
55
"images": {
66
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9542862c74d2cddbf6f10a9f967595436c1fc5b05169969baf558a37a425a868",
7-
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a2ed3a56ac3e411dffa5a6d960e8ab570b62cc00a560c485d3eb5c4eb34c9cc5",
8-
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f22b65e5c744a32d3955dd7c36d809e3114a8aa501b44c00330dfda886c21169"
7+
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2b656b5ac688c59411eb1da53260c314493c3326215a22d9d5e541ad4898c7dd",
8+
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:374cc216fb1cc6f0a3570c9e525e04e8674c6ae8281a315668d7ac44c1e1ac1f"
99
}
1010
}

0 commit comments

Comments
 (0)