[release-4.15] OCPBUGS-33043: UPSTREAM: 1919: Add reserved-volume-attachments

[jsafrane]

Pick both commits from kubernetes-sigs#1919 to OCP.

Introduce --reserved-volume-attachments cmd line option that disables loading list of volume attachments from instance metadata.

Instance metadata has volume attachments that were present on instance boot, which may be different than the current nr. of attachments. In addition, it may include CSI volumes that were not drained before reboot, and thus the value may be completely wrong.

--reserved-volume-attachments simply reserves given nr. of attachments for any system disks. Typically it should be 1 for the root volume.

cc @openshift/storage

[openshift-ci]

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: jsafrane

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

The pull request process is described here

Needs approval from an approver in each of these files:

• OWNERS [jsafrane]

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

[jsafrane]

/jira cherrypick OCPBUGS-23260

[bertinatto]

/lgtm
/backport-risk-assessed

[bertinatto]

/label backport-risk-assessed

[jsafrane]

/hold
I need to clone the bug manually

[openshift-ci-robot]

@jsafrane: This pull request references Jira Issue OCPBUGS-33043, which is invalid:

• expected the bug to target either version "4.15." or "openshift-4.15.", but it targets "4.16.0" instead
• release note text must be set and not match the template OR release note type must be set to "Release Note Not Required"
• expected Jira Issue OCPBUGS-33043 to depend on a bug targeting a version in 4.16.0 and in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but no dependents were found

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

The bug has been updated to refer to the pull request using the external bug tracker.

In response to this:

Pick both commits from kubernetes-sigs#1919 to OCP.

Introduce --reserved-volume-attachments cmd line option that disables loading list of volume attachments from instance metadata.

Instance metadata has volume attachments that were present on instance boot, which may be different than the current nr. of attachments. In addition, it may include CSI volumes that were not drained before reboot, and thus the value may be completely wrong.

--reserved-volume-attachments simply reserves given nr. of attachments for any system disks. Typically it should be 1 for the root volume.

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.

[jsafrane]

/jira refresh

[openshift-ci-robot]

@jsafrane: This pull request references Jira Issue OCPBUGS-33043, which is invalid:

• release note text must be set and not match the template OR release note type must be set to "Release Note Not Required"
• expected Jira Issue OCPBUGS-33043 to depend on a bug targeting a version in 4.16.0 and in one of the following states: VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA), but no dependents were found

Comment /jira refresh to re-evaluate validity if changes to the Jira bug are made, or edit the title of this pull request to link to a different bug.

In response to this:

/jira refresh

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.

[jsafrane]

/jira refresh

[openshift-ci-robot]

@jsafrane: This pull request references Jira Issue OCPBUGS-33043, which is valid. The bug has been moved to the POST state.

7 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.15.z) matches configured target version for branch (4.15.z)
• bug is in the state New, which is one of the valid states (NEW, ASSIGNED, POST)
• release note type set to "Release Note Not Required"
• dependent bug Jira Issue OCPBUGS-23260 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
• dependent Jira Issue OCPBUGS-23260 targets the "4.16.0" version, which is one of the valid target versions: 4.16.0
• bug has dependents

Requesting review from QA contact:
/cc @Phaow

In response to this:

/jira refresh

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.

[jsafrane]

/hold cancel

[Phaow]

/label cherry-pick-approved
/label qe-approved

Pre verify passed on 4.15.0-0.test-2024-04-28-023909-ci-ln-b5jxff2-latest

Firstly I checked the --reserved-volume-attachments=1 arg already added to csi-node ds in the fix build.

$ oc -n openshift-cluster-csi-drivers get ds/aws-ebs-csi-driver-node -oyaml| grep 'reserved'
       - --reserved-volume-attachments=1

The presubmit CI all looks good regression test passed. In addition, I tested with fresh installed pre merge build cluster with m5.8xlarge instance type(csinode allocatable volumes count: "26"), create statefulset with pvc 20 replicas use nodeAffinity to make the pod schedule to specified node and reboot the node several times, then create statefulset with pvc 6 replicas use nodeAffinity to make the pod schedule to specified node, the sts all replicas become ready.

[openshift-ci-robot]

@jsafrane: This pull request references Jira Issue OCPBUGS-33043, which is valid. The bug has been moved to the POST state.

7 validation(s) were run on this bug

• bug is open, matching expected state (open)
• bug target version (4.15.z) matches configured target version for branch (4.15.z)
• bug is in the state ASSIGNED, which is one of the valid states (NEW, ASSIGNED, POST)
• release note type set to "Release Note Not Required"
• dependent bug Jira Issue OCPBUGS-23260 is in the state Verified, which is one of the valid states (VERIFIED, RELEASE PENDING, CLOSED (ERRATA), CLOSED (CURRENT RELEASE), CLOSED (DONE), CLOSED (DONE-ERRATA))
• dependent Jira Issue OCPBUGS-23260 targets the "4.16.0" version, which is one of the valid target versions: 4.16.0
• bug has dependents

Requesting review from QA contact:
/cc @Phaow

In response to this:

Pick both commits from kubernetes-sigs#1919 to OCP.

Introduce --reserved-volume-attachments cmd line option that disables loading list of volume attachments from instance metadata.

Instance metadata has volume attachments that were present on instance boot, which may be different than the current nr. of attachments. In addition, it may include CSI volumes that were not drained before reboot, and thus the value may be completely wrong.

--reserved-volume-attachments simply reserves given nr. of attachments for any system disks. Typically it should be 1 for the root volume.

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.

[Phaow]

/test e2e-aws-ovn-upgrade

[openshift-ci]

@jsafrane: all tests passed!

Full PR test history. Your PR dashboard.

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/test-infra repository. I understand the commands that are listed here.

[openshift-ci-robot]

@jsafrane: Jira Issue OCPBUGS-33043: Some pull requests linked via external trackers have merged:

The following pull requests linked via external trackers have not merged:

• openshift/csi-operator#222 is open

These pull request must merge or be unlinked from the Jira bug in order for it to move to the next state. Once unlinked, request a bug refresh with /jira refresh.

Jira Issue OCPBUGS-33043 has not been moved to the MODIFIED state.

In response to this:

Pick both commits from kubernetes-sigs#1919 to OCP.

Introduce --reserved-volume-attachments cmd line option that disables loading list of volume attachments from instance metadata.

Instance metadata has volume attachments that were present on instance boot, which may be different than the current nr. of attachments. In addition, it may include CSI volumes that were not drained before reboot, and thus the value may be completely wrong.

--reserved-volume-attachments simply reserves given nr. of attachments for any system disks. Typically it should be 1 for the root volume.

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.

[openshift-bot]

[ART PR BUILD NOTIFIER]

This PR has been included in build ose-aws-ebs-csi-driver-container-v4.15.0-202404281138.p0.g7043c1c.assembly.stream.el9 for distgit ose-aws-ebs-csi-driver.
All builds following this will include this PR.

[jsafrane]

/cherry-pick release-4.14

[openshift-cherrypick-robot]

@jsafrane: #263 failed to apply on top of branch "release-4.14":

Applying: UPSTREAM: 1919: Add reserved-volume-attachments
Using index info to reconstruct a base tree...
M	cmd/main.go
M	cmd/options.go
M	cmd/options_test.go
M	pkg/driver/driver.go
M	pkg/driver/driver_test.go
M	pkg/driver/node.go
M	pkg/driver/node_test.go
Falling back to patching base and 3-way merge...
Auto-merging pkg/driver/node_test.go
CONFLICT (content): Merge conflict in pkg/driver/node_test.go
Auto-merging pkg/driver/node.go
CONFLICT (content): Merge conflict in pkg/driver/node.go
Auto-merging pkg/driver/driver_test.go
Auto-merging pkg/driver/driver.go
CONFLICT (content): Merge conflict in pkg/driver/driver.go
Auto-merging cmd/options_test.go
CONFLICT (content): Merge conflict in cmd/options_test.go
Auto-merging cmd/options.go
Auto-merging cmd/main.go
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 UPSTREAM: 1919: Add reserved-volume-attachments
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick release-4.14

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/test-infra repository.

[openshift-merge-robot]

Fix included in accepted release 4.15.0-0.nightly-2024-04-29-094148