Merge branch 'develop' into fix-offline

nsathyaseelan · web-flow · commit c9d03630ec18 · 2026-02-09T14:40:16.000+05:30
diff --git a/common/k8stest/util_apps.go b/common/k8stest/util_apps.go
@@ -724,8 +724,10 @@ func (dfa *FioApp) Cleanup() error {
 		}
 	}
 
-	if err == nil && !dfa.KeepStorageClass {
+	if err == nil && !dfa.KeepStorageClass && dfa.status.scName != "" {
 		// Only delete storage class if KeepStorageClass is false (default behavior)
+		// and we have a valid storage class name. For imported volumes, scName may
+		// be empty, in which case we must not attempt to delete it.
 		err = RmStorageClass(dfa.status.scName)
 	}
 	return err

Original file line number	Diff line number	Diff line change
`@@ -724,8 +724,10 @@ func (dfa *FioApp) Cleanup() error {`
`724`	`724`	`}`
`725`	`725`	`}`
`726`	`726`
`727`		`- if err == nil && !dfa.KeepStorageClass {`
	`727`	`+ if err == nil && !dfa.KeepStorageClass && dfa.status.scName != "" {`
`728`	`728`	`// Only delete storage class if KeepStorageClass is false (default behavior)`
	`729`	`+ // and we have a valid storage class name. For imported volumes, scName may`
	`730`	`+ // be empty, in which case we must not attempt to delete it.`
`729`	`731`	`err = RmStorageClass(dfa.status.scName)`
`730`	`732`	`}`
`731`	`733`	`return err`