Skip to content

Commit dc1a49f

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-05-28-133042_amd64-2025-05-28_arm64-2025-05-28 (#4983)
* update last_rebase.sh * update changelog * update component images * update manifests * update buildfiles --------- Co-authored-by: ci-robot <[email protected]>
1 parent fea2042 commit dc1a49f

14 files changed

+70
-48
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-05-22-223027
1+
OCP_VERSION := 4.18.0-0.nightly-arm64-2025-05-28-204338

‎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-05-20-050253
1+
OCP_VERSION := 4.18.0-0.nightly-2025-05-28-133042

‎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:c9fbc010f464b5d38b4fdde3830293167d93bf9a1fe81d092e933936c6782cf6
5+
digest: sha256:6ab2897d43e5ea39a218ab4cbbb35bc92f792d56031b2a9ac25e211d1dfb513c
66
- name: containernetworking-plugins-microshift
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:1f308d25a0bb7d259424825f0e3ca8aa06374c9e91e3cb17aef9a394aa661ae3
8+
digest: sha256:7bc36fab97c2dd4082f4629624df6be155a65909ff5261ecbad9d8f49a84ba8c

‎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-05-22-223027"
3+
"base": "4.18.0-0.nightly-arm64-2025-05-28-204338"
44
},
55
"images": {
66
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bbdd33cb096b633903a0b02c4a7019be9a0c4e37733a03e4e4d82559f794ee03",

‎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-05-20-050253"
3+
"base": "4.18.0-0.nightly-2025-05-28-133042"
44
},
55
"images": {
6-
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c9fbc010f464b5d38b4fdde3830293167d93bf9a1fe81d092e933936c6782cf6",
7-
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1f308d25a0bb7d259424825f0e3ca8aa06374c9e91e3cb17aef9a394aa661ae3"
6+
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6ab2897d43e5ea39a218ab4cbbb35bc92f792d56031b2a9ac25e211d1dfb513c",
7+
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7bc36fab97c2dd4082f4629624df6be155a65909ff5261ecbad9d8f49a84ba8c"
88
}
99
}

‎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:5f4154729a087c979bedc373b6e9fdeedbf098ccc3988c5824ca1ceab7d38fa7
5+
digest: sha256:307bf6e89e19171192821053704bb2772f89255c3eabf138f5dc1628ec55d5b8
66
- name: quay.io/operator-framework/configmap-operator-registry
77
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
8-
digest: sha256:154955c7b9aac06ad469df7036be73dc25a0b437a81879de1d418854e8b62a5a
8+
digest: sha256:4fdec809fa6fc74b6b205e2c7f599315b8345e7beedea9ac9aa40eec6090e796
99
- name: quay.io/openshift/origin-kube-rbac-proxy
1010
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
11-
digest: sha256:5774ae3bffa16560af5a57fd9c12a52373ee9941023de67cce3ccbc4aa8a6356
11+
digest: sha256:61bcf4eb286aed402e5db1c10efbce58816db1f67ef7c0464d201a9cb001a24e
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:154955c7b9aac06ad469df7036be73dc25a0b437a81879de1d418854e8b62a5a
19+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4fdec809fa6fc74b6b205e2c7f599315b8345e7beedea9ac9aa40eec6090e796
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:5f4154729a087c979bedc373b6e9fdeedbf098ccc3988c5824ca1ceab7d38fa7
24+
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:307bf6e89e19171192821053704bb2772f89255c3eabf138f5dc1628ec55d5b8
2525
target:
2626
kind: Deployment
2727
labelSelector: app=catalog-operator

‎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-05-22-223027"
3+
"base": "4.18.0-0.nightly-arm64-2025-05-28-204338"
44
},
55
"images": {
66
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:09032048fe874be5eb5c4010449532476d1bdee815e36b937d6d2d51f0eea2af",

‎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-05-20-050253"
3+
"base": "4.18.0-0.nightly-2025-05-28-133042"
44
},
55
"images": {
6-
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5f4154729a087c979bedc373b6e9fdeedbf098ccc3988c5824ca1ceab7d38fa7",
7-
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:154955c7b9aac06ad469df7036be73dc25a0b437a81879de1d418854e8b62a5a",
8-
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5774ae3bffa16560af5a57fd9c12a52373ee9941023de67cce3ccbc4aa8a6356"
6+
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:307bf6e89e19171192821053704bb2772f89255c3eabf138f5dc1628ec55d5b8",
7+
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4fdec809fa6fc74b6b205e2c7f599315b8345e7beedea9ac9aa40eec6090e796",
8+
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:61bcf4eb286aed402e5db1c10efbce58816db1f67ef7c0464d201a9cb001a24e"
99
}
1010
}

‎assets/release/release-aarch64.json

Lines changed: 3 additions & 3 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-05-22-223027"
3+
"base": "4.18.0-0.nightly-arm64-2025-05-28-204338"
44
},
55
"images": {
6-
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:289b15d9a90426ed0ddcc9f749de15392c2590f1a23f19981faaf7fc005e3ba9",
6+
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b95140afad530de02e8e6b953d64a44c46ad7879d5b4d37cfe2537d5e7989d90",
77
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e9ea0fdda0ebaafe55132522bc0b2213e1c47e8e26fb7ce6d12b2f81eea93820",
88
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:589adbf00f63066e590c13cec4e957bca58afe435d15fe421b59d8f23b5d5a9c",
99
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:493615be03628876884d01e57be0d9d43d1951c96508d124ec74f923bebd17a5",
10-
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d435aab66a8ac5412b92a53f6c1b433322cf1c4782bbfa6f84c048c8fee6da4e",
10+
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:62d4b98f55d9b209dbe7b42c8c690151a8aaf2eefdb6156af23215e38fb36eb2",
1111
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0d1a0c2608bbf0e0a797d8d1269c99520f4bc6c41c39130059b01e542e699ab2",
1212
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:101cce3851eb25cc502a9401822dc35b6e1e2c68bf7ee658d94d6ec8e468a6dc",
1313
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e",

‎assets/release/release-x86_64.json

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-2025-05-20-050253"
3+
"base": "4.18.0-0.nightly-2025-05-28-133042"
44
},
55
"images": {
6-
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f9d0dbe710ade16b456a16cba51407daea2c60980556a14e87d2bb8bfb5f976b",
7-
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:597376b2fc642fd62565ea4ff11f07c5ba2a26df7eba0aa37a9057b455d2715d",
8-
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:96b58aba2955036b3123fc3db4ad68c59fb8c2a1e01a5ea397c98fc6626ed2c7",
9-
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5774ae3bffa16560af5a57fd9c12a52373ee9941023de67cce3ccbc4aa8a6356",
10-
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7cc507c17274bb1d20335e35b484f6591df1637b0b690907c09fa9ebf56c1da2",
11-
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:047057a8813c23f19d8c8bdface1020f29de1a3a0e96ec7529ebc86b137a94e1",
12-
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0e566ab1eab6a0c3bf8a87c787279f0f46ca39d6b84438b05be583f527e17264",
6+
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dea27ac71518c89f32a5aec94979eef7dd2390494b615ed26b4b054f171210cf",
7+
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:335c394763e4d0874aa9c6cf60abac57ba1189f3a25b12261436c7e9fba8c9bd",
8+
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f51feb9b7b3ebf715e52897f55cd80c3eea194853ca829806c2b669dfe184fe8",
9+
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:61bcf4eb286aed402e5db1c10efbce58816db1f67ef7c0464d201a9cb001a24e",
10+
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3263379112f44af8c32595c2579fc9bbfb3a097a51f16f044da60dfdf6a22356",
11+
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c56ae0a855fb95d6f87f698aaa77fa94bac4a3b89fac04aea8532f13b26b169a",
12+
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:01cf299e9dfb5ea4b62eb24e7bd6341e2cc4ebd3f7e7e0f95901ed25d283dc34",
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:ed691e570e0c37eec0c1983f4340c2ac69b046c73a9906a73a29083194a4862f"
14+
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5f2ac55e9c2012fc9a5037464e8ef242ac599de4fd2fab1926f51a11e4b9171c"
1515
}
1616
}

0 commit comments

Comments
 (0)