Skip to content

NO-ISSUE: rebase-release-4.17-4.17.0-0.nightly-2025-11-24-000209_amd64-2025-11-24_arm64-2025-11-24 #5789

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
Nov 24, 2025
Merged

NO-ISSUE: rebase-release-4.17-4.17.0-0.nightly-2025-11-24-000209_amd64-2025-11-24_arm64-2025-11-24 #5789

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
3c0fa33
update last_rebase.sh
Nov 24, 2025
e99c4d8
update changelog
Nov 24, 2025
dcdfa95
update microshift/go.mod
Nov 24, 2025
aaa4407
update microshift/vendor
Nov 24, 2025
3e36a80
update etcd/go.mod
Nov 24, 2025
a6564d4
update etcd/vendor
Nov 24, 2025
5a87fe0
update component images
Nov 24, 2025
09ef802
update manifests
Nov 24, 2025
3186c57
update buildfiles
Nov 24, 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=ac453edd5ce7d88cf916149399627c93ab30cf16
KUBE_GIT_COMMIT=ef8f548afe29ceeb65b386ed968bf33d17e4b7c2
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-11-19-224008
OCP_VERSION := 4.17.0-0.nightly-arm64-2025-11-24-030720
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-11-19-202300
OCP_VERSION := 4.17.0-0.nightly-2025-11-24-000209
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:3c49d07ed89e92a610d29a7abb57c196781605002351ea6cbec935a17562c672
digest: sha256:df62d23cbc4a00407c786bd7ae7cc0b187b11c74021c696e9d44ad97f66ac764
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:4ae5789cba6a7efa255c09f5eff28def415cd2060518a6f3f2de97d4d26d7df3
digest: sha256:d9bf8556da49df8bcfd0a3809697fd2b0c5d88900913b3ed5ce3f1d620cc289b
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:6e4056a79cc5a0c574be1ac7a95ef4d42f5ccb750d27c3fa20f0745d223a5222
digest: sha256:75ec1c080d363d25f9aafbb6f492d924c7fe676fde5ba46d18549b243ba599a9
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:b838e21d6b63fedb3bc48a6dee62f845cd6fe7774e4f19b2597b116dfabe1628
digest: sha256:6e219b211b8ac09f119140d61a077ea7048b7d7020e44a148676df18f248dc5e
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-11-19-224008"
"base": "4.17.0-0.nightly-arm64-2025-11-24-030720"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3c49d07ed89e92a610d29a7abb57c196781605002351ea6cbec935a17562c672",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4ae5789cba6a7efa255c09f5eff28def415cd2060518a6f3f2de97d4d26d7df3"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:df62d23cbc4a00407c786bd7ae7cc0b187b11c74021c696e9d44ad97f66ac764",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d9bf8556da49df8bcfd0a3809697fd2b0c5d88900913b3ed5ce3f1d620cc289b"
}
}
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-11-19-202300"
"base": "4.17.0-0.nightly-2025-11-24-000209"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6e4056a79cc5a0c574be1ac7a95ef4d42f5ccb750d27c3fa20f0745d223a5222",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b838e21d6b63fedb3bc48a6dee62f845cd6fe7774e4f19b2597b116dfabe1628"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:75ec1c080d363d25f9aafbb6f492d924c7fe676fde5ba46d18549b243ba599a9",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6e219b211b8ac09f119140d61a077ea7048b7d7020e44a148676df18f248dc5e"
}
}
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:efe4a2aeb362ae1515d5829cfee1e7f1c58af2d92bb19d17db6b0fe3e4a56409
digest: sha256:81800c99ab98cc10bd4cc4c36c5f43e5c867f93682d31ab43d4b026de09ca364
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:3c381370e2a9f32209c28e05999ad1ae6dde1fc0552143d74a9f5caeb1b07540
digest: sha256:c2d8601e273d28894bca4a755d225a36fa87cc324f3828481008543436bcc8c7
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:2debaf8a5cf026cbb8258f16cd15ef2b6b8050018c9e3140e41200fb4c73bf38
digest: sha256:d6b82a2b3b211ee24df5d415a8724ca1ff63d171a93d6dafc467f543d964ae59

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:3c381370e2a9f32209c28e05999ad1ae6dde1fc0552143d74a9f5caeb1b07540
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c2d8601e273d28894bca4a755d225a36fa87cc324f3828481008543436bcc8c7
- 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:efe4a2aeb362ae1515d5829cfee1e7f1c58af2d92bb19d17db6b0fe3e4a56409
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:81800c99ab98cc10bd4cc4c36c5f43e5c867f93682d31ab43d4b026de09ca364
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:4f385d5812dbed77aa566c0f85e438bf34b2a4585aab6058ec58cef0553f2553
digest: sha256:b3e0c45af25e9fbfd47dedcf896b1507c6bae866e7c0ce480c4db10427ea46d8
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:eeb5a0b531439d9d224139f6780dd2378206346c118ac5864a72c7f78262205c
digest: sha256:4051bf609d4e997b294af12b99906ceb45ff14514ac2faefbdd27c9aa2a252c9
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:c6641c18e5434420ff4a742d2e4e9717f34969d3158826d9d7cc9279acba538f
digest: sha256:596a2522520212542205afa6da9974bb79b43935663fc9cae6d3f182a7a5debe

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:eeb5a0b531439d9d224139f6780dd2378206346c118ac5864a72c7f78262205c
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4051bf609d4e997b294af12b99906ceb45ff14514ac2faefbdd27c9aa2a252c9
- 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:4f385d5812dbed77aa566c0f85e438bf34b2a4585aab6058ec58cef0553f2553
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b3e0c45af25e9fbfd47dedcf896b1507c6bae866e7c0ce480c4db10427ea46d8
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-11-19-224008"
"base": "4.17.0-0.nightly-arm64-2025-11-24-030720"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:efe4a2aeb362ae1515d5829cfee1e7f1c58af2d92bb19d17db6b0fe3e4a56409",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3c381370e2a9f32209c28e05999ad1ae6dde1fc0552143d74a9f5caeb1b07540",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2debaf8a5cf026cbb8258f16cd15ef2b6b8050018c9e3140e41200fb4c73bf38"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:81800c99ab98cc10bd4cc4c36c5f43e5c867f93682d31ab43d4b026de09ca364",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c2d8601e273d28894bca4a755d225a36fa87cc324f3828481008543436bcc8c7",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d6b82a2b3b211ee24df5d415a8724ca1ff63d171a93d6dafc467f543d964ae59"
}
}
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-11-19-202300"
"base": "4.17.0-0.nightly-2025-11-24-000209"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4f385d5812dbed77aa566c0f85e438bf34b2a4585aab6058ec58cef0553f2553",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:eeb5a0b531439d9d224139f6780dd2378206346c118ac5864a72c7f78262205c",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c6641c18e5434420ff4a742d2e4e9717f34969d3158826d9d7cc9279acba538f"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b3e0c45af25e9fbfd47dedcf896b1507c6bae866e7c0ce480c4db10427ea46d8",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4051bf609d4e997b294af12b99906ceb45ff14514ac2faefbdd27c9aa2a252c9",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:596a2522520212542205afa6da9974bb79b43935663fc9cae6d3f182a7a5debe"
}
}
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-11-19-224008"
"base": "4.17.0-0.nightly-arm64-2025-11-24-030720"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ddbfd84aabcce6090fecb0e6429c7469f5615f862013c6cecae2e6752893dabc",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1826db7b9f20786acb8c253fea1238031b0f52abe29948736329f53f4c4faac8",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:015f0a97366eab775eb5feba9fdfab2c6fb0f79940018111905e147481b54cbf",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2debaf8a5cf026cbb8258f16cd15ef2b6b8050018c9e3140e41200fb4c73bf38",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4a3b01c2afa0753708d4a4b67056355f0f609d6ea7839107efe8b9a8406a5cea",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f3bf947a5159e5f29ad5553dae9ed5ce6909b2d3eec257edc62677139f1f6e43",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7d8fe69649ab845ee9558616fab66de1d189a658b504a807ac48e3737e8a2587",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cd45c2738266f4f7813b860e87091bf05316480620ac7164160207ee55f6ea8e",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c0853023ee4fb77e044d9eb58aba786c5b21db6dc138c0d98c2a07c9a7bba558",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c231a6594a76b8452f30de4d6fe8546f253994fe6b2aca2d87a018d6139fca63",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d6b82a2b3b211ee24df5d415a8724ca1ff63d171a93d6dafc467f543d964ae59",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1a5048219f1190917b466057f9949996d1af11902be973dfc1efbd9593e2261e",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c36d984506aa9042a4f91bfdbc065ff669cc0126bef61df6ffeac8aa86beff69",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b8617deca1faca15c6a586a126428768feee6afb6877d0d9edba8724c0e04fa3",
"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:7bd7910cab22978104d92583d8825507b87afa5183b5b1c2de79261806daa30d",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:730523a9ae5869fa3a5e7eb0b11f1bcf3dd6238237afc25ff88a2852fa2c65c1"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9921b189dd084b49ae3fea2bed86da114a2c2be7b346a9733e10316c784cc467",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6789bd42f47242204408dde40ee04eae3e140e0cc85b9bd77d25ae52379c3457"
}
}
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-11-19-202300"
"base": "4.17.0-0.nightly-2025-11-24-000209"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:48023de9a533b2e50f13acd13d5ea34ffafad64006cb6cc7669b5372439837e3",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:60a8f9cf2c43904a462cac9b51c925f4e7134bc2a90c3af737d8cbec4a2c2207",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5898d0955ef70b11976931ee77c4502077535af95db72ed5c2054a8157502a20",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c6641c18e5434420ff4a742d2e4e9717f34969d3158826d9d7cc9279acba538f",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:73f194c190947e029e3fa217bd0ea87a8aecad755f74dc7e1599b3c33dfab4a4",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:79aacec8eb5656a45880c21546461703487ff95ccd3f3df1aa8d0e07a807f1bc",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bc03a1860f38396c9dff5c22f0d1c5315008e8c94e0efecb9ff1d3eff55db238",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:31988bb7ebb76d1c12e89ef2ff056795e5f3bd003c23554ca8a84670efa5651c",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7e17e31e00440d3bcbea2ca22c5c58137c75c2e5aa0ba09a9d2aea6871c41750",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c1237e8ffd17d998e8e038744d66e74d4d15e66a7bd1d2f33386f826b8624efd",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:596a2522520212542205afa6da9974bb79b43935663fc9cae6d3f182a7a5debe",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e8d3c14a6df34e6143af5e8c96a174b042ccce8fa585b30f4039e68195a7e7c2",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6e11e2c1012ecff36477820917d620a8e34ced550f0bc1c4d3b8daa623c69492",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9685ac1c8127c787417973fcaf9ecae531dc72dc42d211e802e189693b2073c7",
"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:e18a7f0d9b9d1ccee8514692065365777c6e97aaa369a1d6e69795b87e9f42cf",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:15ae79afb24db26021409a88c6184b3d90ab4e3dcdc010b647d15e417374e841"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8414310f43e64f23660521629b10713e84a8e2d25fecb9db9fab203841a1d734",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:04a8a3188096a30441aab805bc6907747022dd1787f00b96918f8b061dcbf047"
}
}
Loading