Add support for SSHKey and Image names (VPC) (#989)

Signed-off-by: Prajyot-Parab <[email protected]>

Signed-off-by: Prajyot-Parab <[email protected]>

Author: Prajyot-Parab

api/v1beta1/ibmvpc_conversion.go

@@ -17,8 +17,12 @@ limitations under the License.
 package v1beta1
 
 import (
+	apiconversion "k8s.io/apimachinery/pkg/conversion"
+
 	"sigs.k8s.io/controller-runtime/pkg/conversion"
 
+	utilconversion "sigs.k8s.io/cluster-api/util/conversion"
+
 	infrav1beta2 "sigs.k8s.io/cluster-api-provider-ibmcloud/api/v1beta2"
 )
 
@@ -49,13 +53,58 @@ func (dst *IBMVPCClusterList) ConvertFrom(srcRaw conversion.Hub) error {
 func (src *IBMVPCMachine) ConvertTo(dstRaw conversion.Hub) error {
 	dst := dstRaw.(*infrav1beta2.IBMVPCMachine)
 
-	return Convert_v1beta1_IBMVPCMachine_To_v1beta2_IBMVPCMachine(src, dst, nil)
+	if err := Convert_v1beta1_IBMVPCMachine_To_v1beta2_IBMVPCMachine(src, dst, nil); err != nil {
+		return err
+	}
+
+	if src.Spec.Image != "" {
+		dst.Spec.Image = &infrav1beta2.IBMVPCResourceReference{
+			ID: &src.Spec.Image,
+		}
+	}
+
+	if src.Spec.ImageName != "" {
+		dst.Spec.Image = &infrav1beta2.IBMVPCResourceReference{
+			Name: &src.Spec.ImageName,
+		}
+	}
+
+	for _, sshKey := range src.Spec.SSHKeyNames {
+		dst.Spec.SSHKeys = append(dst.Spec.SSHKeys, &infrav1beta2.IBMVPCResourceReference{
+			Name: sshKey,
+		})
+	}
+
+	return nil
 }
 
 func (dst *IBMVPCMachine) ConvertFrom(srcRaw conversion.Hub) error {
 	src := srcRaw.(*infrav1beta2.IBMVPCMachine)
 
-	return Convert_v1beta2_IBMVPCMachine_To_v1beta1_IBMVPCMachine(src, dst, nil)
+	if err := Convert_v1beta2_IBMVPCMachine_To_v1beta1_IBMVPCMachine(src, dst, nil); err != nil {
+		return err
+	}
+
+	// Preserve Hub data on down-conversion except for metadata
+	if err := utilconversion.MarshalData(src, dst); err != nil {
+		return err
+	}
+
+	if src.Spec.Image != nil && src.Spec.Image.ID != nil {
+		dst.Spec.Image = *src.Spec.Image.ID
+	}
+
+	if src.Spec.Image != nil && src.Spec.Image.Name != nil {
+		dst.Spec.ImageName = *src.Spec.Image.Name
+	}
+
+	for _, sshKey := range src.Spec.SSHKeys {
+		if sshKey.Name != nil {
+			dst.Spec.SSHKeyNames = append(dst.Spec.SSHKeyNames, sshKey.Name)
+		}
+	}
+
+	return nil
 }
 
 func (src *IBMVPCMachineList) ConvertTo(dstRaw conversion.Hub) error {
@@ -73,13 +122,58 @@ func (dst *IBMVPCMachineList) ConvertFrom(srcRaw conversion.Hub) error {
 func (src *IBMVPCMachineTemplate) ConvertTo(dstRaw conversion.Hub) error {
 	dst := dstRaw.(*infrav1beta2.IBMVPCMachineTemplate)
 
-	return Convert_v1beta1_IBMVPCMachineTemplate_To_v1beta2_IBMVPCMachineTemplate(src, dst, nil)
+	if err := Convert_v1beta1_IBMVPCMachineTemplate_To_v1beta2_IBMVPCMachineTemplate(src, dst, nil); err != nil {
+		return err
+	}
+
+	if src.Spec.Template.Spec.Image != "" {
+		dst.Spec.Template.Spec.Image = &infrav1beta2.IBMVPCResourceReference{
+			ID: &src.Spec.Template.Spec.Image,
+		}
+	}
+
+	if src.Spec.Template.Spec.ImageName != "" {
+		dst.Spec.Template.Spec.Image = &infrav1beta2.IBMVPCResourceReference{
+			Name: &src.Spec.Template.Spec.ImageName,
+		}
+	}
+
+	for _, sshKey := range src.Spec.Template.Spec.SSHKeyNames {
+		dst.Spec.Template.Spec.SSHKeys = append(dst.Spec.Template.Spec.SSHKeys, &infrav1beta2.IBMVPCResourceReference{
+			Name: sshKey,
+		})
+	}
+
+	return nil
 }
 
 func (dst *IBMVPCMachineTemplate) ConvertFrom(srcRaw conversion.Hub) error {
 	src := srcRaw.(*infrav1beta2.IBMVPCMachineTemplate)
 
-	return Convert_v1beta2_IBMVPCMachineTemplate_To_v1beta1_IBMVPCMachineTemplate(src, dst, nil)
+	if err := Convert_v1beta2_IBMVPCMachineTemplate_To_v1beta1_IBMVPCMachineTemplate(src, dst, nil); err != nil {
+		return err
+	}
+
+	// Preserve Hub data on down-conversion except for metadata
+	if err := utilconversion.MarshalData(src, dst); err != nil {
+		return err
+	}
+
+	if src.Spec.Template.Spec.Image != nil && src.Spec.Template.Spec.Image.ID != nil {
+		dst.Spec.Template.Spec.Image = *src.Spec.Template.Spec.Image.ID
+	}
+
+	if src.Spec.Template.Spec.Image != nil && src.Spec.Template.Spec.Image.Name != nil {
+		dst.Spec.Template.Spec.ImageName = *src.Spec.Template.Spec.Image.Name
+	}
+
+	for _, sshKey := range src.Spec.Template.Spec.SSHKeys {
+		if sshKey.Name != nil {
+			dst.Spec.Template.Spec.SSHKeyNames = append(dst.Spec.Template.Spec.SSHKeyNames, sshKey.Name)
+		}
+	}
+
+	return nil
 }
 
 func (src *IBMVPCMachineTemplateList) ConvertTo(dstRaw conversion.Hub) error {
@@ -93,3 +187,31 @@ func (dst *IBMVPCMachineTemplateList) ConvertFrom(srcRaw conversion.Hub) error {
 
 	return Convert_v1beta2_IBMVPCMachineTemplateList_To_v1beta1_IBMVPCMachineTemplateList(src, dst, nil)
 }
+
+func Convert_v1beta1_IBMVPCMachineSpec_To_v1beta2_IBMVPCMachineSpec(in *IBMVPCMachineSpec, out *infrav1beta2.IBMVPCMachineSpec, s apiconversion.Scope) error {
+	return autoConvert_v1beta1_IBMVPCMachineSpec_To_v1beta2_IBMVPCMachineSpec(in, out, s)
+}
+
+func Convert_v1beta2_IBMVPCMachineSpec_To_v1beta1_IBMVPCMachineSpec(in *infrav1beta2.IBMVPCMachineSpec, out *IBMVPCMachineSpec, s apiconversion.Scope) error {
+	return autoConvert_v1beta2_IBMVPCMachineSpec_To_v1beta1_IBMVPCMachineSpec(in, out, s)
+}
+
+func Convert_Slice_Pointer_string_To_Slice_Pointer_v1beta2_IBMVPCResourceReference(in *[]*string, out *[]*infrav1beta2.IBMVPCResourceReference, s apiconversion.Scope) error {
+	for _, sshKey := range *in {
+		*out = append(*out, &infrav1beta2.IBMVPCResourceReference{
+			ID: sshKey,
+		})
+	}
+	return nil
+}
+
+func Convert_Slice_Pointer_v1beta2_IBMVPCResourceReference_To_Slice_Pointer_string(in *[]*infrav1beta2.IBMVPCResourceReference, out *[]*string, s apiconversion.Scope) error {
+	if in != nil {
+		for _, sshKey := range *in {
+			if sshKey.ID != nil {
+				*out = append(*out, sshKey.ID)
+			}
+		}
+	}
+	return nil
+}

api/v1beta1/ibmvpcmachine_types.go

@@ -37,9 +37,13 @@ type IBMVPCMachineSpec struct {
 	Name string `json:"name,omitempty"`
 
 	// Image is the id of OS image which would be install on the instance.
+	// +optional
 	// Example: r134-ed3f775f-ad7e-4e37-ae62-7199b4988b00
-	// TODO: allow user to specify a image name is much reasonable. Example: ibm-ubuntu-18-04-1-minimal-amd64-2
-	Image string `json:"image"`
+	Image string `json:"image,omitempty"`
+
+	// ImageName is the name of OS image which would be install on the instance.
+	// +optional
+	ImageName string `json:"imageName,omitempty"`
 
 	// Zone is the place where the instance should be created. Example: us-south-3
 	// TODO: Actually zone is transparent to user. The field user can access is location. Example: Dallas 2
@@ -62,7 +66,12 @@ type IBMVPCMachineSpec struct {
 	PrimaryNetworkInterface NetworkInterface `json:"primaryNetworkInterface,omitempty"`
 
 	// SSHKeys is the SSH pub keys that will be used to access VM.
+	// +optional
 	SSHKeys []*string `json:"sshKeys,omitempty"`
+
+	// SSHKeysNames is the SSH pub key names that will be used to access VM.
+	// +optional
+	SSHKeyNames []*string `json:"sshKeyNames,omitempty"`
 }
 
 // VPCVolume defines the volume information for the instance.