Skip to content

NO-ISSUE: rebase-release-4.17-4.17.0-0.nightly-2025-07-16-160419_amd64-2025-07-16_arm64-2025-07-16 #5209

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
Jul 17, 2025
Merged

NO-ISSUE: rebase-release-4.17-4.17.0-0.nightly-2025-07-16-160419_amd64-2025-07-16_arm64-2025-07-16 #5209

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
43fbdf9
update last_rebase.sh
Jul 17, 2025
8e09819
update changelog
Jul 17, 2025
55d1d7f
update microshift/go.mod
Jul 17, 2025
c284815
update microshift/vendor
Jul 17, 2025
a2882eb
update etcd/go.mod
Jul 17, 2025
24781de
update etcd/vendor
Jul 17, 2025
98f58c4
update component images
Jul 17, 2025
31816cd
update manifests
Jul 17, 2025
e83d3ab
update buildfiles
Jul 17, 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
4 changes: 2 additions & 2 deletions 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.12
KUBE_GIT_COMMIT=a5f4f8936f3df828973cf00299f26bb441a9244b
KUBE_GIT_VERSION=v1.30.14
KUBE_GIT_COMMIT=ce407c5220d03860b36d8640286ae48521a0dc18
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-07-07-171451
OCP_VERSION := 4.17.0-0.nightly-arm64-2025-07-16-182416
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-07-07-070757
OCP_VERSION := 4.17.0-0.nightly-2025-07-16-160419
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:9af30845eebec9c83bacc5af3673d608b1ca7a70b4ec993035686a9f271fed4e
digest: sha256:f95fa2a49d1df86ccfd95716d9fc2dd4cd3755b0f473015c87eeec90ea810b38
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:0229db7a7841a503b335ea73219469e4daf331223bbba904624e4f21a834fd6b
digest: sha256:985eec2a458ab3cbbcaafb722ba2657548febeb3176d5c3021bf3345fc0fe259
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:9f82600c36268c5bd75088be113667315a22099004d73c03bb337ddb827c11c0
digest: sha256:1848e676a710ae64d9537c6fa3e3706631fcc0a1f0fc972425bdcd872c2afa5f
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:4342d5f1954a973a114bc32cd2052376cb4007589119e49097372ecb8f61a9d0
digest: sha256:1ba1221574dda396a1bb0030192efb9fafbaea97e438d64921c2b76d286e49dd
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-07-07-171451"
"base": "4.17.0-0.nightly-arm64-2025-07-16-182416"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9af30845eebec9c83bacc5af3673d608b1ca7a70b4ec993035686a9f271fed4e",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0229db7a7841a503b335ea73219469e4daf331223bbba904624e4f21a834fd6b"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f95fa2a49d1df86ccfd95716d9fc2dd4cd3755b0f473015c87eeec90ea810b38",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:985eec2a458ab3cbbcaafb722ba2657548febeb3176d5c3021bf3345fc0fe259"
}
}
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-07-07-070757"
"base": "4.17.0-0.nightly-2025-07-16-160419"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9f82600c36268c5bd75088be113667315a22099004d73c03bb337ddb827c11c0",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4342d5f1954a973a114bc32cd2052376cb4007589119e49097372ecb8f61a9d0"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1848e676a710ae64d9537c6fa3e3706631fcc0a1f0fc972425bdcd872c2afa5f",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1ba1221574dda396a1bb0030192efb9fafbaea97e438d64921c2b76d286e49dd"
}
}
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:3beec5aff3d67943721ee55936ac452fca28214fe834e145da8e5f7a5e979ca8
digest: sha256:62e86eea537ced708ee24b84d8e1e9d5e8207cfaf3f16608c9d7d899ff95a968
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:19a81f024f982c91d3ffd9bddfe2fd478ffecc4b2cc0bd79652e41993af80f1c
digest: sha256:d2ae7c7befdc3bc489ddd4721805ff6622037ee29eac05b2bf1b5791340e9eae
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:f9552c83675d36147adcdec38d4a3815c09e232acfca3757239330b55fde52b4
digest: sha256:ca672e6546168f901406d57f909efb7d9f970ad04345741c1dffee9bbdb1565d

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:19a81f024f982c91d3ffd9bddfe2fd478ffecc4b2cc0bd79652e41993af80f1c
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d2ae7c7befdc3bc489ddd4721805ff6622037ee29eac05b2bf1b5791340e9eae
- 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:3beec5aff3d67943721ee55936ac452fca28214fe834e145da8e5f7a5e979ca8
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:62e86eea537ced708ee24b84d8e1e9d5e8207cfaf3f16608c9d7d899ff95a968
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:417fda6de48ee9ddd82955718b144e1c6156762ab36f3ee13c6f48ef34060b3d
digest: sha256:42b8b15a049d7c16f7fde43ea6f541372489a3fd720cb0aa047f6fca30820a32
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:9eb4a8f66ff789d345298438659745a17f644560b5375e4df3d398286f47ee25
digest: sha256:73b35e5a914e296acdc1dee79dd84287d6c7d046bb2b9b54999feb4cef1ba47e
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:4519b1c575fee215077d665fed347a10742fa48b817ad8291169bf8c35519306
digest: sha256:a9b569cb8746cc9d2a9c48e69b88207b5ee8f8eee8f9c76f52043fcc97c3d7a4

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:9eb4a8f66ff789d345298438659745a17f644560b5375e4df3d398286f47ee25
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:73b35e5a914e296acdc1dee79dd84287d6c7d046bb2b9b54999feb4cef1ba47e
- 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:417fda6de48ee9ddd82955718b144e1c6156762ab36f3ee13c6f48ef34060b3d
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:42b8b15a049d7c16f7fde43ea6f541372489a3fd720cb0aa047f6fca30820a32
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-07-07-171451"
"base": "4.17.0-0.nightly-arm64-2025-07-16-182416"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3beec5aff3d67943721ee55936ac452fca28214fe834e145da8e5f7a5e979ca8",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:19a81f024f982c91d3ffd9bddfe2fd478ffecc4b2cc0bd79652e41993af80f1c",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f9552c83675d36147adcdec38d4a3815c09e232acfca3757239330b55fde52b4"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:62e86eea537ced708ee24b84d8e1e9d5e8207cfaf3f16608c9d7d899ff95a968",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d2ae7c7befdc3bc489ddd4721805ff6622037ee29eac05b2bf1b5791340e9eae",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ca672e6546168f901406d57f909efb7d9f970ad04345741c1dffee9bbdb1565d"
}
}
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-07-07-070757"
"base": "4.17.0-0.nightly-2025-07-16-160419"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:417fda6de48ee9ddd82955718b144e1c6156762ab36f3ee13c6f48ef34060b3d",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9eb4a8f66ff789d345298438659745a17f644560b5375e4df3d398286f47ee25",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4519b1c575fee215077d665fed347a10742fa48b817ad8291169bf8c35519306"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:42b8b15a049d7c16f7fde43ea6f541372489a3fd720cb0aa047f6fca30820a32",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:73b35e5a914e296acdc1dee79dd84287d6c7d046bb2b9b54999feb4cef1ba47e",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a9b569cb8746cc9d2a9c48e69b88207b5ee8f8eee8f9c76f52043fcc97c3d7a4"
}
}
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-07-07-171451"
"base": "4.17.0-0.nightly-arm64-2025-07-16-182416"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a8e9fd0b34805e660b628976439f7433408d2f4550897380daf5dd7bc0061f12",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:81ccc014853c72350e4156b5fb0b2b9bd9c81df2cc9788bf11e66e2ee0d6db96",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b378dea68c60c2b5b9a22ee1e3300158297d8cbeda78556e700d1fc4bf49ac05",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f9552c83675d36147adcdec38d4a3815c09e232acfca3757239330b55fde52b4",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e6449d04460c8d75056eafdd04623e3977ae9750fea65c0060cb6aad36ba1920",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9d767f89fd08d48a96269a746f3ead9bcfd83c354dc14419c30ee75137bb6527",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:5d92f0b133bf23cac722fbc14750f091aad7bd1071a9e5a03bb512ae4452a876",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cee5c09a057ed7e65966cad2eba4c680fe63f988500343c2cc992cb27a372242",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b7486777188bb38fadf700105513044a6f6cb8b726b7be4531ad420a0dd9898e",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:af6f4483396499a7f84e89ac6ba8b668307d3363524ccfd661509582352c482f",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ca672e6546168f901406d57f909efb7d9f970ad04345741c1dffee9bbdb1565d",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7ab6b2fa7dbbbfff359503dc62d57176c374ba7cb2b0d74f20eac1591dbbde1b",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fcf6ef432bf823496a13436d5944111bf57ee6a062322d323dca768a7e8aa495",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:899956e2c5a8efc11c5da4fa110107df4e3f266671da897c12ad57711ffb71f7",
"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:6c63313577712c6ac5080300cb3eadb50b12d9fb7455d112ba1930166dcee2f4",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0abd2125e92237e9389aa06716b33da0e66a7af0be81faffdd10b124c511408d"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:15a0be524b8642a4efe257715c5aa71098f9c6f20ec5a4ed244fa939525a53f7",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d1097230b548d9910833ecbb8f64e29c98fd9c93c792d64857b7eeef5f83cbcf"
}
}
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-07-07-070757"
"base": "4.17.0-0.nightly-2025-07-16-160419"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dba4651576ed2e980e71947d6e6fac9283965cf26031d3374f7f1d1c016a4bb3",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4eb6861a62c48e784e4fbe0ca780ac529858d36181b6346db5eed819bb015c35",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f9db65cd5e8b7f592ffce13bec09077b5599ea405bd9f90ad1cebefba42b9f33",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4519b1c575fee215077d665fed347a10742fa48b817ad8291169bf8c35519306",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:42afed7b1f23ec300c9e971c44d80683fad1ab44d4562da8be3aebdcbe4d56b8",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c180d9cd95583b5230411e1ec819716de4e62c0d514565c84a61f91cb370dbc4",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a1be5684ad230b919335d6c311e78b8619e559ea7f9bddd241cd3cdc0508f2c3",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:9b2fd9d5e4cefc182da873d3b974c8d1531eb8097e068ea57410f3fe3b608f4e",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6f2b976e8c3d2361eb4d3ef82fecaceb41dfa518b3c372baab985dfa97a4bbee",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c177cc02fc6d50e076465566b6c9711950f4932cd88ca1bf982e0662f1697e7f",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a9b569cb8746cc9d2a9c48e69b88207b5ee8f8eee8f9c76f52043fcc97c3d7a4",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f61ea653610599b1e0454f0d5b99b1da889e2110a8e5d97575bdb6e68a2be7a8",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:3ebbc243622c27a6cc5d2b3f849749b38ede09916d7419d80c810ba171acc77e",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:01ff66dc47ec92f722869589f799069e04d6a004de64816c8ee1b1f181892f81",
"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:1bd2f848a3308e3c0e98c232c22bdfd91589a642fe5dea0503623313d98ca9e4",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bf9318a782299872293aabed585be49eacafa4fc2b1af00339c13a885cce87e7"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6f6546dd4897dd0e65497c76c43eeb7c1b8a8a0c631b591d8fa6ed77f41c8f3b",
"csi-snapshot-validation-webhook": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:02cc35a8b2d41121f9c540cc28e6231f7c8cf1456d3bc9747b7551aae7ce360f"
}
}
Loading