Add IgnoreOfflineComputes option to NnfAccess

Signed-off-by: Matt Richerson <[email protected]>

api/v1alpha2/conversion.go

@@ -42,13 +42,20 @@ func (src *NnfAccess) ConvertTo(dstRaw conversion.Hub) error {
 
 	// Manually restore data.
 	restored := &nnfv1alpha4.NnfAccess{}
-	if ok, err := utilconversion.UnmarshalData(src, restored); err != nil || !ok {
+	hasAnno, err := utilconversion.UnmarshalData(src, restored)
+	if err != nil {
 		return err
 	}
 	// EDIT THIS FUNCTION! If the annotation is holding anything that is
 	// hub-specific then copy it into 'dst' from 'restored'.
 	// Otherwise, you may comment out UnmarshalData() until it's needed.
 
+	if hasAnno {
+		dst.Spec.IgnoreOfflineComputes = restored.Spec.IgnoreOfflineComputes
+	} else {
+		dst.Spec.IgnoreOfflineComputes = false
+	}
+
 	return nil
 }
 
@@ -494,8 +501,10 @@ func (src *NnfSystemStorage) ConvertTo(dstRaw conversion.Hub) error {
 
 	if hasAnno {
 		dst.Spec.Shared = restored.Spec.Shared
+		dst.Spec.IgnoreOfflineComputes = restored.Spec.IgnoreOfflineComputes
 	} else {
 		dst.Spec.Shared = true
+		dst.Spec.IgnoreOfflineComputes = false
 	}
 
 	return nil
@@ -648,3 +657,7 @@ func Convert_v1alpha4_NnfStorageProfileLustreCmdLines_To_v1alpha2_NnfStorageProf
 func Convert_v1alpha4_NnfSystemStorageSpec_To_v1alpha2_NnfSystemStorageSpec(in *nnfv1alpha4.NnfSystemStorageSpec, out *NnfSystemStorageSpec, s apiconversion.Scope) error {
 	return autoConvert_v1alpha4_NnfSystemStorageSpec_To_v1alpha2_NnfSystemStorageSpec(in, out, s)
 }
+
+func Convert_v1alpha4_NnfAccessSpec_To_v1alpha2_NnfAccessSpec(in *nnfv1alpha4.NnfAccessSpec, out *NnfAccessSpec, s apiconversion.Scope) error {
+	return autoConvert_v1alpha4_NnfAccessSpec_To_v1alpha2_NnfAccessSpec(in, out, s)
+}

api/v1alpha3/conversion.go

@@ -42,13 +42,20 @@ func (src *NnfAccess) ConvertTo(dstRaw conversion.Hub) error {
 
 	// Manually restore data.
 	restored := &nnfv1alpha4.NnfAccess{}
-	if ok, err := utilconversion.UnmarshalData(src, restored); err != nil || !ok {
+	hasAnno, err := utilconversion.UnmarshalData(src, restored)
+	if err != nil {
 		return err
 	}
 	// EDIT THIS FUNCTION! If the annotation is holding anything that is
 	// hub-specific then copy it into 'dst' from 'restored'.
 	// Otherwise, you may comment out UnmarshalData() until it's needed.
 
+	if hasAnno {
+		dst.Spec.IgnoreOfflineComputes = restored.Spec.IgnoreOfflineComputes
+	} else {
+		dst.Spec.IgnoreOfflineComputes = false
+	}
+
 	return nil
 }
 
@@ -501,8 +508,10 @@ func (src *NnfSystemStorage) ConvertTo(dstRaw conversion.Hub) error {
 
 	if hasAnno {
 		dst.Spec.Shared = restored.Spec.Shared
+		dst.Spec.IgnoreOfflineComputes = restored.Spec.IgnoreOfflineComputes
 	} else {
 		dst.Spec.Shared = true
+		dst.Spec.IgnoreOfflineComputes = false
 	}
 
 	return nil
@@ -662,3 +671,7 @@ func Convert_v1alpha4_NnfStorageProfileLustreCmdLines_To_v1alpha3_NnfStorageProf
 func Convert_v1alpha4_NnfSystemStorageSpec_To_v1alpha3_NnfSystemStorageSpec(in *nnfv1alpha4.NnfSystemStorageSpec, out *NnfSystemStorageSpec, s apiconversion.Scope) error {
 	return autoConvert_v1alpha4_NnfSystemStorageSpec_To_v1alpha3_NnfSystemStorageSpec(in, out, s)
 }
+
+func Convert_v1alpha4_NnfAccessSpec_To_v1alpha3_NnfAccessSpec(in *nnfv1alpha4.NnfAccessSpec, out *NnfAccessSpec, s apiconversion.Scope) error {
+	return autoConvert_v1alpha4_NnfAccessSpec_To_v1alpha3_NnfAccessSpec(in, out, s)
+}

api/v1alpha4/nnfaccess_types.go

@@ -71,6 +71,9 @@ type NnfAccessSpec struct {
 
 	// StorageReference is the NnfStorage reference
 	StorageReference corev1.ObjectReference `json:"storageReference"`
+
+	// +kubebuilder:default=false
+	IgnoreOfflineComputes bool `json:"ignoreOfflineComputes"`
 }
 
 // NnfAccessStatus defines the observed state of NnfAccess

api/v1alpha4/nnfsystemstorage_types.go

@@ -91,6 +91,9 @@ type NnfSystemStorageSpec struct {
 	// StorageProfile is an object reference to the storage profile to use
 	StorageProfile corev1.ObjectReference `json:"storageProfile"`
 
+	// +kubebuilder:default:=false
+	IgnoreOfflineComputes bool `json:"ignoreOfflineComputes"`
+
 	// MakeClientMounts specifies whether to make ClientMount resources or just
 	// make the devices available to the client
 	// +kubebuilder:default:=false

config/crd/bases/nnf.cray.hpe.com_nnfaccesses.yaml

@@ -615,6 +615,9 @@ spec:
                 description: GroupID for the new mount. Currently only used for raw
                 format: int32
                 type: integer
+              ignoreOfflineComputes:
+                default: false
+                type: boolean
               makeClientMounts:
                 default: true
                 description: |-
@@ -706,6 +709,7 @@ spec:
             required:
             - desiredState
             - groupID
+            - ignoreOfflineComputes
             - makeClientMounts
             - storageReference
             - target

config/crd/bases/nnf.cray.hpe.com_nnfsystemstorages.yaml

@@ -565,6 +565,9 @@ spec:
                 items:
                   type: string
                 type: array
+              ignoreOfflineComputes:
+                default: false
+                type: boolean
               includeComputes:
                 description: |-
                   IncludeComputes is a list of computes nodes to use rather than getting the list of compute nodes
@@ -692,6 +695,7 @@ spec:
                 type: string
             required:
             - capacity
+            - ignoreOfflineComputes
             - makeClientMounts
             - shared
             - storageProfile

internal/controller/nnf_access_controller.go

@@ -870,6 +870,34 @@ func (r *NnfAccessReconciler) getBlockStorageAccessStatus(ctx context.Context, a
 		for allocationIndex, allocation := range nnfNodeBlockStorage.Spec.Allocations {
 			for _, nodeName := range allocation.Access {
 				blockAccess, exists := nnfNodeBlockStorage.Status.Allocations[allocationIndex].Accesses[nodeName]
+				if access.Spec.IgnoreOfflineComputes {
+					storage := &dwsv1alpha2.Storage{
+						ObjectMeta: metav1.ObjectMeta{
+							Name:      nnfNodeBlockStorage.GetNamespace(),
+							Namespace: "default",
+						},
+					}
+
+					if err := r.Get(ctx, client.ObjectKeyFromObject(storage), storage); err != nil {
+						return false, err
+					}
+
+					computeOffline := false
+					for _, compute := range storage.Status.Access.Computes {
+						if compute.Name != nodeName {
+							continue
+						}
+
+						if compute.Status == dwsv1alpha2.OfflineStatus {
+							computeOffline = true
+						}
+					}
+
+					// If the compute is offline, don't check its status
+					if computeOffline {
+						continue
+					}
+				}
 
 				// if the map entry doesn't exist in the status section for this node yet, then keep waiting
 				if !exists {

internal/controller/nnfsystemstorage_controller.go

@@ -610,6 +610,7 @@ func (r *NnfSystemStorageReconciler) createNnfAccess(ctx context.Context, nnfSys
 			} else {
 				nnfAccess.Spec.Target = "single"
 			}
+			nnfAccess.Spec.IgnoreOfflineComputes = nnfSystemStorage.Spec.IgnoreOfflineComputes
 			nnfAccess.Spec.MakeClientMounts = nnfSystemStorage.Spec.MakeClientMounts
 			nnfAccess.Spec.MountPath = nnfSystemStorage.Spec.ClientMountPath
 			nnfAccess.Spec.ClientReference = corev1.ObjectReference{