Merge pull request #14236 from sp98/fix-svg-cleanup-job

core: fix missing env in svg cleanup job
rook · May 17, 2024 · eecaa25 · eecaa25
2 parents 9f3d76c + 33ce8f0
commit eecaa25
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/pkg/operator/ceph/file/subvolumegroup/controller.go b/pkg/operator/ceph/file/subvolumegroup/controller.go
@@ -399,8 +399,13 @@ func buildClusterID(cephFilesystemSubVolumeGroup *cephv1.CephFilesystemSubVolume
 
 func (r *ReconcileCephFilesystemSubVolumeGroup) cleanup(svg *cephv1.CephFilesystemSubVolumeGroup, cephCluster *cephv1.CephCluster) error {
 	logger.Infof("starting cleanup of the ceph resources for subVolumeGroup %q in namespace %q", svg.Name, svg.Namespace)
+	svgName := svg.Spec.Name
+	// use resource name if `spec.Name` is empty in the subvolumeGroup CR.
+	if svgName == "" {
+		svgName = svg.Name
+	}
 	cleanupConfig := map[string]string{
-		opcontroller.CephFSSubVolumeGroupNameEnv: svg.Spec.Name,
+		opcontroller.CephFSSubVolumeGroupNameEnv: svgName,
 		opcontroller.CephFSNameEnv:               svg.Spec.FilesystemName,
 		opcontroller.CSICephFSRadosNamesaceEnv:   "csi",
 		opcontroller.CephFSMetaDataPoolNameEnv:   file.GenerateMetaDataPoolName(svg.Spec.FilesystemName),