Skip to content

STOR-3004: Rebase external-snapshotter to v8.6.0#224

Merged
openshift-merge-bot[bot] merged 4 commits into
openshift:masterfrom
rvagner78:rebase-v8.6.0-no-subtree-check
Jun 30, 2026
Merged

STOR-3004: Rebase external-snapshotter to v8.6.0#224
openshift-merge-bot[bot] merged 4 commits into
openshift:masterfrom
rvagner78:rebase-v8.6.0-no-subtree-check

Conversation

@rvagner78

@rvagner78 rvagner78 commented Jun 23, 2026

Copy link
Copy Markdown

Upstream changelogs

Summary of changes

  • Promoted VolumeGroupSnapshot API to GA (v1). Updated controllers to use v1 VolumeGroupSnapshot APIs and set v1beta2 as the stored version during migration.
  • Fixed VolumeSnapshot deletion not being retried when the snapshot is used as a data source for a PVC restore in progress. The controller now returns an error to ensure the workqueue requeues the snapshot until the PVC is no longer pending. The same fix is applied to VolumeGroupSnapshot deletion.
  • Fixed deletion of snapshots that were marked for deletion while the CSI driver was still taking the snapshot.
  • Fix PVC finalizer update retrying on conflict
  • Add HTTP server timeouts to the webhook
  • Bump k8s dependencies to v1.36.1 and Go to 1.26.0

Diff to upstream:

Previous rebase: #202

cc @openshift/storage

Summary by CodeRabbit

  • Chores
    • Added a new build target placeholder for subtree testing that is currently skipped and clearly reports its disabled status when invoked.

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jun 23, 2026
@openshift-ci-robot

openshift-ci-robot commented Jun 23, 2026

Copy link
Copy Markdown

@rvagner78: This pull request references STOR-3004 which is a valid jira issue.

Details

In response to this:

Upstream changelogs

Summary of changes

  • Promoted VolumeGroupSnapshot API to GA (v1). Updated controllers to use v1 VolumeGroupSnapshot APIs and set v1beta2 as the stored version during migration.
  • Fixed VolumeSnapshot deletion not being retried when the snapshot is used as a data source for a PVC restore in progress. The controller now returns an error to ensure the workqueue requeues the snapshot until the PVC is no longer pending. The same fix is applied to VolumeGroupSnapshot deletion.
  • Fixed deletion of snapshots that were marked for deletion while the CSI driver was still taking the snapshot.
  • Fix PVC finalizer update retrying on conflict
  • Add HTTP server timeouts to the webhook
  • Bump k8s dependencies to v1.36.1 and Go to 1.26.0

Diff to upstream:

Previous rebase: #202

cc @openshift/storage

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@coderabbitai

coderabbitai Bot commented Jun 23, 2026

Copy link
Copy Markdown

Warning

Review limit reached

@rvagner78, we couldn't start this review because you've reached your PR review rate limit.

More reviews will be available in 24 minutes and 36 seconds. Learn how PR review limits work.

Your organization has used up its prepaid credits, and credit purchases are no longer available. Enable the review add-on in the billing tab to keep reviews running — you're only billed for reviews past your plan's rate limits ($0.25/file).

⌛ How to resolve this issue?

After more reviews become available, a review can be triggered using the @coderabbitai review command as a PR comment. Alternatively, push new commits to this PR.

To avoid repeated limits, reduce automatic review volume by pausing incremental auto-reviews earlier, using label-based review opt-in, excluding WIP or generated PR titles, or requesting reviews manually when the PR is ready. If your team needs uninterrupted high-volume reviews, an organization admin can enable usage-based credits.

🚦 How do rate limits work?

CodeRabbit enforces per-developer PR review limits for each organization. Most developers receive the normal plan review availability.

For paid Pro and Pro+ PR reviews, CodeRabbit uses adaptive limits for sustained high-volume activity. When a developer's recent PR review activity reaches the 95th percentile or higher among CodeRabbit users, additional reviews become available more gradually as earlier reviews age out of the rolling window.

Please see our Fair Usage Limits Policy for further information.

ℹ️ Review info
⚙️ Run configuration

Configuration used: Repository: openshift/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Enterprise

Run ID: e2aa5fbb-084a-47ca-a65c-668ed933821d

📥 Commits

Reviewing files that changed from the base of the PR and between f12cafe and 9c6d440.

📒 Files selected for processing (1)
  • Makefile

Walkthrough

A new test-subtree target is added to the Makefile, marked .PHONY, and configured to print ### test-subtree: skipped. An inline comment notes that subtree testing is disabled upstream.

Changes

Disable test-subtree Makefile target

Layer / File(s) Summary
Add skipped test-subtree target
Makefile
Declares test-subtree as .PHONY and adds a recipe that echoes a skipped message; an inline comment marks it disabled upstream.

Estimated code review effort

🎯 1 (Trivial) | ⏱️ ~2 minutes

🚥 Pre-merge checks | ✅ 15
✅ Passed checks (15 passed)
Check name Status Explanation
Description Check ✅ Passed Check skipped - CodeRabbit’s high-level summary is enabled.
Title check ✅ Passed The title clearly states the main change: rebasing external-snapshotter to v8.6.0 for STOR-3004.
Docstring Coverage ✅ Passed No functions found in the changed files to evaluate docstring coverage. Skipping docstring coverage check.
Linked Issues check ✅ Passed Check skipped because no linked issues were found for this pull request.
Out of Scope Changes check ✅ Passed Check skipped because no linked issues were found for this pull request.
Stable And Deterministic Test Names ✅ Passed No Ginkgo-style It/Describe/Context/When call sites exist in the repo, so there are no unstable test titles to flag.
Test Structure And Quality ✅ Passed Only the Makefile test-subtree target changed; no Ginkgo tests or cluster-interaction code were modified.
Microshift Test Compatibility ✅ Passed No new Ginkgo e2e tests were added; the PR only disables the test-subtree Makefile target.
Single Node Openshift (Sno) Test Compatibility ✅ Passed No new Ginkgo e2e tests were added; the PR changes Makefile and unit-test/generated code only, with no SNO-affected assumptions.
Topology-Aware Scheduling Compatibility ✅ Passed The touched workload manifests only adjust replica counts/maxUnavailable; no anti-affinity, topology spread, nodeSelector, or control-plane targeting was added.
Ote Binary Stdout Contract ✅ Passed No changed test-binary startup code writes to stdout; the only new visible change is the Makefile skip target.
Ipv6 And Disconnected Network Test Compatibility ✅ Passed Only a disabled Makefile test-subtree stub was added; no new Ginkgo e2e tests or IPv4/external-networking code changed.
No-Weak-Crypto ✅ Passed PASS: The PR change is only a skipped test-subtree Makefile target; non-vendor source shows no MD5/SHA1/DES/RC4/3DES/Blowfish/ECB or secret-compare code.
Container-Privileges ✅ Passed Only a skipped Makefile target was added; no K8s/container manifests or privilege-related settings were introduced.
No-Sensitive-Data-In-Logs ✅ Passed The only added log output is ### test-subtree: skipped; it contains no passwords, tokens, PII, hostnames, or customer data.

✏️ Tip: You can configure your own custom pre-merge checks in the settings.

✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands.

@openshift-ci openshift-ci Bot requested review from dfajmon and tsmetana June 23, 2026 15:30

@coderabbitai coderabbitai Bot left a comment

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Actionable comments posted: 1

🤖 Prompt for all review comments with AI agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

Inline comments:
In `@Makefile`:
- Around line 21-25: The test-subtree target currently unconditionally skips
execution, which removes the subtree sync verification from the main test flow.
Instead of always echoing a skip message in the test-subtree target, implement
explicit opt-out logic that allows the subtree test to run by default but can be
intentionally disabled via an environment variable or configuration flag. This
way the integration safety check executes in normal CI flows while still
permitting explicit bypass when needed.
🪄 Autofix (Beta)

Fix all unresolved CodeRabbit comments on this PR:

  • Push a commit to this branch (recommended)
  • Create a new PR with the fixes

ℹ️ Review info
⚙️ Run configuration

Configuration used: Repository: openshift/coderabbit/.coderabbit.yaml

Review profile: CHILL

Plan: Enterprise

Run ID: 079cc836-4134-40bf-89bf-3fa5a2015566

📥 Commits

Reviewing files that changed from the base of the PR and between e695e2b and c82d5c7.

📒 Files selected for processing (1)
  • Makefile

Comment thread Makefile
Comment on lines +21 to +25
# UPSTREAM: <carry>: disable test-subtree
.PHONY: test-subtree
test-subtree:
@ echo "### $@: skipped"

Copy link
Copy Markdown

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🗄️ Data Integrity & Integration | 🟠 Major | ⚡ Quick win

test-subtree is silently bypassed in the main test path.

Line 21-Line 25 turns test-subtree into a no-op, and make test consumers (for example release-tools/go-modules-update.sh) will no longer verify subtree sync. This removes an integration safety check and can let subtree drift pass CI unnoticed.

Suggested fix (explicit opt-out instead of unconditional skip)
 # UPSTREAM: <carry>: disable test-subtree
 .PHONY: test-subtree
 test-subtree:
-	@ echo "### $@: skipped"
+ifeq ($(SKIP_SUBTREE_VERIFY),1)
+	@ echo "### $@: skipped (SKIP_SUBTREE_VERIFY=1)"
+else
+	@ echo; echo "### $@:"
+	@ ./release-tools/verify-subtree.sh release-tools
+endif
📝 Committable suggestion

‼️ IMPORTANT
Carefully review the code before committing. Ensure that it accurately replaces the highlighted code, contains no missing lines, and has no issues with indentation. Thoroughly test & benchmark the code to ensure it meets the requirements.

Suggested change
# UPSTREAM: <carry>: disable test-subtree
.PHONY: test-subtree
test-subtree:
@ echo "### $@: skipped"
# UPSTREAM: <carry>: disable test-subtree
.PHONY: test-subtree
test-subtree:
ifeq ($(SKIP_SUBTREE_VERIFY),1)
@ echo "### $@: skipped (SKIP_SUBTREE_VERIFY=1)"
else
@ echo; echo "### $@:"
@ ./release-tools/verify-subtree.sh release-tools
endif
🤖 Prompt for AI Agents
Verify each finding against current code. Fix only still-valid issues, skip the
rest with a brief reason, keep changes minimal, and validate.

In `@Makefile` around lines 21 - 25, The test-subtree target currently
unconditionally skips execution, which removes the subtree sync verification
from the main test flow. Instead of always echoing a skip message in the
test-subtree target, implement explicit opt-out logic that allows the subtree
test to run by default but can be intentionally disabled via an environment
variable or configuration flag. This way the integration safety check executes
in normal CI flows while still permitting explicit bypass when needed.

@rvagner78

Copy link
Copy Markdown
Author

/test e2e-vsphere-csi

3 similar comments
@rvagner78

Copy link
Copy Markdown
Author

/test e2e-vsphere-csi

@rvagner78

Copy link
Copy Markdown
Author

/test e2e-vsphere-csi

@rvagner78

Copy link
Copy Markdown
Author

/test e2e-vsphere-csi

@jsafrane

Copy link
Copy Markdown

/payload-job periodic-ci-openshift-hypershift-release-5.0-periodics-e2e-aws-ovn
/payload-job periodic-ci-openshift-hypershift-release-5.0-periodics-e2e-aks
those two broke with the last rebase

@openshift-ci

openshift-ci Bot commented Jun 25, 2026

Copy link
Copy Markdown

@jsafrane: trigger 2 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

  • periodic-ci-openshift-hypershift-release-5.0-periodics-e2e-aws-ovn
  • periodic-ci-openshift-hypershift-release-5.0-periodics-e2e-aks

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/0e0f6ca0-7081-11f1-9b54-4d44ad7b632f-0

@rvagner78 rvagner78 force-pushed the rebase-v8.6.0-no-subtree-check branch from c82d5c7 to f12cafe Compare June 25, 2026 13:13
@openshift-ci

openshift-ci Bot commented Jun 25, 2026

Copy link
Copy Markdown

@rvagner78: The following tests failed, say /retest to rerun all failed tests or /retest-required to rerun all mandatory failed tests:

Test name Commit Details Required Rerun command
ci/prow/e2e-vsphere-csi f12cafe link true /test e2e-vsphere-csi
ci/prow/hypershift-aws-e2e-external f12cafe link true /test hypershift-aws-e2e-external
ci/prow/e2e-gcp-csi f12cafe link true /test e2e-gcp-csi
ci/prow/e2e-aws-csi f12cafe link true /test e2e-aws-csi
ci/prow/e2e-vsphere f12cafe link true /test e2e-vsphere
ci/prow/images f12cafe link true /test images
ci/prow/okd-scos-images f12cafe link true /test okd-scos-images

Full PR test history. Your PR dashboard.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here.

@jsafrane

Copy link
Copy Markdown

/payload-job periodic-ci-openshift-hypershift-release-5.0-periodics-e2e-aws-ovn
/payload-job periodic-ci-openshift-hypershift-release-5.0-periodics-e2e-aks

@openshift-ci

openshift-ci Bot commented Jun 25, 2026

Copy link
Copy Markdown

@jsafrane: trigger 2 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

  • periodic-ci-openshift-hypershift-release-5.0-periodics-e2e-aws-ovn
  • periodic-ci-openshift-hypershift-release-5.0-periodics-e2e-aks

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/a1e6b0b0-709e-11f1-99ce-b79f70804d53-0

@jsafrane

Copy link
Copy Markdown

@rvagner78, can you please squash Update OpenShift Dockerfiles to 5.0 and golang 1.26 and Updating ose-csi-snapshot-controller-container image to be consistent with ART for 5.0 to Add OpenShift files?

AOS Automation Release Team and others added 2 commits June 26, 2026 14:13
The revert commit 56ba1dc breaks the verify-subtree check because it
is a non-merge commit touching release-tools/. Disable verify-subtree
until fixed in csi-release-tools
(kubernetes-csi/csi-release-tools#305).
@rvagner78 rvagner78 force-pushed the rebase-v8.6.0-no-subtree-check branch from d204e21 to 9c6d440 Compare June 26, 2026 12:18
@jsafrane

Copy link
Copy Markdown

/retest

@jsafrane

Copy link
Copy Markdown

/payload-job periodic-ci-openshift-hypershift-release-5.0-periodics-e2e-aws-ovn
/payload-job periodic-ci-openshift-hypershift-release-5.0-periodics-e2e-aks

@openshift-ci

openshift-ci Bot commented Jun 26, 2026

Copy link
Copy Markdown

@jsafrane: trigger 2 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

  • periodic-ci-openshift-hypershift-release-5.0-periodics-e2e-aws-ovn
  • periodic-ci-openshift-hypershift-release-5.0-periodics-e2e-aks

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/8fefd7f0-7162-11f1-9c68-0484aba73396-0

@rvagner78

Copy link
Copy Markdown
Author

/payload-job periodic-ci-openshift-hypershift-release-5.0-periodics-e2e-aws-ovn
/payload-job periodic-ci-openshift-hypershift-release-5.0-periodics-e2e-aks

@openshift-ci

openshift-ci Bot commented Jun 29, 2026

Copy link
Copy Markdown

@rvagner78: trigger 2 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

  • periodic-ci-openshift-hypershift-release-5.0-periodics-e2e-aws-ovn
  • periodic-ci-openshift-hypershift-release-5.0-periodics-e2e-aks

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/fed4f160-738c-11f1-8fb5-918f751d1e98-0

@jsafrane

Copy link
Copy Markdown

/lgtm
/approve

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Jun 29, 2026
@openshift-ci

openshift-ci Bot commented Jun 29, 2026

Copy link
Copy Markdown

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jsafrane, rvagner78

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jun 29, 2026
@rvagner78

Copy link
Copy Markdown
Author

/payload-job periodic-ci-openshift-hypershift-release-5.0-periodics-e2e-aws-ovn
/payload-job periodic-ci-openshift-hypershift-release-5.0-periodics-e2e-aks

@openshift-ci

openshift-ci Bot commented Jun 29, 2026

Copy link
Copy Markdown

@rvagner78: trigger 2 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

  • periodic-ci-openshift-hypershift-release-5.0-periodics-e2e-aws-ovn
  • periodic-ci-openshift-hypershift-release-5.0-periodics-e2e-aks

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/a3b6b6b0-73c8-11f1-8992-cee1b00dbefd-0

@rvagner78

Copy link
Copy Markdown
Author

/payload-job periodic-ci-openshift-hypershift-release-5.0-periodics-e2e-aws-ovn
/payload-job periodic-ci-openshift-hypershift-release-5.0-periodics-e2e-aks

@openshift-ci

openshift-ci Bot commented Jun 30, 2026

Copy link
Copy Markdown

@rvagner78: trigger 2 job(s) for the /payload-(with-prs|job|aggregate|job-with-prs|aggregate-with-prs) command

  • periodic-ci-openshift-hypershift-release-5.0-periodics-e2e-aws-ovn
  • periodic-ci-openshift-hypershift-release-5.0-periodics-e2e-aks

See details on https://pr-payload-tests.ci.openshift.org/runs/ci/00522200-747e-11f1-96b2-5c71865ac053-0

@rvagner78

Copy link
Copy Markdown
Author

/verified by CI
The payload jobs testing hypershift finally passed.

@openshift-ci-robot openshift-ci-robot added the verified Signifies that the PR passed pre-merge verification criteria label Jun 30, 2026
@openshift-ci-robot

Copy link
Copy Markdown

@rvagner78: This PR has been marked as verified by CI.

Details

In response to this:

/verified by CI
The payload jobs testing hypershift finally passed.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the openshift-eng/jira-lifecycle-plugin repository.

@openshift-merge-bot openshift-merge-bot Bot merged commit b5e4b73 into openshift:master Jun 30, 2026
12 checks passed
@rvagner78

Copy link
Copy Markdown
Author

/test e2e-aws-csi

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. verified Signifies that the PR passed pre-merge verification criteria

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants