Merge pull request #1638 from srm09/backport-1.3/node-aaf-and-labeling

Backport node anti affinity and node labeling features

Author: k8s-ci-robot

Makefile

@@ -253,8 +253,8 @@ apidiff: $(GO_APIDIFF) ## Run the apidiff tool
 
 .PHONY: modules
 modules: ## Runs go mod to ensure proper vendoring
-	go mod tidy
-	cd $(TOOLS_DIR); go mod tidy
+	go mod tidy -compat=1.17
+	cd $(TOOLS_DIR); go mod tidy -compat=1.17
 
 .PHONY: generate
 generate: ## Generate code

apis/v1alpha3/conversion.go

@@ -17,13 +17,31 @@ limitations under the License.
 package v1alpha3
 
 import (
-	conversion "k8s.io/apimachinery/pkg/conversion"
+	"k8s.io/apimachinery/pkg/conversion"
 
-	v1beta1 "sigs.k8s.io/cluster-api-provider-vsphere/apis/v1beta1"
+	"sigs.k8s.io/cluster-api-provider-vsphere/apis/v1beta1"
 )
 
 // Convert_v1beta1_VirtualMachineCloneSpec_To_v1alpha3_VirtualMachineCloneSpec is an autogenerated conversion function.
 //nolint:golint,revive,stylecheck
 func Convert_v1beta1_VirtualMachineCloneSpec_To_v1alpha3_VirtualMachineCloneSpec(in *v1beta1.VirtualMachineCloneSpec, out *VirtualMachineCloneSpec, s conversion.Scope) error {
 	return autoConvert_v1beta1_VirtualMachineCloneSpec_To_v1alpha3_VirtualMachineCloneSpec(in, out, s)
 }
+
+// Convert_v1beta1_VSphereVMStatus_To_v1alpha3_VSphereVMStatus is an autogenerated conversion function.
+//nolint:golint,revive,stylecheck
+func Convert_v1beta1_VSphereVMStatus_To_v1alpha3_VSphereVMStatus(in *v1beta1.VSphereVMStatus, out *VSphereVMStatus, s conversion.Scope) error {
+	return autoConvert_v1beta1_VSphereVMStatus_To_v1alpha3_VSphereVMStatus(in, out, s)
+}
+
+// Convert_v1beta1_VSphereClusterStatus_To_v1alpha3_VSphereClusterStatus
+//nolint:golint,revive,stylecheck
+func Convert_v1beta1_VSphereClusterStatus_To_v1alpha3_VSphereClusterStatus(in *v1beta1.VSphereClusterStatus, out *VSphereClusterStatus, s conversion.Scope) error {
+	return autoConvert_v1beta1_VSphereClusterStatus_To_v1alpha3_VSphereClusterStatus(in, out, s)
+}
+
+// Convert_v1beta1_VSphereClusterSpec_To_v1alpha3_VSphereClusterSpec
+//nolint:golint,revive,stylecheck
+func Convert_v1beta1_VSphereClusterSpec_To_v1alpha3_VSphereClusterSpec(in *v1beta1.VSphereClusterSpec, out *VSphereClusterSpec, s conversion.Scope) error {
+	return autoConvert_v1beta1_VSphereClusterSpec_To_v1alpha3_VSphereClusterSpec(in, out, s)
+}

apis/v1alpha3/conversion_test.go

@@ -38,10 +38,14 @@ func TestFuzzyConversion(t *testing.T) {
 	g.Expect(nextver.AddToScheme(scheme)).To(Succeed())
 
 	t.Run("for VSphereCluster", utilconversion.FuzzTestFunc(utilconversion.FuzzTestFuncInput{
-		Scheme:      scheme,
-		Hub:         &nextver.VSphereCluster{},
-		Spoke:       &VSphereCluster{},
-		FuzzerFuncs: []fuzzer.FuzzerFuncs{overrideVSphereClusterDeprecatedFieldsFuncs},
+		Scheme: scheme,
+		Hub:    &nextver.VSphereCluster{},
+		Spoke:  &VSphereCluster{},
+		FuzzerFuncs: []fuzzer.FuzzerFuncs{
+			overrideVSphereClusterDeprecatedFieldsFuncs,
+			overrideVSphereClusterSpecFieldsFuncs,
+			overrideVSphereClusterStatusFieldsFuncs,
+		},
 	}))
 	t.Run("for VSphereMachine", utilconversion.FuzzTestFunc(utilconversion.FuzzTestFuncInput{
 		Scheme:      scheme,
@@ -71,6 +75,24 @@ func overrideVSphereClusterDeprecatedFieldsFuncs(codecs runtimeserializer.CodecF
 	}
 }
 
+func overrideVSphereClusterSpecFieldsFuncs(codecs runtimeserializer.CodecFactory) []interface{} {
+	return []interface{}{
+		func(in *nextver.VSphereClusterSpec, c fuzz.Continue) {
+			c.FuzzNoCustom(in)
+			in.ClusterModules = nil
+		},
+	}
+}
+
+func overrideVSphereClusterStatusFieldsFuncs(codecs runtimeserializer.CodecFactory) []interface{} {
+	return []interface{}{
+		func(in *nextver.VSphereClusterStatus, c fuzz.Continue) {
+			c.FuzzNoCustom(in)
+			in.VCenterVersion = ""
+		},
+	}
+}
+
 func CustomObjectMetaFuzzFunc(_ runtimeserializer.CodecFactory) []interface{} {
 	return []interface{}{
 		CustomObjectMetaFuzzer,
@@ -91,13 +113,21 @@ func CustomObjectMetaFuzzer(in *clusterv1.ObjectMeta, c fuzz.Continue) {
 
 func CustomNewFieldFuzzFunc(_ runtimeserializer.CodecFactory) []interface{} {
 	return []interface{}{
-		CustomNewFieldFuzzer,
+		CustomSpecNewFieldFuzzer,
+		CustomStatusNewFieldFuzzer,
 	}
 }
 
-func CustomNewFieldFuzzer(in *nextver.VirtualMachineCloneSpec, c fuzz.Continue) {
+func CustomSpecNewFieldFuzzer(in *nextver.VirtualMachineCloneSpec, c fuzz.Continue) {
 	c.FuzzNoCustom(in)
 
 	in.PciDevices = nil
 	in.AdditionalDisksGiB = nil
 }
+
+func CustomStatusNewFieldFuzzer(in *nextver.VSphereVMStatus, c fuzz.Continue) {
+	c.FuzzNoCustom(in)
+
+	in.Host = ""
+	in.ModuleUUID = nil
+}

apis/v1alpha3/vspherevm_conversion.go

@@ -38,6 +38,7 @@ func (src *VSphereVM) ConvertTo(dstRaw conversion.Hub) error {
 	}
 	dst.Spec.TagIDs = restored.Spec.TagIDs
 	dst.Spec.AdditionalDisksGiB = restored.Spec.AdditionalDisksGiB
+	dst.Status.Host = restored.Status.Host
 
 	return nil
 }

apis/v1alpha3/zz_generated.conversion.go

@@ -17,13 +17,31 @@ limitations under the License.
 package v1alpha4
 
 import (
-	conversion "k8s.io/apimachinery/pkg/conversion"
+	"k8s.io/apimachinery/pkg/conversion"
 
-	v1beta1 "sigs.k8s.io/cluster-api-provider-vsphere/apis/v1beta1"
+	"sigs.k8s.io/cluster-api-provider-vsphere/apis/v1beta1"
 )
 
 // Convert_v1beta1_VirtualMachineCloneSpec_To_v1alpha4_VirtualMachineCloneSpec is an autogenerated conversion function.
 //nolint:golint,revive,stylecheck
 func Convert_v1beta1_VirtualMachineCloneSpec_To_v1alpha4_VirtualMachineCloneSpec(in *v1beta1.VirtualMachineCloneSpec, out *VirtualMachineCloneSpec, s conversion.Scope) error {
 	return autoConvert_v1beta1_VirtualMachineCloneSpec_To_v1alpha4_VirtualMachineCloneSpec(in, out, s)
 }
+
+// Convert_v1beta1_VSphereVMStatus_To_v1alpha4_VSphereVMStatus
+//nolint:golint,revive,stylecheck
+func Convert_v1beta1_VSphereVMStatus_To_v1alpha4_VSphereVMStatus(in *v1beta1.VSphereVMStatus, out *VSphereVMStatus, s conversion.Scope) error {
+	return autoConvert_v1beta1_VSphereVMStatus_To_v1alpha4_VSphereVMStatus(in, out, s)
+}
+
+// Convert_v1beta1_VSphereClusterStatus_To_v1alpha4_VSphereClusterStatus
+//nolint:golint,revive,stylecheck
+func Convert_v1beta1_VSphereClusterStatus_To_v1alpha4_VSphereClusterStatus(in *v1beta1.VSphereClusterStatus, out *VSphereClusterStatus, s conversion.Scope) error {
+	return autoConvert_v1beta1_VSphereClusterStatus_To_v1alpha4_VSphereClusterStatus(in, out, s)
+}
+
+// Convert_v1beta1_VSphereClusterSpec_To_v1alpha4_VSphereClusterSpec
+//nolint:golint,revive,stylecheck
+func Convert_v1beta1_VSphereClusterSpec_To_v1alpha4_VSphereClusterSpec(in *v1beta1.VSphereClusterSpec, out *VSphereClusterSpec, s conversion.Scope) error {
+	return autoConvert_v1beta1_VSphereClusterSpec_To_v1alpha4_VSphereClusterSpec(in, out, s)
+}

apis/v1alpha4/conversion.go

@@ -38,6 +38,7 @@ func (src *VSphereVM) ConvertTo(dstRaw conversion.Hub) error {
 	}
 	dst.Spec.TagIDs = restored.Spec.TagIDs
 	dst.Spec.AdditionalDisksGiB = restored.Spec.AdditionalDisksGiB
+	dst.Status.Host = restored.Status.Host
 
 	return nil
 }