Skip to content

Commit

Permalink
LV tags for system storage
Browse files Browse the repository at this point in the history 
Signed-off-by: Matt Richerson <[email protected]>
  • Loading branch information
@matthew-richerson
matthew-richerson committed Jan 29, 2025
1 parent b91ed85 commit c8bc0f8
Show file tree
Hide file tree
Showing 18 changed files with 464 additions and 131 deletions.
14 changes: 14 additions & 0 deletions api/v1alpha2/conversion.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -356,6 +356,8 @@ func (src *NnfNodeStorage) ConvertTo(dstRaw conversion.Hub) error {
dst.Spec.LustreStorage.LustreComponents.MGTMDTs = append([]string(nil), restored.Spec.LustreStorage.LustreComponents.MGTMDTs...)
dst.Spec.LustreStorage.LustreComponents.OSTs = append([]string(nil), restored.Spec.LustreStorage.LustreComponents.OSTs...)
dst.Spec.LustreStorage.LustreComponents.NNFNodes = append([]string(nil), restored.Spec.LustreStorage.LustreComponents.NNFNodes...)
dst.Spec.CommandVariables = make([]nnfv1alpha5.CommandVariablesSpec, len(restored.Spec.CommandVariables))
copy(dst.Spec.CommandVariables, restored.Spec.CommandVariables)
}

return nil
Expand Down Expand Up @@ -429,6 +431,10 @@ func (src *NnfStorage) ConvertTo(dstRaw conversion.Hub) error {
dst.Status.LustreComponents.MGTMDTs = append([]string(nil), restored.Status.LustreComponents.MGTMDTs...)
dst.Status.LustreComponents.OSTs = append([]string(nil), restored.Status.LustreComponents.OSTs...)
dst.Status.LustreComponents.NNFNodes = append([]string(nil), restored.Status.LustreComponents.NNFNodes...)
for i := range restored.Spec.AllocationSets {
dst.Spec.AllocationSets[i].CommandVariables = make([]nnfv1alpha5.CommandVariablesSpec, len(restored.Spec.AllocationSets[i].CommandVariables))
copy(dst.Spec.AllocationSets[i].CommandVariables, restored.Spec.AllocationSets[i].CommandVariables)
}
}

return nil
Expand Down Expand Up @@ -696,3 +702,11 @@ func Convert_v1alpha5_LustreStorageSpec_To_v1alpha2_LustreStorageSpec(in *nnfv1a
func Convert_v1alpha5_NnfStorageLustreStatus_To_v1alpha2_NnfStorageLustreStatus(in *nnfv1alpha5.NnfStorageLustreStatus, out *NnfStorageLustreStatus, s apiconversion.Scope) error {
return autoConvert_v1alpha5_NnfStorageLustreStatus_To_v1alpha2_NnfStorageLustreStatus(in, out, s)
}

func Convert_v1alpha5_NnfNodeStorageSpec_To_v1alpha2_NnfNodeStorageSpec(in *nnfv1alpha5.NnfNodeStorageSpec, out *NnfNodeStorageSpec, s apiconversion.Scope) error {
return autoConvert_v1alpha5_NnfNodeStorageSpec_To_v1alpha2_NnfNodeStorageSpec(in, out, s)
}

func Convert_v1alpha5_NnfStorageAllocationSetSpec_To_v1alpha2_NnfStorageAllocationSetSpec(in *nnfv1alpha5.NnfStorageAllocationSetSpec, out *NnfStorageAllocationSetSpec, s apiconversion.Scope) error {
return autoConvert_v1alpha5_NnfStorageAllocationSetSpec_To_v1alpha2_NnfStorageAllocationSetSpec(in, out, s)
}
56 changes: 34 additions & 22 deletions api/v1alpha2/zz_generated.conversion.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 14 additions & 0 deletions api/v1alpha3/conversion.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,8 @@ func (src *NnfNodeStorage) ConvertTo(dstRaw conversion.Hub) error {
dst.Spec.LustreStorage.LustreComponents.MGTMDTs = append([]string(nil), restored.Spec.LustreStorage.LustreComponents.MGTMDTs...)
dst.Spec.LustreStorage.LustreComponents.OSTs = append([]string(nil), restored.Spec.LustreStorage.LustreComponents.OSTs...)
dst.Spec.LustreStorage.LustreComponents.NNFNodes = append([]string(nil), restored.Spec.LustreStorage.LustreComponents.NNFNodes...)
dst.Spec.CommandVariables = make([]nnfv1alpha5.CommandVariablesSpec, len(restored.Spec.CommandVariables))
copy(dst.Spec.CommandVariables, restored.Spec.CommandVariables)
}

return nil
Expand Down Expand Up @@ -428,6 +430,10 @@ func (src *NnfStorage) ConvertTo(dstRaw conversion.Hub) error {
dst.Status.LustreComponents.MGTMDTs = append([]string(nil), restored.Status.LustreComponents.MGTMDTs...)
dst.Status.LustreComponents.OSTs = append([]string(nil), restored.Status.LustreComponents.OSTs...)
dst.Status.LustreComponents.NNFNodes = append([]string(nil), restored.Status.LustreComponents.NNFNodes...)
for i := range restored.Spec.AllocationSets {
dst.Spec.AllocationSets[i].CommandVariables = make([]nnfv1alpha5.CommandVariablesSpec, len(restored.Spec.AllocationSets[i].CommandVariables))
copy(dst.Spec.AllocationSets[i].CommandVariables, restored.Spec.AllocationSets[i].CommandVariables)
}
}

return nil
Expand Down Expand Up @@ -711,3 +717,11 @@ func Convert_v1alpha5_LustreStorageSpec_To_v1alpha3_LustreStorageSpec(in *nnfv1a
func Convert_v1alpha5_NnfStorageLustreStatus_To_v1alpha3_NnfStorageLustreStatus(in *nnfv1alpha5.NnfStorageLustreStatus, out *NnfStorageLustreStatus, s apiconversion.Scope) error {
return autoConvert_v1alpha5_NnfStorageLustreStatus_To_v1alpha3_NnfStorageLustreStatus(in, out, s)
}

func Convert_v1alpha5_NnfNodeStorageSpec_To_v1alpha3_NnfNodeStorageSpec(in *nnfv1alpha5.NnfNodeStorageSpec, out *NnfNodeStorageSpec, s apiconversion.Scope) error {
return autoConvert_v1alpha5_NnfNodeStorageSpec_To_v1alpha3_NnfNodeStorageSpec(in, out, s)
}

func Convert_v1alpha5_NnfStorageAllocationSetSpec_To_v1alpha3_NnfStorageAllocationSetSpec(in *nnfv1alpha5.NnfStorageAllocationSetSpec, out *NnfStorageAllocationSetSpec, s apiconversion.Scope) error {
return autoConvert_v1alpha5_NnfStorageAllocationSetSpec_To_v1alpha3_NnfStorageAllocationSetSpec(in, out, s)
}
56 changes: 34 additions & 22 deletions api/v1alpha3/zz_generated.conversion.go
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit c8bc0f8

Please sign in to comment.