Merge pull request #1095 from srm09/remove-deprecated-items

Removes fields marked as deprecated

Author: k8s-ci-robot

Makefile

@@ -279,7 +279,6 @@ manifests:  $(STAGE)-version-check $(STAGE)-flavors $(MANIFEST_DIR) $(BUILD_DIR)
 
 .PHONY: flavors
 flavors: $(FLAVOR_DIR)
-	go run ./packaging/flavorgen -f multi-host > $(FLAVOR_DIR)/cluster-template-haproxy.yaml
 	go run ./packaging/flavorgen -f vip > $(FLAVOR_DIR)/cluster-template.yaml
 	go run ./packaging/flavorgen -f external-loadbalancer > $(FLAVOR_DIR)/cluster-template-external-loadbalancer.yaml
 

api/v1alpha3/conversion_test.go

@@ -21,7 +21,10 @@ import (
 
 	. "github.com/onsi/gomega"
 
+	fuzz "github.com/google/gofuzz"
+	"k8s.io/apimachinery/pkg/api/apitesting/fuzzer"
 	"k8s.io/apimachinery/pkg/runtime"
+	runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer"
 	utilconversion "sigs.k8s.io/cluster-api/util/conversion"
 
 	nextver "sigs.k8s.io/cluster-api-provider-vsphere/api/v1alpha4"
@@ -34,9 +37,10 @@ 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{},
+		Scheme:      scheme,
+		Hub:         &nextver.VSphereCluster{},
+		Spoke:       &VSphereCluster{},
+		FuzzerFuncs: []fuzzer.FuzzerFuncs{overrideDeprecatedFieldsFuncs},
 	}))
 	t.Run("for VSphereMachine", utilconversion.FuzzTestFunc(utilconversion.FuzzTestFuncInput{
 		Scheme: scheme,
@@ -54,3 +58,11 @@ func TestFuzzyConversion(t *testing.T) {
 		Spoke:  &VSphereVM{},
 	}))
 }
+
+func overrideDeprecatedFieldsFuncs(codecs runtimeserializer.CodecFactory) []interface{} {
+	return []interface{}{
+		func(vsphereClusterSpec *VSphereClusterSpec, c fuzz.Continue) {
+			vsphereClusterSpec.CloudProviderConfiguration = CPIConfig{}
+		},
+	}
+}

api/v1alpha3/haproxyloadbalancer_conversion.go

@@ -16,31 +16,8 @@ limitations under the License.
 
 package v1alpha3
 
-import (
-	infrav1alpha4 "sigs.k8s.io/cluster-api-provider-vsphere/api/v1alpha4"
-	"sigs.k8s.io/controller-runtime/pkg/conversion"
-)
+// Hub marks HAProxyLoadBalancer as a conversion hub.
+func (*HAProxyLoadBalancer) Hub() {}
 
-// ConvertTo converts this HAProxyLoadBalancer to the Hub version (v1alpha4).
-func (src *HAProxyLoadBalancer) ConvertTo(dstRaw conversion.Hub) error { // nolint
-	dst := dstRaw.(*infrav1alpha4.HAProxyLoadBalancer)
-	return Convert_v1alpha3_HAProxyLoadBalancer_To_v1alpha4_HAProxyLoadBalancer(src, dst, nil)
-}
-
-// ConvertFrom converts from the Hub version (v1alpha4) to this HAProxyLoadBalancer.
-func (dst *HAProxyLoadBalancer) ConvertFrom(srcRaw conversion.Hub) error { // nolint
-	src := srcRaw.(*infrav1alpha4.HAProxyLoadBalancer)
-	return Convert_v1alpha4_HAProxyLoadBalancer_To_v1alpha3_HAProxyLoadBalancer(src, dst, nil)
-}
-
-// ConvertTo converts this HAProxyLoadBalancerList to the Hub version (v1alpha4).
-func (src *HAProxyLoadBalancerList) ConvertTo(dstRaw conversion.Hub) error { // nolint
-	dst := dstRaw.(*infrav1alpha4.HAProxyLoadBalancerList)
-	return Convert_v1alpha3_HAProxyLoadBalancerList_To_v1alpha4_HAProxyLoadBalancerList(src, dst, nil)
-}
-
-// ConvertFrom converts this VSphereVM to the Hub version (v1alpha4).
-func (dst *HAProxyLoadBalancerList) ConvertFrom(srcRaw conversion.Hub) error { // nolint
-	src := srcRaw.(*infrav1alpha4.HAProxyLoadBalancerList)
-	return Convert_v1alpha4_HAProxyLoadBalancerList_To_v1alpha3_HAProxyLoadBalancerList(src, dst, nil)
-}
+// Hub marks HAProxyLoadBalancerList as a conversion hub.
+func (*HAProxyLoadBalancerList) Hub() {}

api/v1alpha3/vspherecluster_conversion.go

@@ -70,3 +70,7 @@ func (dst *VSphereClusterList) ConvertFrom(srcRaw conversion.Hub) error { // nol
 func Convert_v1alpha4_VSphereClusterSpec_To_v1alpha3_VSphereClusterSpec(in *infrav1alpha4.VSphereClusterSpec, out *VSphereClusterSpec, s apiconversion.Scope) error { // nolint
 	return autoConvert_v1alpha4_VSphereClusterSpec_To_v1alpha3_VSphereClusterSpec(in, out, s)
 }
+
+func Convert_v1alpha3_VSphereClusterSpec_To_v1alpha4_VSphereClusterSpec(in *VSphereClusterSpec, out *infrav1alpha4.VSphereClusterSpec, s apiconversion.Scope) error { //nolint
+	return autoConvert_v1alpha3_VSphereClusterSpec_To_v1alpha4_VSphereClusterSpec(in, out, s)
+}