Skip to content
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

Jump to bottom

Remove special handling for old bug in dell vxflex csi driver #2716

Merged
merged 2 commits into from
Mar 6, 2024
Merged

Remove special handling for old bug in dell vxflex csi driver #2716

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
69d4e3e
Remove special handling for old bug in dell vxflex csi driver
bathina2 Mar 4, 2024
e87daa6
Merge branch 'master' into remove_special_handling_vxflexcsi
mergify[bot] Mar 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 0 additions & 11 deletions pkg/kube/snapshot/snapshot_alpha.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,6 @@ const (
DeletionPolicyDelete = "Delete"
DeletionPolicyRetain = "Retain"
CloneVolumeSnapshotClassLabelName = "kanister-cloned-from"
DellFlexOSDriver = "csi-vxflexos.dellemc.com"
)

type SnapshotAlpha struct {
Expand Down Expand Up @@ -276,16 +275,6 @@ func (sna *SnapshotAlpha) CreateFromSource(ctx context.Context, source *Source,
if !waitForReady {
return nil
}
if source.Driver == DellFlexOSDriver {
// Temporary work around till upstream issue is resolved-
// github- https://github.com/dell/csi-vxflexos/pull/11
// forum- https://www.dell.com/community/Containers/Issue-where-volumeSnapshots-have-ReadyToUse-field-set-to-false/m-p/7685881#M249
err := sna.UpdateVolumeSnapshotStatusAlpha(ctx, namespace, snap.GetName(), true)
if err != nil {
return err
}
}

return sna.WaitOnReadyToUse(ctx, snapshotName, namespace)
}

Expand Down
9 changes: 0 additions & 9 deletions pkg/kube/snapshot/snapshot_beta.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -256,15 +256,6 @@ func (sna *SnapshotBeta) CreateFromSource(ctx context.Context, source *Source, s
if !waitForReady {
return nil
}
if source.Driver == DellFlexOSDriver {
// Temporary work around till upstream issue is resolved-
// github- https://github.com/dell/csi-vxflexos/pull/11
// forum- https://www.dell.com/community/Containers/Issue-where-volumeSnapshots-have-ReadyToUse-field-set-to-false/m-p/7685881#M249
err := sna.UpdateVolumeSnapshotStatusBeta(ctx, namespace, snap.GetName(), true)
if err != nil {
return err
}
}
err = sna.WaitOnReadyToUse(ctx, snapshotName, namespace)
return err
}
Expand Down
9 changes: 0 additions & 9 deletions pkg/kube/snapshot/snapshot_stable.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -145,15 +145,6 @@ func (sna *SnapshotStable) CreateFromSource(ctx context.Context, source *Source,
if !waitForReady {
return nil
}
if source.Driver == DellFlexOSDriver {
// Temporary work around till upstream issue is resolved-
// github- https://github.com/dell/csi-vxflexos/pull/11
// forum- https://www.dell.com/community/Containers/Issue-where-volumeSnapshots-have-ReadyToUse-field-set-to-false/m-p/7685881#M249
err := sna.UpdateVolumeSnapshotStatusStable(ctx, namespace, snap.GetName(), true)
if err != nil {
return err
}
}
err = sna.WaitOnReadyToUse(ctx, snapshotName, namespace)
return err
}
Expand Down