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

kanisterio · Mar 6, 2024 · 2c54831 · 2c54831
1 parent 9295f25
commit 2c54831
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 29 deletions.
diff --git a/pkg/kube/snapshot/snapshot_alpha.go b/pkg/kube/snapshot/snapshot_alpha.go
@@ -46,7 +46,6 @@ const (
 	DeletionPolicyDelete              = "Delete"
 	DeletionPolicyRetain              = "Retain"
 	CloneVolumeSnapshotClassLabelName = "kanister-cloned-from"
-	DellFlexOSDriver                  = "csi-vxflexos.dellemc.com"
 )
 
 type SnapshotAlpha struct {
@@ -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)
 }
 

diff --git a/pkg/kube/snapshot/snapshot_beta.go b/pkg/kube/snapshot/snapshot_beta.go
@@ -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
 }

diff --git a/pkg/kube/snapshot/snapshot_stable.go b/pkg/kube/snapshot/snapshot_stable.go
@@ -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
 }