diff --git a/api/v1alpha1/nnf_datamovement_types.go b/api/v1alpha1/nnf_datamovement_types.go index e5fc744e6..6433a1523 100644 --- a/api/v1alpha1/nnf_datamovement_types.go +++ b/api/v1alpha1/nnf_datamovement_types.go @@ -100,6 +100,14 @@ type NnfDataMovementConfig struct { // Note: Enabling this option may degrade performance. // +kubebuilder:default:=false StoreStdout bool `json:"storeStdout,omitempty"` + + // The number of slots specified in the MPI hostfile. A value of 0 disables the use of slots in + // the hostfile. -1 will defer to the value specific in the nnf-dm-config ConfigMap. + Slots *int `json:"slots,omitempty"` + + // The number of max_slots specified in the MPI hostfile. A value of 0 disables the use of slots + // in the hostfile. -1 will defer to the value specific in the nnf-dm-config ConfigMap. + MaxSlots *int `json:"maxSlots,omitempty"` } // DataMovementCommandStatus defines the observed status of the underlying data movement diff --git a/api/v1alpha1/zz_generated.deepcopy.go b/api/v1alpha1/zz_generated.deepcopy.go index 361596a16..fc3e61d12 100644 --- a/api/v1alpha1/zz_generated.deepcopy.go +++ b/api/v1alpha1/zz_generated.deepcopy.go @@ -347,6 +347,16 @@ func (in *NnfDataMovementCommandStatus) DeepCopy() *NnfDataMovementCommandStatus // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil. func (in *NnfDataMovementConfig) DeepCopyInto(out *NnfDataMovementConfig) { *out = *in + if in.Slots != nil { + in, out := &in.Slots, &out.Slots + *out = new(int) + **out = **in + } + if in.MaxSlots != nil { + in, out := &in.MaxSlots, &out.MaxSlots + *out = new(int) + **out = **in + } } // DeepCopy is an autogenerated deepcopy function, copying the receiver, creating a new NnfDataMovementConfig. @@ -407,7 +417,7 @@ func (in *NnfDataMovementSpec) DeepCopyInto(out *NnfDataMovementSpec) { if in.UserConfig != nil { in, out := &in.UserConfig, &out.UserConfig *out = new(NnfDataMovementConfig) - **out = **in + (*in).DeepCopyInto(*out) } } diff --git a/config/crd/bases/nnf.cray.hpe.com_nnfdatamovements.yaml b/config/crd/bases/nnf.cray.hpe.com_nnfdatamovements.yaml index 96661f84b..9b6850470 100644 --- a/config/crd/bases/nnf.cray.hpe.com_nnfdatamovements.yaml +++ b/config/crd/bases/nnf.cray.hpe.com_nnfdatamovements.yaml @@ -178,6 +178,16 @@ spec: the output is always logged. Note: Enabling this option may degrade performance.' type: boolean + maxSlots: + description: The number of max_slots specified in the MPI hostfile. + A value of 0 disables the use of slots in the hostfile. -1 will + defer to the value specific in the nnf-dm-config ConfigMap. + type: integer + slots: + description: The number of slots specified in the MPI hostfile. + A value of 0 disables the use of slots in the hostfile. -1 will + defer to the value specific in the nnf-dm-config ConfigMap. + type: integer storeStdout: default: false description: 'Similar to LogStdout, store the command''s stdout