Merge pull request #1241 from yastij/add-meta

add metadata to the vspheremachinetemplate

Author: k8s-ci-robot

api/v1alpha3/conversion_test.go

@@ -25,6 +25,7 @@ import (
 	"k8s.io/apimachinery/pkg/api/apitesting/fuzzer"
 	"k8s.io/apimachinery/pkg/runtime"
 	runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer"
+	clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
 	utilconversion "sigs.k8s.io/cluster-api/util/conversion"
 
 	nextver "sigs.k8s.io/cluster-api-provider-vsphere/api/v1alpha4"
@@ -40,17 +41,18 @@ func TestFuzzyConversion(t *testing.T) {
 		Scheme:      scheme,
 		Hub:         &nextver.VSphereCluster{},
 		Spoke:       &VSphereCluster{},
-		FuzzerFuncs: []fuzzer.FuzzerFuncs{overrideDeprecatedFieldsFuncs},
+		FuzzerFuncs: []fuzzer.FuzzerFuncs{overrideVSphereClusterDeprecatedFieldsFuncs},
 	}))
 	t.Run("for VSphereMachine", utilconversion.FuzzTestFunc(utilconversion.FuzzTestFuncInput{
 		Scheme: scheme,
 		Hub:    &nextver.VSphereMachine{},
 		Spoke:  &VSphereMachine{},
 	}))
 	t.Run("for VSphereMachineTemplate", utilconversion.FuzzTestFunc(utilconversion.FuzzTestFuncInput{
-		Scheme: scheme,
-		Hub:    &nextver.VSphereMachineTemplate{},
-		Spoke:  &VSphereMachineTemplate{},
+		Scheme:      scheme,
+		Hub:         &nextver.VSphereMachineTemplate{},
+		Spoke:       &VSphereMachineTemplate{},
+		FuzzerFuncs: []fuzzer.FuzzerFuncs{CustomObjectMetaFuzzFunc},
 	}))
 	t.Run("for VSphereVM", utilconversion.FuzzTestFunc(utilconversion.FuzzTestFuncInput{
 		Scheme: scheme,
@@ -59,10 +61,28 @@ func TestFuzzyConversion(t *testing.T) {
 	}))
 }
 
-func overrideDeprecatedFieldsFuncs(codecs runtimeserializer.CodecFactory) []interface{} {
+func overrideVSphereClusterDeprecatedFieldsFuncs(codecs runtimeserializer.CodecFactory) []interface{} {
 	return []interface{}{
 		func(vsphereClusterSpec *VSphereClusterSpec, c fuzz.Continue) {
 			vsphereClusterSpec.CloudProviderConfiguration = CPIConfig{}
 		},
 	}
 }
+
+func CustomObjectMetaFuzzFunc(_ runtimeserializer.CodecFactory) []interface{} {
+	return []interface{}{
+		CustomObjectMetaFuzzer,
+	}
+}
+
+//nolint
+func CustomObjectMetaFuzzer(in *clusterv1.ObjectMeta, c fuzz.Continue) {
+	c.FuzzNoCustom(in)
+
+	// These fields have been removed in v1alpha4
+	// data is going to be lost, so we're forcing zero values here.
+	in.Name = ""
+	in.GenerateName = ""
+	in.Namespace = ""
+	in.OwnerReferences = nil
+}

api/v1alpha3/types.go

@@ -18,6 +18,8 @@ package v1alpha3
 
 import (
 	"fmt"
+
+	clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha3"
 )
 
 const (
@@ -142,6 +144,12 @@ type VirtualMachineCloneSpec struct {
 
 // VSphereMachineTemplateResource describes the data needed to create a VSphereMachine from a template
 type VSphereMachineTemplateResource struct {
+
+	// Standard object's metadata.
+	// More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata
+	// +optional
+	ObjectMeta clusterv1.ObjectMeta `json:"metadata,omitempty"`
+
 	// Spec is the specification of the desired behavior of the machine.
 	Spec VSphereMachineSpec `json:"spec"`
 }

api/v1alpha3/vspheremachinetemplate_conversion.go

@@ -17,7 +17,10 @@ limitations under the License.
 package v1alpha3
 
 import (
+	apiconversion "k8s.io/apimachinery/pkg/conversion"
 	infrav1alpha4 "sigs.k8s.io/cluster-api-provider-vsphere/api/v1alpha4"
+	clusterv1a3 "sigs.k8s.io/cluster-api/api/v1alpha3"
+	clusterv1a4 "sigs.k8s.io/cluster-api/api/v1alpha4"
 	"sigs.k8s.io/controller-runtime/pkg/conversion"
 )
 
@@ -41,3 +44,39 @@ func (dst *VSphereMachineTemplateList) ConvertFrom(srcRaw conversion.Hub) error
 	src := srcRaw.(*infrav1alpha4.VSphereMachineTemplateList)
 	return Convert_v1alpha4_VSphereMachineTemplateList_To_v1alpha3_VSphereMachineTemplateList(src, dst, nil)
 }
+
+//nolint
+func Convert_v1alpha3_VSphereMachineTemplateResource_To_v1alpha4_VSphereMachineTemplateResource(in *VSphereMachineTemplateResource, out *infrav1alpha4.VSphereMachineTemplateResource, s apiconversion.Scope) error {
+	if err := clusterv1a3.Convert_v1alpha3_ObjectMeta_To_v1alpha4_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil {
+		return err
+	}
+	if err := Convert_v1alpha3_VSphereMachineSpec_To_v1alpha4_VSphereMachineSpec(&in.Spec, &out.Spec, s); err != nil {
+		return err
+	}
+	return nil
+}
+
+//nolint
+func Convert_v1alpha4_VSphereMachineTemplateResource_To_v1alpha3_VSphereMachineTemplateResource(in *infrav1alpha4.VSphereMachineTemplateResource, out *VSphereMachineTemplateResource, s apiconversion.Scope) error {
+	if err := clusterv1a3.Convert_v1alpha4_ObjectMeta_To_v1alpha3_ObjectMeta(&in.ObjectMeta, &out.ObjectMeta, s); err != nil {
+		return err
+	}
+	if err := Convert_v1alpha4_VSphereMachineSpec_To_v1alpha3_VSphereMachineSpec(&in.Spec, &out.Spec, s); err != nil {
+		return err
+	}
+	return nil
+}
+
+//nolint
+func Convert_v1alpha3_ObjectMeta_To_v1alpha4_ObjectMeta(in *clusterv1a3.ObjectMeta, out *clusterv1a4.ObjectMeta, s apiconversion.Scope) error {
+	// wrapping the conversion func to avoid having compile errors due to compileErrorOnMissingConversion()
+	// more details at https://github.com/kubernetes/kubernetes/issues/98380
+	return clusterv1a3.Convert_v1alpha3_ObjectMeta_To_v1alpha4_ObjectMeta(in, out, s)
+}
+
+//nolint
+func Convert_v1alpha4_ObjectMeta_To_v1alpha3_ObjectMeta(in *clusterv1a4.ObjectMeta, out *clusterv1a3.ObjectMeta, s apiconversion.Scope) error {
+	// wrapping the conversion func to avoid having compile errors due to compileErrorOnMissingConversion()
+	// more details at https://github.com/kubernetes/kubernetes/issues/98380
+	return clusterv1a3.Convert_v1alpha4_ObjectMeta_To_v1alpha3_ObjectMeta(in, out, s)
+}

api/v1alpha3/zz_generated.conversion.go

@@ -18,6 +18,8 @@ package v1alpha4
 
 import (
 	"fmt"
+
+	clusterv1 "sigs.k8s.io/cluster-api/api/v1alpha4"
 )
 
 const (
@@ -142,6 +144,12 @@ type VirtualMachineCloneSpec struct {
 
 // VSphereMachineTemplateResource describes the data needed to create a VSphereMachine from a template
 type VSphereMachineTemplateResource struct {
+
+	// Standard object's metadata.
+	// More info: https://git.k8s.io/community/contributors/devel/sig-architecture/api-conventions.md#metadata
+	// +optional
+	ObjectMeta clusterv1.ObjectMeta `json:"metadata,omitempty"`
+
 	// Spec is the specification of the desired behavior of the machine.
 	Spec VSphereMachineSpec `json:"spec"`
 }