Skip to content

Commit 03bb96c

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-10-12-224226_amd64-2025-10-12_arm64-2025-10-12 (#5601)
* update last_rebase.sh * update changelog * update component images * update manifests * update buildfiles --------- Co-authored-by: ci-robot <[email protected]>
1 parent 6097bfe commit 03bb96c

17 files changed

+53
-298
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-10-08-203226
1+
OCP_VERSION := 4.18.0-0.nightly-arm64-2025-10-12-203230

‎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-10-08-110434
1+
OCP_VERSION := 4.18.0-0.nightly-2025-10-12-224226

‎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:85fd29b83b2d13c4c08598ecb0b30733f7835805e23ff58ca7e5b35317d920bf
5+
digest: sha256:d005ccbdf9ae2e981794e020741165bc94073a2135743b47f15fdb33c01a8731
66
- name: containernetworking-plugins-microshift
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:395b16e1660706a68ba4336454ece6ced4c33383c42d71bd946222ab075efff1
8+
digest: sha256:c0ca8bc041e7d47590d81be5135ce1e73752ebb20d987e13c344bbe42c8bdc79

‎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:7e0b9f3848cc2808b262855cc1d33c513306d77f2468da4c45b0b8dd388242aa
5+
digest: sha256:d7dfa25da873df0b68c0a8268e5b5c2493517a7853945b9cd559f9c4e07c8fc7
66
- name: containernetworking-plugins-microshift
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:3f05b10dc24d12557cfac4331d50a9c0b66741bbe67226c55d8b7d67925fa69c
8+
digest: sha256:d3e866c4b1fb86a4948060ea117f9f63f3bb958a02e6c436d6f96fc341424000

‎assets/optional/multus/release-multus-aarch64.json‎

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-10-08-203226"
3+
"base": "4.18.0-0.nightly-arm64-2025-10-12-203230"
44
},
55
"images": {
6-
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:85fd29b83b2d13c4c08598ecb0b30733f7835805e23ff58ca7e5b35317d920bf",
7-
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:395b16e1660706a68ba4336454ece6ced4c33383c42d71bd946222ab075efff1"
6+
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d005ccbdf9ae2e981794e020741165bc94073a2135743b47f15fdb33c01a8731",
7+
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c0ca8bc041e7d47590d81be5135ce1e73752ebb20d987e13c344bbe42c8bdc79"
88
}
99
}

‎assets/optional/multus/release-multus-x86_64.json‎

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-10-08-110434"
3+
"base": "4.18.0-0.nightly-2025-10-12-224226"
44
},
55
"images": {
6-
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7e0b9f3848cc2808b262855cc1d33c513306d77f2468da4c45b0b8dd388242aa",
7-
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3f05b10dc24d12557cfac4331d50a9c0b66741bbe67226c55d8b7d67925fa69c"
6+
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d7dfa25da873df0b68c0a8268e5b5c2493517a7853945b9cd559f9c4e07c8fc7",
7+
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d3e866c4b1fb86a4948060ea117f9f63f3bb958a02e6c436d6f96fc341424000"
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:5259aa46d4c4b6550213037b3adb348e4b2538def63dc428db399fb64477ec4b
5+
digest: sha256:b3c15c836cae9e4ba9dbe4167e571e55f3dbb7657251dd58eaba9bbe658cec30
66
- name: quay.io/operator-framework/configmap-operator-registry
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:1983bf66ec107f09c64c0c561f6fb9c1fda525a93cffc7071c1cb24c4f8b3ca1
8+
digest: sha256:c4985ff5acbef4f8139a677422b14aade41fc6bcb1b6fc9244a8a765b104d6a7
99
- name: quay.io/openshift/origin-kube-rbac-proxy
1010
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
11-
digest: sha256:58e0b7f22060a0ab9a419b91d78340fd89e173aede2a44d63c0f8af0d61e48c5
11+
digest: sha256:c4238480fe8f04b8cf6e1b36a6ca0bb3bc899f7c486a5fbf3ea04cc174793f50
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:1983bf66ec107f09c64c0c561f6fb9c1fda525a93cffc7071c1cb24c4f8b3ca1
19+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c4985ff5acbef4f8139a677422b14aade41fc6bcb1b6fc9244a8a765b104d6a7
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:5259aa46d4c4b6550213037b3adb348e4b2538def63dc428db399fb64477ec4b
24+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b3c15c836cae9e4ba9dbe4167e571e55f3dbb7657251dd58eaba9bbe658cec30
2525
target:
2626
kind: Deployment
2727
labelSelector: app=catalog-operator

‎assets/optional/operator-lifecycle-manager/kustomization.x86_64.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:31e9a045463251491772104d47f84a54cda89501c46e7d47ad9be9fcea82e198
5+
digest: sha256:cc9d59c10de1d49000cd133f969df3af183a2eafa12a2f44b68b35361891b35d
66
- name: quay.io/operator-framework/configmap-operator-registry
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:6fb5a80560e3562269f3d2f2a5b0bcf60a84120f4bab052a12bacd0eb8893819
8+
digest: sha256:dc97b87dab31a380fdeb0c59b4838bb5134219b959c0a263cb10b005bb2ec2f7
99
- name: quay.io/openshift/origin-kube-rbac-proxy
1010
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
11-
digest: sha256:b6413e64e7d5885315b3cabc65c2af82135ee649b1664976b3d300884d302414
11+
digest: sha256:5434cfb848cc599a182539da32ff1550255c3f7cc0ea2bdc0f38fd253e03dd23
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:6fb5a80560e3562269f3d2f2a5b0bcf60a84120f4bab052a12bacd0eb8893819
19+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dc97b87dab31a380fdeb0c59b4838bb5134219b959c0a263cb10b005bb2ec2f7
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:31e9a045463251491772104d47f84a54cda89501c46e7d47ad9be9fcea82e198
24+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cc9d59c10de1d49000cd133f969df3af183a2eafa12a2f44b68b35361891b35d
2525
target:
2626
kind: Deployment
2727
labelSelector: app=catalog-operator

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

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-2025-10-08-203226"
3+
"base": "4.18.0-0.nightly-arm64-2025-10-12-203230"
44
},
55
"images": {
6-
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5259aa46d4c4b6550213037b3adb348e4b2538def63dc428db399fb64477ec4b",
7-
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1983bf66ec107f09c64c0c561f6fb9c1fda525a93cffc7071c1cb24c4f8b3ca1",
8-
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:58e0b7f22060a0ab9a419b91d78340fd89e173aede2a44d63c0f8af0d61e48c5"
6+
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b3c15c836cae9e4ba9dbe4167e571e55f3dbb7657251dd58eaba9bbe658cec30",
7+
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c4985ff5acbef4f8139a677422b14aade41fc6bcb1b6fc9244a8a765b104d6a7",
8+
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c4238480fe8f04b8cf6e1b36a6ca0bb3bc899f7c486a5fbf3ea04cc174793f50"
99
}
1010
}

‎assets/optional/operator-lifecycle-manager/release-olm-x86_64.json‎

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-2025-10-08-110434"
3+
"base": "4.18.0-0.nightly-2025-10-12-224226"
44
},
55
"images": {
6-
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:31e9a045463251491772104d47f84a54cda89501c46e7d47ad9be9fcea82e198",
7-
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6fb5a80560e3562269f3d2f2a5b0bcf60a84120f4bab052a12bacd0eb8893819",
8-
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b6413e64e7d5885315b3cabc65c2af82135ee649b1664976b3d300884d302414"
6+
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cc9d59c10de1d49000cd133f969df3af183a2eafa12a2f44b68b35361891b35d",
7+
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dc97b87dab31a380fdeb0c59b4838bb5134219b959c0a263cb10b005bb2ec2f7",
8+
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5434cfb848cc599a182539da32ff1550255c3f7cc0ea2bdc0f38fd253e03dd23"
99
}
1010
}

0 commit comments

Comments
 (0)