Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions api/v1alpha3/conversion.go
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@ func (src *Metal3MachineTemplate) ConvertTo(dstRaw conversion.Hub) error {
dst.Spec.Template.Spec.NetworkData = restored.Spec.Template.Spec.NetworkData
dst.Spec.Template.Spec.DataTemplate = restored.Spec.Template.Spec.DataTemplate
dst.Spec.Template.Spec.Image = restored.Spec.Template.Spec.Image
dst.Spec.NodeReuse = restored.Spec.NodeReuse

return nil
}
Expand Down Expand Up @@ -165,3 +166,11 @@ func Convert_v1alpha4_Image_To_v1alpha3_Image(in *v1alpha4.Image, out *Image, s

return nil
}

func Convert_v1alpha4_Metal3MachineTemplateSpec_To_v1alpha3_Metal3MachineTemplateSpec(in *v1alpha4.Metal3MachineTemplateSpec, out *Metal3MachineTemplateSpec, s apiconversion.Scope) error {
if err := autoConvert_v1alpha4_Metal3MachineTemplateSpec_To_v1alpha3_Metal3MachineTemplateSpec(in, out, s); err != nil {
return err
}

return nil
}
16 changes: 6 additions & 10 deletions api/v1alpha3/zz_generated.conversion.go

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

6 changes: 6 additions & 0 deletions api/v1alpha4/metal3machinetemplate_types.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,12 @@ import (
// Metal3MachineTemplateSpec defines the desired state of Metal3MachineTemplate
type Metal3MachineTemplateSpec struct {
Template Metal3MachineTemplateResource `json:"template"`

// When set to True, CAPM3 Machine controller will
// pick the same pool of BMHs' that were released during the upgrade operation.
// +kubebuilder:default=false
Comment thread
furkatgofurov7 marked this conversation as resolved.
// +optional
NodeReuse bool `json:"nodeReuse"`
Comment thread
furkatgofurov7 marked this conversation as resolved.
}

// +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object
Expand Down
2 changes: 1 addition & 1 deletion baremetal/metal3data_manager.go
Original file line number Diff line number Diff line change
Expand Up @@ -270,7 +270,7 @@ func (m *DataManager) createSecrets(ctx context.Context) error {
return nil
}

// CreateSecrets creates the secret if they do not exist.
// ReleaseLeases releases addresses from pool.
func (m *DataManager) ReleaseLeases(ctx context.Context) error {
if m.Data.Spec.Template.Name == "" {
return nil
Expand Down
Loading