Add mkdirCommand to NnfDataMovementProfile

Signed-off-by: Dean Roehrich <[email protected]>

api/v1alpha2/conversion.go

@@ -170,13 +170,19 @@ func (src *NnfDataMovementProfile) ConvertTo(dstRaw conversion.Hub) error {
 
 	// Manually restore data.
 	restored := &nnfv1alpha4.NnfDataMovementProfile{}
-	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.Data.MkdirCommand = restored.Data.MkdirCommand
+	}
+
 	return nil
 }
 
@@ -648,3 +654,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_NnfDataMovementProfileData_To_v1alpha2_NnfDataMovementProfileData(in *nnfv1alpha4.NnfDataMovementProfileData, out *NnfDataMovementProfileData, s apiconversion.Scope) error {
+	return autoConvert_v1alpha4_NnfDataMovementProfileData_To_v1alpha2_NnfDataMovementProfileData(in, out, s)
+}

api/v1alpha3/conversion.go

@@ -170,13 +170,18 @@ func (src *NnfDataMovementProfile) ConvertTo(dstRaw conversion.Hub) error {
 
 	// Manually restore data.
 	restored := &nnfv1alpha4.NnfDataMovementProfile{}
-	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.Data.MkdirCommand = restored.Data.MkdirCommand
+	}
+
 	return nil
 }
 
@@ -662,3 +667,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_NnfDataMovementProfileData_To_v1alpha3_NnfDataMovementProfileData(in *nnfv1alpha4.NnfDataMovementProfileData, out *NnfDataMovementProfileData, s apiconversion.Scope) error {
+	return autoConvert_v1alpha4_NnfDataMovementProfileData_To_v1alpha3_NnfDataMovementProfileData(in, out, s)
+}

api/v1alpha4/nnfdatamovementprofile_types.go

@@ -84,7 +84,7 @@ type NnfDataMovementProfileData struct {
 	CreateDestDir bool `json:"createDestDir"`
 
 	// If CreateDestDir is true, then use StatCommand to perform the stat commands.
-	// Use setpriv to stat the path with the specified UID/GID.
+	// Use setpriv to execute with the specified UID/GID.
 	// Available $VARS:
 	//   HOSTFILE: hostfile that is created and used for mpirun. Contains a list of hosts and the
 	//             slots/max_slots for each host. This hostfile is created at
@@ -94,6 +94,18 @@ type NnfDataMovementProfileData struct {
 	//   PATH: Path to stat
 	// +kubebuilder:default:="mpirun --allow-run-as-root -np 1 --hostfile $HOSTFILE -- setpriv --euid $UID --egid $GID --clear-groups stat --cached never -c '%F' $PATH"
 	StatCommand string `json:"statCommand"`
+
+	// If CreateDestDir is true, then use MkdirCommand to perform the mkdir commands.
+	// Use setpriv to execute with the specified UID/GID.
+	// Available $VARS:
+	//   HOSTFILE: hostfile that is created and used for mpirun. Contains a list of hosts and the
+	//             slots/max_slots for each host. This hostfile is created at
+	//             `/tmp/<dm-name>/hostfile`. This is the same hostfile used as the one for Command.
+	//   UID: User ID that is inherited from the Workflow
+	//   GID: Group ID that is inherited from the Workflow
+	//   PATH: Path to stat
+	// +kubebuilder:default:="mpirun --allow-run-as-root -np 1 --hostfile $HOSTFILE -- setpriv --euid $UID --egid $GID --clear-groups mkdir -p $PATH"
+	MkdirCommand string `json:"mkdirCommand"`
 }
 
 // +kubebuilder:object:root=true

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

@@ -330,6 +330,20 @@ spec:
                   use of max_slots in the hostfile. The hostfile is used for both `statCommand` and `Command`.
                 minimum: 0
                 type: integer
+              mkdirCommand:
+                default: mpirun --allow-run-as-root -np 1 --hostfile $HOSTFILE --
+                  setpriv --euid $UID --egid $GID --clear-groups mkdir -p $PATH
+                description: |-
+                  If CreateDestDir is true, then use MkdirCommand to perform the mkdir commands.
+                  Use setpriv to execute with the specified UID/GID.
+                  Available $VARS:
+                    HOSTFILE: hostfile that is created and used for mpirun. Contains a list of hosts and the
+                              slots/max_slots for each host. This hostfile is created at
+                              `/tmp/<dm-name>/hostfile`. This is the same hostfile used as the one for Command.
+                    UID: User ID that is inherited from the Workflow
+                    GID: Group ID that is inherited from the Workflow
+                    PATH: Path to stat
+                type: string
               pinned:
                 default: false
                 description: Pinned is true if this instance is an immutable copy
@@ -356,7 +370,7 @@ spec:
                   -c '%F' $PATH
                 description: |-
                   If CreateDestDir is true, then use StatCommand to perform the stat commands.
-                  Use setpriv to stat the path with the specified UID/GID.
+                  Use setpriv to execute with the specified UID/GID.
                   Available $VARS:
                     HOSTFILE: hostfile that is created and used for mpirun. Contains a list of hosts and the
                               slots/max_slots for each host. This hostfile is created at
@@ -375,6 +389,7 @@ spec:
             - command
             - createDestDir
             - maxSlots
+            - mkdirCommand
             - slots
             - statCommand
             type: object