Skip to content

NO-ISSUE: rebase-release-4.17-4.17.0-0.nightly-2025-09-18-053709_amd64-2025-09-18_arm64-2025-09-18 #5500

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 9 commits into from
Sep 22, 2025
Merged

NO-ISSUE: rebase-release-4.17-4.17.0-0.nightly-2025-09-18-053709_amd64-2025-09-18_arm64-2025-09-18 #5500

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
9f5c9bf
update last_rebase.sh
Sep 22, 2025
f13d7c0
update changelog
Sep 22, 2025
211f6a1
update microshift/go.mod
Sep 22, 2025
7214318
update microshift/vendor
Sep 22, 2025
81a7a22
update etcd/go.mod
Sep 22, 2025
8caaa9c
update etcd/vendor
Sep 22, 2025
6a7a963
update component images
Sep 22, 2025
e889f9e
update manifests
Sep 22, 2025
4575e6f
update buildfiles
Sep 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Makefile.kube_git.var
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
KUBE_GIT_MAJOR=1
KUBE_GIT_MINOR=30
KUBE_GIT_VERSION=v1.30.14
KUBE_GIT_COMMIT=025ecb69829d3460be23445db21f17dceef31dbd
KUBE_GIT_COMMIT=c3b3eee783f6d6636cc65d3553b9802f2138e19e
KUBE_GIT_TREE_STATE=clean
2 changes: 1 addition & 1 deletion Makefile.version.aarch64.var
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.17.0-0.nightly-arm64-2025-09-08-185141
OCP_VERSION := 4.17.0-0.nightly-arm64-2025-09-18-071340
2 changes: 1 addition & 1 deletion Makefile.version.x86_64.var
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
OCP_VERSION := 4.17.0-0.nightly-2025-09-08-175556
OCP_VERSION := 4.17.0-0.nightly-2025-09-18-053709
4 changes: 2 additions & 2 deletions assets/optional/multus/kustomization.aarch64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
images:
- name: multus-cni-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:22a9257cc0d403359a6f256a513870926fd475f3efc6abe3e2bf270ec396a5e5
digest: sha256:c3c88ed2a15a9d941dbdbb58e6436eeba8cf6cec922094c060ac77c60cceca16
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:89397408c213410e44650b8c4a0f4450c2987d979e95d41c4fd9ed77a457e0e4
digest: sha256:3daf1630ffdb14d63b02991e3698ebb711ea73321f9070241a3a9471bebdf7aa
4 changes: 2 additions & 2 deletions assets/optional/multus/kustomization.x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
images:
- name: multus-cni-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:b09bff54edac94efdc72a72b8cc73df47a1e50d3e44f5291a69e2bf998096b16
digest: sha256:6e2dc8d20c0df30191cbebdd9a01a55b60691b8c23da5c1e3f446a4922eb7f76
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:d8c36c8251e73e7997ad34c82be2c05718aa84507d37ca085b4f6d9aea1913ed
digest: sha256:308c52791e8c9033f2b83c0e9bcdef609c1ba7424319694d27e03f5d7f7ecd24
6 changes: 3 additions & 3 deletions assets/optional/multus/release-multus-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"release": {
"base": "4.17.0-0.nightly-arm64-2025-09-08-185141"
"base": "4.17.0-0.nightly-arm64-2025-09-18-071340"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:22a9257cc0d403359a6f256a513870926fd475f3efc6abe3e2bf270ec396a5e5",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:89397408c213410e44650b8c4a0f4450c2987d979e95d41c4fd9ed77a457e0e4"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c3c88ed2a15a9d941dbdbb58e6436eeba8cf6cec922094c060ac77c60cceca16",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3daf1630ffdb14d63b02991e3698ebb711ea73321f9070241a3a9471bebdf7aa"
}
}
6 changes: 3 additions & 3 deletions assets/optional/multus/release-multus-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
{
"release": {
"base": "4.17.0-0.nightly-2025-09-08-175556"
"base": "4.17.0-0.nightly-2025-09-18-053709"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b09bff54edac94efdc72a72b8cc73df47a1e50d3e44f5291a69e2bf998096b16",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d8c36c8251e73e7997ad34c82be2c05718aa84507d37ca085b4f6d9aea1913ed"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6e2dc8d20c0df30191cbebdd9a01a55b60691b8c23da5c1e3f446a4922eb7f76",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:308c52791e8c9033f2b83c0e9bcdef609c1ba7424319694d27e03f5d7f7ecd24"
}
}
10 changes: 5 additions & 5 deletions assets/optional/operator-lifecycle-manager/kustomization.aarch64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,26 @@
images:
- name: quay.io/operator-framework/olm
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:49432329875c08414b14cc0f76cab3dafce39f9867c23adfe577ee84fc57d67a
digest: sha256:ccc8b38e1b96e0049630c96998c0b91533cd84f9cde7a847ee72ca56634fc863
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:ed55eac85371ef6fad34c979211b1efddbc362cd2818f205f95527d5515fc07c
digest: sha256:441421d0ad95951473cd210b6e12fca202fd53198667b4ce7b308141a1f918be
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:e410e982b6dbcc7431d25f1f68440adff815427c8785c07cad4c9e8ff644dbb1
digest: sha256:b790f51fa81c3d71ef479bed9eebf27707c21242bd36612eb714644767a7dd0a

patches:
- patch: |-
- op: add
path: /spec/template/spec/containers/0/env/-
value:
name: OPERATOR_REGISTRY_IMAGE
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ed55eac85371ef6fad34c979211b1efddbc362cd2818f205f95527d5515fc07c
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:441421d0ad95951473cd210b6e12fca202fd53198667b4ce7b308141a1f918be
- op: add
path: /spec/template/spec/containers/0/env/-
value:
name: OLM_IMAGE
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:49432329875c08414b14cc0f76cab3dafce39f9867c23adfe577ee84fc57d67a
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ccc8b38e1b96e0049630c96998c0b91533cd84f9cde7a847ee72ca56634fc863
target:
kind: Deployment
labelSelector: app=catalog-operator
10 changes: 5 additions & 5 deletions assets/optional/operator-lifecycle-manager/kustomization.x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,26 +2,26 @@
images:
- name: quay.io/operator-framework/olm
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:30e6ef1b839e5b63821fa299576eb3519b4dc483ec1b346e8b8d82982f6b7821
digest: sha256:f23f87dacba075c1d8a6a8adfd7e711574235b0972f9d3eb4e9b397fdfe72011
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:fe825759ee87f7f454a6d0148217355427b4a6820b746c393a15efa2d0ba2be9
digest: sha256:344e26c9b3ad33337b61ee7428ef589c1289d836783d26513ba151507d01adab
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:6595395e2b1be3700b4b333ca81f80c896181ec9d6d9fa0ee8c15378decb4044
digest: sha256:9ee337c01d5b3bc7811204a0702ac1de52e6c87035e6529f61393ec8171c2d4c

patches:
- patch: |-
- op: add
path: /spec/template/spec/containers/0/env/-
value:
name: OPERATOR_REGISTRY_IMAGE
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fe825759ee87f7f454a6d0148217355427b4a6820b746c393a15efa2d0ba2be9
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:344e26c9b3ad33337b61ee7428ef589c1289d836783d26513ba151507d01adab
- op: add
path: /spec/template/spec/containers/0/env/-
value:
name: OLM_IMAGE
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:30e6ef1b839e5b63821fa299576eb3519b4dc483ec1b346e8b8d82982f6b7821
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f23f87dacba075c1d8a6a8adfd7e711574235b0972f9d3eb4e9b397fdfe72011
target:
kind: Deployment
labelSelector: app=catalog-operator
8 changes: 4 additions & 4 deletions assets/optional/operator-lifecycle-manager/release-olm-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "4.17.0-0.nightly-arm64-2025-09-08-185141"
"base": "4.17.0-0.nightly-arm64-2025-09-18-071340"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:49432329875c08414b14cc0f76cab3dafce39f9867c23adfe577ee84fc57d67a",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ed55eac85371ef6fad34c979211b1efddbc362cd2818f205f95527d5515fc07c",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e410e982b6dbcc7431d25f1f68440adff815427c8785c07cad4c9e8ff644dbb1"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ccc8b38e1b96e0049630c96998c0b91533cd84f9cde7a847ee72ca56634fc863",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:441421d0ad95951473cd210b6e12fca202fd53198667b4ce7b308141a1f918be",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b790f51fa81c3d71ef479bed9eebf27707c21242bd36612eb714644767a7dd0a"
}
}
8 changes: 4 additions & 4 deletions assets/optional/operator-lifecycle-manager/release-olm-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"release": {
"base": "4.17.0-0.nightly-2025-09-08-175556"
"base": "4.17.0-0.nightly-2025-09-18-053709"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:30e6ef1b839e5b63821fa299576eb3519b4dc483ec1b346e8b8d82982f6b7821",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fe825759ee87f7f454a6d0148217355427b4a6820b746c393a15efa2d0ba2be9",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6595395e2b1be3700b4b333ca81f80c896181ec9d6d9fa0ee8c15378decb4044"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f23f87dacba075c1d8a6a8adfd7e711574235b0972f9d3eb4e9b397fdfe72011",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:344e26c9b3ad33337b61ee7428ef589c1289d836783d26513ba151507d01adab",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9ee337c01d5b3bc7811204a0702ac1de52e6c87035e6529f61393ec8171c2d4c"
}
}
20 changes: 10 additions & 10 deletions assets/release/release-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"release": {
"base": "4.17.0-0.nightly-arm64-2025-09-08-185141"
"base": "4.17.0-0.nightly-arm64-2025-09-18-071340"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:42672193c16bc479aee9880553cf122aa172740c3a8d75ad7dee393a11585fef",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9d5e32e724234e63fcd8055ca57a9fe213239a13e0d2934ed6471ae554092e99",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6acc10d16fa1a82454b595327c8d2bd4ffc3c32cdec63ebda490ba0bf674de99",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e410e982b6dbcc7431d25f1f68440adff815427c8785c07cad4c9e8ff644dbb1",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2bcb73ac8ceb1488ef6ec65a00066c08b330d414d71d5c646d2b7cac681d7511",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dab1f2b5c36fe16087f966d29cda5fcfc4e7c65608d303de7c7a4e700ff5ac9e",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ac31babdf95799058ee03b71c58e52342cf394098558a9e5d952cc30b0efea75",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d781f06832fbcea813526bc2f4c7091c8095c382ac871c023af7ac1fbd87df5a",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4838d07264fbbffd6474a05c3eb12fdec20896644a64e3a26ebc7bdce6f44b54",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:feb7d3b7501494283b341f6aced144c2735c110a26cdcdfc07c30d56fd274f67",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b790f51fa81c3d71ef479bed9eebf27707c21242bd36612eb714644767a7dd0a",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b98be0ad01a37dad548e7090c34d5b7e598241452c06665c1541a5dac922035d",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:eee42ebd3191fd106f83d76236d30fd2cc59e4ee8a9e709f83cef1ab8e671a42",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b41dc967009c9f89b7d34e3462490387547f2b1dd5f1be67c6dcea42f0c0982f",
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a5a464a9755a0948f7e0482d33bbc93ff1dabf6cd5516bbf02bb028cf644ab7a",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5d3fbefc4988c82c77f60876ad62faf5f3eb0d1af143e99241437bc255e7e68b"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f9c42b00def550a9f00e02a5ad86fa79b0433152c096f9c3d88ce394a8d74711",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ac401564d4696d37505e33936fa7e62b8c7fb738af786929a646f67d757088dc"
}
}
20 changes: 10 additions & 10 deletions assets/release/release-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
{
"release": {
"base": "4.17.0-0.nightly-2025-09-08-175556"
"base": "4.17.0-0.nightly-2025-09-18-053709"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:972281287e3043374dfed20a2bb3b412c64d66630efe7ccdeb0109bb77198ed4",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e13eafa2c2b128e343f529084e7641c133d9ec2606f050ddc44796271205d4be",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:064da555dfaa6a38f7c14aec122b8065b073bfc7eca2b6953c9cad3190555525",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6595395e2b1be3700b4b333ca81f80c896181ec9d6d9fa0ee8c15378decb4044",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:27a7218b7bd9c1f4268d6b06fda11e6e5cfc597bc939232f742622b7a6b54dd8",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5a0d70f5e9ea79aed06d924d4e03f8f4efa0ab44bd61b6ebb65505eb7671a6b3",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b1cc88fad077fc3bf2dceab9eb2e9dc579c50873b3f455858df04660b2e80814",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9f66a014d92c0136a5b492325893c1e35f73694195d607ddc6f713c882b54254",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c5174f8dd93e0f979e140f845a9bfefd7a574574aab5607fa8312b324e8297cd",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:36e5dc70132a0b35fcc8fda6bdbf5f6729e56b19ba2631cb5c0b1d91c8ab1a40",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9ee337c01d5b3bc7811204a0702ac1de52e6c87035e6529f61393ec8171c2d4c",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:01dfde06b01bb2b4dbaf314a0e5d000dfb3369bfef1217f7b2a2f87485ed88c7",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:580c58d1453b1e0a39c5ccab7bb4e998e4c0f4462b8995f9956db5c49d59b864",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:486f9bf79eab3d4ea4c96cd9a7b4a8ad95ff099c4126c45c5222bc7b74f07e4d",
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:bd6dc4d6e90fdbcdb844759e203c9c591abc5ac29a956257a90bda101a37b76e",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:327619bd642e200d40912078b159128900277c4cacc7a4a4af165d7c095d57f4",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6227d3e832af2bc1d817772f6952028861b7e6793ac3ae576fea536fc837fa4e"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:190871540714a9910ee7ddab4bde437179ac90a38def53aa52d94be809ba0c33",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fcd06fe9ff3a398d10d3387e7ad38c7ef288b0224fa1d892d4516eb31a8af389"
}
}
Loading