Skip to content

NO-ISSUE: rebase-main-4.21.0-0.nightly-2025-09-17-041333_amd64-2025-09-17_arm64-2025-09-16 #5483

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

Closed
microshift-rebase-script wants to merge 9 commits into from
Closed

NO-ISSUE: rebase-main-4.21.0-0.nightly-2025-09-17-041333_amd64-2025-09-17_arm64-2025-09-16 #5483

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
1acaac4
update last_rebase.sh
Sep 18, 2025
c94bb0d
update changelog
Sep 18, 2025
b13e970
update microshift/go.mod
Sep 18, 2025
2171fbf
update microshift/deps
Sep 18, 2025
3ba0c9c
update microshift/vendor
Sep 18, 2025
29be378
update deps gofmt
Sep 18, 2025
f616524
update component images
Sep 18, 2025
9b8c2c9
update manifests
Sep 18, 2025
2affdb3
update buildfiles
Sep 18, 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=33
KUBE_GIT_VERSION=v1.33.4
KUBE_GIT_COMMIT=679fad59c6fcb6cd86bccb25ac702ec10d5ea15b
KUBE_GIT_COMMIT=b59afbdc1eb4ecb7c8b19b8cc95c4657df6caf6d
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.21.0-0.nightly-arm64-2025-09-15-144433
OCP_VERSION := 4.21.0-0.nightly-arm64-2025-09-16-163803
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.21.0-0.nightly-2025-09-15-042343
OCP_VERSION := 4.21.0-0.nightly-2025-09-17-041333
4 changes: 2 additions & 2 deletions assets/components/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:dee3513bfeee4ff391ee975b3e850027a913b32896aa2edd701dee92eb96a0d2
digest: sha256:ddbc09b143ab4922596a838082ba86b64f9f3d799db6f333de417c4a78802e2d
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:73860bbfc3f2264848baaf3de73196b06dd0c20123d129bc49a536e30fa384d9
digest: sha256:0a4e638174de0237bf2360fb467d035a2f02c48a8a27fd6053e3c98944d712d6
4 changes: 2 additions & 2 deletions assets/components/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:8a30db38bdb1fcb20eeaf810f8e51e7f963ef5645b4cf95d38b61c382a218bf1
digest: sha256:0719a66144b744eff9a1f8f5f7ccc029d190f4652ccbceed0fa12dd2b8a526d0
- name: containernetworking-plugins-microshift
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:0c1d4a990009171aa1881bded5535eae6400f31eb9cd44af4c6dddc454d24f8d
digest: sha256:19a4d5eb5ffad99144302bab9006895cffce382080b7a9a2fc9b5d478636118b
6 changes: 3 additions & 3 deletions assets/components/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.21.0-0.nightly-arm64-2025-09-15-144433"
"base": "4.21.0-0.nightly-arm64-2025-09-16-163803"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dee3513bfeee4ff391ee975b3e850027a913b32896aa2edd701dee92eb96a0d2",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:73860bbfc3f2264848baaf3de73196b06dd0c20123d129bc49a536e30fa384d9"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:ddbc09b143ab4922596a838082ba86b64f9f3d799db6f333de417c4a78802e2d",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0a4e638174de0237bf2360fb467d035a2f02c48a8a27fd6053e3c98944d712d6"
}
}
6 changes: 3 additions & 3 deletions assets/components/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.21.0-0.nightly-2025-09-15-042343"
"base": "4.21.0-0.nightly-2025-09-17-041333"
},
"images": {
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8a30db38bdb1fcb20eeaf810f8e51e7f963ef5645b4cf95d38b61c382a218bf1",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0c1d4a990009171aa1881bded5535eae6400f31eb9cd44af4c6dddc454d24f8d"
"multus-cni-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:0719a66144b744eff9a1f8f5f7ccc029d190f4652ccbceed0fa12dd2b8a526d0",
"containernetworking-plugins-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:19a4d5eb5ffad99144302bab9006895cffce382080b7a9a2fc9b5d478636118b"
}
}
2 changes: 1 addition & 1 deletion assets/optional/kube-proxy/kustomization.aarch64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
images:
- name: kube-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:8fb1041934c9d683906359b524d6fc2c37d576ba2cf7f2698bcc238377fdd60d
digest: sha256:4247e573b4d95b9c3f47a64bb8865e142920670f96efcad8b8d483e24022f588
2 changes: 1 addition & 1 deletion assets/optional/kube-proxy/kustomization.x86_64.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
images:
- name: kube-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:b34cceb99dc3feda980ce47b49887c06f4df7fa342116470112b521ea9905e5c
digest: sha256:530b60b5142427017ff81119aa2eafd6d5abc2b83cd7e46427718dfe528e9deb
4 changes: 2 additions & 2 deletions assets/optional/kube-proxy/release-kube-proxy-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"release": {
"base": "4.21.0-0.nightly-arm64-2025-09-15-144433"
"base": "4.21.0-0.nightly-arm64-2025-09-16-163803"
},
"images": {
"kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8fb1041934c9d683906359b524d6fc2c37d576ba2cf7f2698bcc238377fdd60d"
"kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4247e573b4d95b9c3f47a64bb8865e142920670f96efcad8b8d483e24022f588"
}
}
4 changes: 2 additions & 2 deletions assets/optional/kube-proxy/release-kube-proxy-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"release": {
"base": "4.21.0-0.nightly-2025-09-15-042343"
"base": "4.21.0-0.nightly-2025-09-17-041333"
},
"images": {
"kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b34cceb99dc3feda980ce47b49887c06f4df7fa342116470112b521ea9905e5c"
"kube-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:530b60b5142427017ff81119aa2eafd6d5abc2b83cd7e46427718dfe528e9deb"
}
}
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:a45337d15af61a18525ad9002e779aff50a9ef360c2d27948811c5ae76bbecac
digest: sha256:1fe4227bd4019cfa3a76b16e726cf8d4ac6d226569c5c5e604a2f6f09b0aab3b
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:41866f0e3ec52376819b26c3901e258199c347eaf9796020d236398a27920b87
digest: sha256:c29df2669ebd8ba8fe2ca518ce14d5d4e46d0d99c0c26b5b7ac8e75de47479b4
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:544c937726f939b853093473cc58cb09c91a9e5d1ebcc187591d5a5df58a40f6
digest: sha256:75ee75cc35ece4662bf58efaaddd073df362b7d6079ff83192f875cfe6e3c7c7

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:41866f0e3ec52376819b26c3901e258199c347eaf9796020d236398a27920b87
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c29df2669ebd8ba8fe2ca518ce14d5d4e46d0d99c0c26b5b7ac8e75de47479b4
- 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:a45337d15af61a18525ad9002e779aff50a9ef360c2d27948811c5ae76bbecac
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1fe4227bd4019cfa3a76b16e726cf8d4ac6d226569c5c5e604a2f6f09b0aab3b
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:6dec6e0d2546fdae39acdb8ff8a5147dc96a29b77ac7fbfc7d08c7525f1c3dff
digest: sha256:729d880e87adbfe25d60e98c6629424c64074a030352a07b6f19cb9f68c0413e
- name: quay.io/operator-framework/configmap-operator-registry
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:75c0472bdb093f7487e8ec0bb62cfc44fc2800aeb56b45ab444020e09ebc7ad0
digest: sha256:fe0838f129fb64edc2188b00e7b54eba0200c90433b554784aa9fe0ec6db9642
- name: quay.io/openshift/origin-kube-rbac-proxy
newName: quay.io/openshift-release-dev/ocp-v4.0-art-dev
digest: sha256:b09a18f7583bb9328f7d414cffdc3795d09160c18104055c8fdeea52e0c81b7a
digest: sha256:d3304374c72e9c4ddf88dbe402224b3736ab1994c19513bd6faa956bce493fc6

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:75c0472bdb093f7487e8ec0bb62cfc44fc2800aeb56b45ab444020e09ebc7ad0
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fe0838f129fb64edc2188b00e7b54eba0200c90433b554784aa9fe0ec6db9642
- 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:6dec6e0d2546fdae39acdb8ff8a5147dc96a29b77ac7fbfc7d08c7525f1c3dff
value: quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:729d880e87adbfe25d60e98c6629424c64074a030352a07b6f19cb9f68c0413e
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.21.0-0.nightly-arm64-2025-09-15-144433"
"base": "4.21.0-0.nightly-arm64-2025-09-16-163803"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a45337d15af61a18525ad9002e779aff50a9ef360c2d27948811c5ae76bbecac",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:41866f0e3ec52376819b26c3901e258199c347eaf9796020d236398a27920b87",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:544c937726f939b853093473cc58cb09c91a9e5d1ebcc187591d5a5df58a40f6"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1fe4227bd4019cfa3a76b16e726cf8d4ac6d226569c5c5e604a2f6f09b0aab3b",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c29df2669ebd8ba8fe2ca518ce14d5d4e46d0d99c0c26b5b7ac8e75de47479b4",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:75ee75cc35ece4662bf58efaaddd073df362b7d6079ff83192f875cfe6e3c7c7"
}
}
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.21.0-0.nightly-2025-09-15-042343"
"base": "4.21.0-0.nightly-2025-09-17-041333"
},
"images": {
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6dec6e0d2546fdae39acdb8ff8a5147dc96a29b77ac7fbfc7d08c7525f1c3dff",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:75c0472bdb093f7487e8ec0bb62cfc44fc2800aeb56b45ab444020e09ebc7ad0",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b09a18f7583bb9328f7d414cffdc3795d09160c18104055c8fdeea52e0c81b7a"
"operator-lifecycle-manager": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:729d880e87adbfe25d60e98c6629424c64074a030352a07b6f19cb9f68c0413e",
"operator-registry": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:fe0838f129fb64edc2188b00e7b54eba0200c90433b554784aa9fe0ec6db9642",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d3304374c72e9c4ddf88dbe402224b3736ab1994c19513bd6faa956bce493fc6"
}
}
18 changes: 9 additions & 9 deletions assets/release/release-aarch64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"release": {
"base": "4.21.0-0.nightly-arm64-2025-09-15-144433"
"base": "4.21.0-0.nightly-arm64-2025-09-16-163803"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:a61692bef1caed795671449fe24e458cee1bad4b9092738068f4ede1ab493626",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:1c20707204befd67334c2d4c98de152aeff159bce34f36b9268a40132ad71a18",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c1cd7e11630b921bb61f89637861e16bf6169e42d7321313682e6828f736ca89",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:544c937726f939b853093473cc58cb09c91a9e5d1ebcc187591d5a5df58a40f6",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d1bd64ae838592c0ca3b924bda35f2b6a978dc3393035088acfc7d2b2fdd28e5",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:190e85b5622ccf749c3acdf038bf1c490fe8ff3e760c3c657c51429895e774ce",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:7baa77638952979e20e738a7e0783db32a445391e4d4f2631c4bbe859bcdbc04",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:f786b139e772e08de35e6ad45bcf956fcfc78c5d76c4217a55e4ae64ee7a3c24",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:8a9c72411c4eacabd7f45570bbf0467ee5a53d021562edf080385e8764a726cb",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e2b91a1fbe4bd66e24099e0e77f08ad8814961c73a3be33d80cde13fd6cb197e",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:75ee75cc35ece4662bf58efaaddd073df362b7d6079ff83192f875cfe6e3c7c7",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:cf5bf3ca0d85086b41daaa5d53eadc3c0038ab935873c926c1a109906b7d118f",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c9dba3e46b2e0d04b7f0bb2e7da314a429d76f28573015f26f85c7baf6037998",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:704fb9154fa0dfb8a4dc55474d7d24b8ab6185ea6e1bb1d79cadd38122669b65",
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:3766640b19c336b443619ecdb35f36b479c79ea71b21de97febf024a5eaf6c84",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:08632df50d31f2b0d9b5a0b97ebe69365f2a31c7312a3181134c0d1b87c35551"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:013450806f68220b5cdd74690a1f8fa992feda9f28fd76478e22b4e5cc73a0d4"
}
}
18 changes: 9 additions & 9 deletions assets/release/release-x86_64.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
{
"release": {
"base": "4.21.0-0.nightly-2025-09-15-042343"
"base": "4.21.0-0.nightly-2025-09-17-041333"
},
"images": {
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c40b050f84d02171c29c25b0b9adf4e650df4ebdfc00a68e1217c4733dec6c3c",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:501531f6b82acb64efc87d7d7aaaa9969a5683e003ab45e5e767d30723dad602",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:e184887a22b45486c67979e1ffdc280e66e6edf50e35f1c934f38861d4a9a1f7",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:b09a18f7583bb9328f7d414cffdc3795d09160c18104055c8fdeea52e0c81b7a",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:13a0b05bb986146e903bdb19edeea91bbfd17c69ba3af2177b09e3ea6468c8cb",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:dba5d464bb715c7e03e2dcc144de10d7018f3b282afb9ca7362793457c8e6c62",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:acb39a09d251987144e08d066366dcb71530364089874bc7bc758e64a86bb625",
"cli": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:069444f11823df113e74d36ebd02b07ffd9f2b58a1cdb392c5147d1b496bcfb4",
"coredns": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4f3e5e35db76a7a5fa836fdc2c192819cccf99d7b1be2b3012a3d361fab8e037",
"haproxy-router": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:bdc0d671fbef14a25ba8d5b98a6464ba5819c4ebe789d2fee6664b824b0c5b46",
"kube-rbac-proxy": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:d3304374c72e9c4ddf88dbe402224b3736ab1994c19513bd6faa956bce493fc6",
"ovn-kubernetes-microshift": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:6634e031f549079832bfc4182a28b2e488ec01ad04285be1b95ad740cae91ce9",
"pod": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:c50a53a7687cabde0df6b52ebc0b4861b19047bcfcac34d4b781e531c69598a9",
"service-ca-operator": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:2a45ee6161570dc93df93fa5d57649d76c95f62cfea827bb8a777ee0ad01ea1d",
"lvms_operator": "registry.redhat.io/lvms4/lvms-rhel9-operator@sha256:58804d8baf922927b66cec9424d431a3bdb341d207024ce40cc8f0123bac03ee",
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:4ca70604107d666011271f5b3c109a12ddb334017d25eae853769c3b3c1620af"
"csi-snapshot-controller": "quay.io/openshift-release-dev/ocp-v4.0-art-dev@sha256:292e6b782caa72d44f558f288ea30cd95b2f1c3e93a7693bbb69783d9e832a32"
}
}
11 changes: 5 additions & 6 deletions deps/github.com/openshift/kubernetes/test/e2e/storage/testsuites/volume_modify.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -328,7 +328,7 @@ func (v *volumeModifyTestSuite) DefineTests(driver storageframework.TestDriver,
originPv := pv.DeepCopy()
pv.Spec.PersistentVolumeReclaimPolicy = v1.PersistentVolumeReclaimRetain
_, err = f.ClientSet.CoreV1().PersistentVolumes().Update(ctx, pv, metav1.UpdateOptions{})
ginkgo.DeferCleanup(recoverPvReclaimPolicyAndRemoveClaimRef, f.ClientSet, originPv)
ginkgo.DeferCleanup(recoverPvReclaimPolicy, f.ClientSet, originPv)
framework.ExpectNoError(err, "Failed to update PV %q reclaim policy", pvName)

// The vac_protection_controller make sure there is a VolumeAttributesClass that is not used by any PVC/PV
Expand Down Expand Up @@ -369,7 +369,7 @@ func (v *volumeModifyTestSuite) DefineTests(driver storageframework.TestDriver,

ginkgo.By(fmt.Sprintf("Deleting PV %q to make the vac unused for the PV", newVAC.Name))
pv.Spec.PersistentVolumeReclaimPolicy = v1.PersistentVolumeReclaimDelete
recoverPvReclaimPolicyAndRemoveClaimRef(ctx, f.ClientSet, pv)
recoverPvReclaimPolicy(ctx, f.ClientSet, pv)

ginkgo.By(fmt.Sprintf("Waiting for PV %q to be deleted", pvName))
gomega.Eventually(func() bool {
Expand Down Expand Up @@ -432,8 +432,8 @@ func CleanupVAC(ctx context.Context, vac *storagev1beta1.VolumeAttributesClass,
}, timeout, modifyPollInterval).Should(gomega.BeNil())
}

// recoverPvReclaimPolicyAndRemoveClaimRef recovers the test pv's reclaim policy to expected used for clean up test PV
func recoverPvReclaimPolicyAndRemoveClaimRef(ctx context.Context, c clientset.Interface, expectedPv *v1.PersistentVolume) {
// recoverPvReclaimPolicy recovers the test pv's reclaim policy to expected used for clean up test PV
func recoverPvReclaimPolicy(ctx context.Context, c clientset.Interface, expectedPv *v1.PersistentVolume) {
setPvReclaimPolicyErr := retry.RetryOnConflict(retry.DefaultRetry, func() error {
pv, err := c.CoreV1().PersistentVolumes().Get(ctx, expectedPv.Name, metav1.GetOptions{})
if err != nil {
Expand All @@ -443,11 +443,10 @@ func recoverPvReclaimPolicyAndRemoveClaimRef(ctx context.Context, c clientset.In
}
return err
}
if pv.Spec.PersistentVolumeReclaimPolicy == expectedPv.Spec.PersistentVolumeReclaimPolicy && pv.Spec.ClaimRef == nil {
if pv.Spec.PersistentVolumeReclaimPolicy == expectedPv.Spec.PersistentVolumeReclaimPolicy {
framework.Logf("PV %q reclaim policy is already recovered to %q", expectedPv.Name, expectedPv.Spec.PersistentVolumeReclaimPolicy)
return nil
}
pv.Spec.ClaimRef = nil
pv.Spec.PersistentVolumeReclaimPolicy = expectedPv.Spec.PersistentVolumeReclaimPolicy
_, err = c.CoreV1().PersistentVolumes().Update(ctx, pv, metav1.UpdateOptions{})
return err
Expand Down
2 changes: 1 addition & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ require (
github.com/go-kit/kit v0.9.0
github.com/gogo/protobuf v1.3.2
github.com/golang/snappy v0.0.4
github.com/openshift/cluster-policy-controller v0.0.0-20250725081630-3e7538547c8f
github.com/openshift/cluster-policy-controller v0.0.0-20250915194436-0e2948510331
github.com/openshift/route-controller-manager v0.0.0-20250725082216-bf2fa662f57f
github.com/prometheus/client_model v0.6.1
github.com/prometheus/common v0.62.0
Expand Down
4 changes: 2 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -261,8 +261,8 @@ github.com/openshift/build-machinery-go v0.0.0-20250602125535-1b6d00b8c37c h1:gJ
github.com/openshift/build-machinery-go v0.0.0-20250602125535-1b6d00b8c37c/go.mod h1:8jcm8UPtg2mCAsxfqKil1xrmRMI3a+XU2TZ9fF8A7TE=
github.com/openshift/client-go v0.0.0-20250710075018-396b36f983ee h1:tOtrrxfDEW8hK3eEsHqxsXurq/D6LcINGfprkQC3hqY=
github.com/openshift/client-go v0.0.0-20250710075018-396b36f983ee/go.mod h1:zhRiYyNMk89llof2qEuGPWPD+joQPhCRUc2IK0SB510=
github.com/openshift/cluster-policy-controller v0.0.0-20250725081630-3e7538547c8f h1:ZlSflmSPh5wdgrmuG4n/UWWtGZQgggIqWG8+EXiFXpo=
github.com/openshift/cluster-policy-controller v0.0.0-20250725081630-3e7538547c8f/go.mod h1:977DPepMAwnGNdJQdAzVSL+Qpem/aLS9d9sGnt1yEsg=
github.com/openshift/cluster-policy-controller v0.0.0-20250915194436-0e2948510331 h1:Vm+BxLt2wMVLlAor0JdatxFK74pIddQ7GjzsYI/OHXE=
github.com/openshift/cluster-policy-controller v0.0.0-20250915194436-0e2948510331/go.mod h1:977DPepMAwnGNdJQdAzVSL+Qpem/aLS9d9sGnt1yEsg=
github.com/openshift/etcd/api/v3 v3.5.1-0.20250829062802-9c065d4d842c h1:Xty9QBBJwUlug0FGix5rwjOg7rIVnmfbsg4dEaBBFM4=
github.com/openshift/etcd/api/v3 v3.5.1-0.20250829062802-9c065d4d842c/go.mod h1:c3aH5wcvXv/9dqIw2Y810LDXJfhSYdHQ0vxmP3CCHVY=
github.com/openshift/etcd/client/pkg/v3 v3.5.1-0.20250829062802-9c065d4d842c h1:XYHqfMdW35QxSQ6/BWJNF84YPEKRIxvvyAUgfhpo78k=
Expand Down
Loading