Merge pull request #945 from crombus/remove_deviceType

storagecluster: remove the deviceType from validateStorageDeviceSets
red-hat-storage · Dec 10, 2020 · 2b08dd6 · 2b08dd6
2 parents a602d12 + 2c9e6e1
commit 2b08dd6
Showing 1 changed file with 1 addition and 3 deletions.
diff --git a/pkg/controller/storagecluster/reconcile.go b/pkg/controller/storagecluster/reconcile.go
@@ -426,9 +426,7 @@ func (r *ReconcileStorageCluster) validateStorageDeviceSets(sc *ocsv1.StorageClu
 			}
 		}
 		if ds.DeviceType != "" {
-			if (DeviceTypeSSD == strings.ToLower(ds.DeviceType)) || (DeviceTypeHDD == strings.ToLower(ds.DeviceType)) || (DeviceTypeNVMe == strings.ToLower(ds.DeviceType)) {
-				metav1.SetMetaDataAnnotation(&sc.ObjectMeta, "crushDeviceClass", ds.DeviceType)
-			} else {
+			if (DeviceTypeSSD != strings.ToLower(ds.DeviceType)) && (DeviceTypeHDD != strings.ToLower(ds.DeviceType)) && (DeviceTypeNVMe != strings.ToLower(ds.DeviceType)) {
 				return fmt.Errorf("failed to validate DeviceType %q: no Device of this type", ds.DeviceType)
 			}
 		}