fix merge conflicts

pingcap · Jun 21, 2023 · 0e77011 · 0e77011
1 parent 816759d
commit 0e77011
Showing 1 changed file with 0 additions and 9 deletions.
diff --git a/pkg/manager/volumes/phase.go b/pkg/manager/volumes/phase.go
@@ -99,17 +99,8 @@ func (p *podVolModifier) validate(vol *ActualVolume) error {
 	if vol.Desired == nil {
 		return fmt.Errorf("can't match desired volume")
 	}
-<<<<<<< HEAD
-	if vol.Desired.StorageClass == nil {
-		// TODO: support default storage class
-		return fmt.Errorf("can't change storage class to the default one")
-	}
-	desired := vol.Desired.Size
-	actual := getStorageSize(vol.PVC.Spec.Resources.Requests)
-=======
 	desired := vol.Desired.GetStorageSize()
 	actual := vol.GetStorageSize()
->>>>>>> 0015c826d (fix(volume): fix panic bug when enable ModifyVolume feature (#5058))
 	result := desired.Cmp(actual)
 	switch {
 	case result == 0: