Make DeletePolicy & FailurePolicy enum fields non-pointers

Signed-off-by: Stefan Büringer buringerst@vmware.com

Author: sbueringer

.golangci-kal.yml

@@ -171,7 +171,7 @@ linters:
         - kubeapilinter
     # KAL does not handle enum markers on enum types yet: https://github.com/kubernetes-sigs/kube-api-linter/issues/113
     - path: ".*"
-      text: "optionalfields: field (Format|Encoding|Type|DeletePolicy) is optional and (should be a pointer|has a valid zero value)"
+      text: "optionalfields: field (Format|Encoding|Type|DeletePolicy|FailurePolicy) is optional and (should be a pointer|has a valid zero value)"
       linters:
         - kubeapilinter
 

api/core/v1beta1/conversion.go

@@ -1661,6 +1661,26 @@ func Convert_v1beta2_ClusterClassTemplateReference_To_v1beta1_LocalObjectTemplat
 	}
 }
 
+func Convert_v1beta1_MachineRollingUpdateDeployment_To_v1beta2_MachineRollingUpdateDeployment(in *MachineRollingUpdateDeployment, out *clusterv1.MachineRollingUpdateDeployment, s apimachineryconversion.Scope) error {
+	if err := autoConvert_v1beta1_MachineRollingUpdateDeployment_To_v1beta2_MachineRollingUpdateDeployment(in, out, s); err != nil {
+		return err
+	}
+	if in.DeletePolicy != nil {
+		out.DeletePolicy = clusterv1.MachineSetDeletePolicy(*in.DeletePolicy)
+	}
+	return nil
+}
+
+func Convert_v1beta2_MachineRollingUpdateDeployment_To_v1beta1_MachineRollingUpdateDeployment(in *clusterv1.MachineRollingUpdateDeployment, out *MachineRollingUpdateDeployment, s apimachineryconversion.Scope) error {
+	if err := autoConvert_v1beta2_MachineRollingUpdateDeployment_To_v1beta1_MachineRollingUpdateDeployment(in, out, s); err != nil {
+		return err
+	}
+	if in.DeletePolicy != "" {
+		out.DeletePolicy = ptr.To(string(in.DeletePolicy))
+	}
+	return nil
+}
+
 func convertMachineSpecToContractVersionedObjectReference(src *MachineSpec, dst *clusterv1.MachineSpec) error {
 	infraRef, err := convertToContractVersionedObjectReference(&src.InfrastructureRef)
 	if err != nil {

api/core/v1beta1/conversion_test.go

@@ -201,6 +201,16 @@ func spokeCluster(in *Cluster, c randfill.Continue) {
 	}
 
 	dropEmptyStringsCluster(in)
+
+	if in.Spec.Topology != nil && in.Spec.Topology.Workers != nil {
+		for _, md := range in.Spec.Topology.Workers.MachineDeployments {
+			if md.Strategy != nil && md.Strategy.RollingUpdate != nil &&
+				md.Strategy.RollingUpdate.DeletePolicy != nil && *md.Strategy.RollingUpdate.DeletePolicy == "" {
+				// &"" Is not a valid value for DeletePolicy as the enum validation enforces an enum value if DeletePolicy is set.
+				md.Strategy.RollingUpdate.DeletePolicy = nil
+			}
+		}
+	}
 }
 
 func spokeClusterTopology(in *Topology, c randfill.Continue) {
@@ -323,6 +333,14 @@ func spokeClusterClass(in *ClusterClass, c randfill.Continue) {
 	in.Namespace = "foo"
 
 	dropEmptyStringsClusterClass(in)
+
+	for _, md := range in.Spec.Workers.MachineDeployments {
+		if md.Strategy != nil && md.Strategy.RollingUpdate != nil &&
+			md.Strategy.RollingUpdate.DeletePolicy != nil && *md.Strategy.RollingUpdate.DeletePolicy == "" {
+			// &"" Is not a valid value for DeletePolicy as the enum validation enforces an enum value if DeletePolicy is set.
+			md.Strategy.RollingUpdate.DeletePolicy = nil
+		}
+	}
 }
 
 func spokeClusterClassStatus(in *ClusterClassStatus, c randfill.Continue) {
@@ -585,6 +603,12 @@ func spokeMachineDeployment(in *MachineDeployment, c randfill.Continue) {
 	fillMachineSpec(&in.Spec.Template.Spec, c, in.Namespace)
 
 	dropEmptyStringsMachineSpec(&in.Spec.Template.Spec)
+
+	if in.Spec.Strategy != nil && in.Spec.Strategy.RollingUpdate != nil &&
+		in.Spec.Strategy.RollingUpdate.DeletePolicy != nil && *in.Spec.Strategy.RollingUpdate.DeletePolicy == "" {
+		// &"" Is not a valid value for DeletePolicy as the enum validation enforces an enum value if DeletePolicy is set.
+		in.Spec.Strategy.RollingUpdate.DeletePolicy = nil
+	}
 }
 
 func spokeMachineDeploymentSpec(in *MachineDeploymentSpec, c randfill.Continue) {

api/core/v1beta1/zz_generated.conversion.go

@@ -360,7 +360,7 @@ type MachineRollingUpdateDeployment struct {
 	// Valid values are "Random, "Newest", "Oldest"
 	// When no value is supplied, the default DeletePolicy of MachineSet is used
 	// +optional
-	DeletePolicy *MachineSetDeletePolicy `json:"deletePolicy,omitempty"`
+	DeletePolicy MachineSetDeletePolicy `json:"deletePolicy,omitempty"`
 }
 
 // ANCHOR_END: MachineRollingUpdateDeployment

api/core/v1beta2/machinedeployment_types.go

@@ -19,6 +19,7 @@ package v1alpha1
 import (
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	apimachineryconversion "k8s.io/apimachinery/pkg/conversion"
+	"k8s.io/utils/ptr"
 	"sigs.k8s.io/controller-runtime/pkg/conversion"
 
 	clusterv1beta1 "sigs.k8s.io/cluster-api/api/core/v1beta1"
@@ -106,6 +107,28 @@ func Convert_v1beta1_Condition_To_v1_Condition(in *clusterv1beta1.Condition, out
 	return clusterv1beta1.Convert_v1beta1_Condition_To_v1_Condition(in, out, s)
 }
 
+func Convert_v1alpha1_ExtensionHandler_To_v1beta2_ExtensionHandler(in *ExtensionHandler, out *runtimev1.ExtensionHandler, s apimachineryconversion.Scope) error {
+	if err := autoConvert_v1alpha1_ExtensionHandler_To_v1beta2_ExtensionHandler(in, out, s); err != nil {
+		return err
+	}
+
+	if in.FailurePolicy != nil {
+		out.FailurePolicy = runtimev1.FailurePolicy(*in.FailurePolicy)
+	}
+	return nil
+}
+
+func Convert_v1beta2_ExtensionHandler_To_v1alpha1_ExtensionHandler(in *runtimev1.ExtensionHandler, out *ExtensionHandler, s apimachineryconversion.Scope) error {
+	if err := autoConvert_v1beta2_ExtensionHandler_To_v1alpha1_ExtensionHandler(in, out, s); err != nil {
+		return err
+	}
+
+	if in.FailurePolicy != "" {
+		out.FailurePolicy = ptr.To(FailurePolicy(in.FailurePolicy))
+	}
+	return nil
+}
+
 func dropEmptyStringsExtensionConfig(dst *ExtensionConfig) {
 	dropEmptyString(&dst.Spec.ClientConfig.URL)
 	if dst.Spec.ClientConfig.Service != nil {

api/core/v1beta2/zz_generated.deepcopy.go

@@ -72,4 +72,12 @@ func spokeExtensionConfigStatus(in *ExtensionConfigStatus, c randfill.Continue)
 			in.V1Beta2 = nil
 		}
 	}
+
+	for i, h := range in.Handlers {
+		if h.FailurePolicy != nil && *h.FailurePolicy == "" {
+			// &"" Is not a valid value for FailurePolicy as the enum validation enforces an enum value if FailurePolicy is set.
+			h.FailurePolicy = nil
+		}
+		in.Handlers[i] = h
+	}
 }