Merge pull request #12518 from sbueringer/pr-remove-time-pointers

⚠️ Change all *metav1.Time fields to metav1.Time

Author: k8s-ci-robot

.golangci-kal.yml

@@ -163,6 +163,10 @@ linters:
       text: "optionalfields: field (Status|Initialization) is optional and should (be a pointer|have the omitempty tag)"
       linters:
         - kubeapilinter
+    - path: "api/.*"
+      text: "optionalfields: field (LastAppliedTime|Expires|After|LastUpdated|CertificatesExpiryDate|NodeDrainStartTime|WaitForNodeVolumeDetachStartTime) is optional and should (be a pointer|have the omitempty tag)"
+      linters:
+        - kubeapilinter
     - path: "api/bootstrap/kubeadm/v1beta2"
       text: "optionalfields: field (Spec|NodeRegistration|LocalAPIEndpoint|Etcd|APIServer|ControllerManager|Scheduler|DNS|Discovery|ObjectMeta) is optional and should (be a pointer|have the omitempty tag)"
       linters:

api/addons/v1beta1/conversion.go

@@ -21,6 +21,7 @@ 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"
 
 	addonsv1 "sigs.k8s.io/cluster-api/api/addons/v1beta2"
@@ -122,6 +123,26 @@ func Convert_v1beta2_ResourceSetBinding_To_Pointer_v1beta1_ResourceSetBinding(in
 	return autoConvert_v1beta2_ResourceSetBinding_To_v1beta1_ResourceSetBinding(in, *out, s)
 }
 
+func Convert_v1beta1_ResourceBinding_To_v1beta2_ResourceBinding(in *ResourceBinding, out *addonsv1.ResourceBinding, s apimachineryconversion.Scope) error {
+	if err := autoConvert_v1beta1_ResourceBinding_To_v1beta2_ResourceBinding(in, out, s); err != nil {
+		return err
+	}
+	if in.LastAppliedTime != nil && !reflect.DeepEqual(in.LastAppliedTime, &metav1.Time{}) {
+		out.LastAppliedTime = *in.LastAppliedTime
+	}
+	return nil
+}
+
+func Convert_v1beta2_ResourceBinding_To_v1beta1_ResourceBinding(in *addonsv1.ResourceBinding, out *ResourceBinding, s apimachineryconversion.Scope) error {
+	if err := autoConvert_v1beta2_ResourceBinding_To_v1beta1_ResourceBinding(in, out, s); err != nil {
+		return err
+	}
+	if !reflect.DeepEqual(in.LastAppliedTime, metav1.Time{}) {
+		out.LastAppliedTime = ptr.To(in.LastAppliedTime)
+	}
+	return nil
+}
+
 // Implement local conversion func because conversion-gen is not aware of conversion func in other packages (see https://github.com/kubernetes/code-generator/issues/94)
 
 func Convert_v1_Condition_To_v1beta1_Condition(in *metav1.Condition, out *clusterv1beta1.Condition, s apimachineryconversion.Scope) error {

api/addons/v1beta1/conversion_test.go

@@ -23,6 +23,7 @@ import (
 	"testing"
 
 	"k8s.io/apimachinery/pkg/api/apitesting/fuzzer"
+	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	runtimeserializer "k8s.io/apimachinery/pkg/runtime/serializer"
 	"sigs.k8s.io/randfill"
 
@@ -86,5 +87,12 @@ func spokeClusterResourceSetBindingSpec(in *ClusterResourceSetBindingSpec, c ran
 		if b != nil && reflect.DeepEqual(*b, ResourceSetBinding{}) {
 			in.Bindings[i] = nil
 		}
+		if in.Bindings[i] != nil {
+			for j, r := range in.Bindings[i].Resources {
+				if reflect.DeepEqual(r.LastAppliedTime, &metav1.Time{}) {
+					in.Bindings[i].Resources[j].LastAppliedTime = nil
+				}
+			}
+		}
 	}
 }

api/addons/v1beta1/zz_generated.conversion.go

@@ -38,7 +38,7 @@ type ResourceBinding struct {
 
 	// lastAppliedTime identifies when this resource was last applied to the cluster.
 	// +optional
-	LastAppliedTime *metav1.Time `json:"lastAppliedTime,omitempty"`
+	LastAppliedTime metav1.Time `json:"lastAppliedTime,omitempty,omitzero"`
 
 	// applied is to track if a resource is applied to the cluster or not.
 	// +required

api/addons/v1beta2/clusterresourcesetbinding_types.go

@@ -45,13 +45,13 @@ func TestIsResourceApplied(t *testing.T) {
 				ResourceRef:     resourceRefApplySucceeded,
 				Applied:         true,
 				Hash:            "xyz",
-				LastAppliedTime: &metav1.Time{Time: time.Now().UTC()},
+				LastAppliedTime: metav1.Time{Time: time.Now().UTC()},
 			},
 			{
 				ResourceRef:     resourceRefApplyFailed,
 				Applied:         false,
 				Hash:            "",
-				LastAppliedTime: &metav1.Time{Time: time.Now().UTC()},
+				LastAppliedTime: metav1.Time{Time: time.Now().UTC()},
 			},
 		},
 	}
@@ -108,7 +108,7 @@ func TestResourceSetBindingGetResourceBinding(t *testing.T) {
 		ResourceRef:     resourceRefApplyFailed,
 		Applied:         false,
 		Hash:            "",
-		LastAppliedTime: &metav1.Time{Time: time.Now().UTC()},
+		LastAppliedTime: metav1.Time{Time: time.Now().UTC()},
 	}
 	crsBinding := &ResourceSetBinding{
 		ClusterResourceSetName: "test-clusterResourceSet",
@@ -117,7 +117,7 @@ func TestResourceSetBindingGetResourceBinding(t *testing.T) {
 				ResourceRef:     resourceRefApplySucceeded,
 				Applied:         true,
 				Hash:            "xyz",
-				LastAppliedTime: &metav1.Time{Time: time.Now().UTC()},
+				LastAppliedTime: metav1.Time{Time: time.Now().UTC()},
 			},
 			resourceRefApplyFailedBinding,
 		},
@@ -163,15 +163,15 @@ func TestSetResourceBinding(t *testing.T) {
 				ResourceRef:     resourceRefApplyFailed,
 				Applied:         false,
 				Hash:            "",
-				LastAppliedTime: &metav1.Time{Time: time.Now().UTC()},
+				LastAppliedTime: metav1.Time{Time: time.Now().UTC()},
 			},
 		},
 	}
 	updateFailedResourceBinding := ResourceBinding{
 		ResourceRef:     resourceRefApplyFailed,
 		Applied:         true,
 		Hash:            "xyz",
-		LastAppliedTime: &metav1.Time{Time: time.Now().UTC()},
+		LastAppliedTime: metav1.Time{Time: time.Now().UTC()},
 	}
 
 	newResourceBinding := ResourceBinding{
@@ -181,7 +181,7 @@ func TestSetResourceBinding(t *testing.T) {
 		},
 		Applied:         false,
 		Hash:            "xyz",
-		LastAppliedTime: &metav1.Time{Time: time.Now().UTC()},
+		LastAppliedTime: metav1.Time{Time: time.Now().UTC()},
 	}
 
 	tests := []struct {

api/addons/v1beta2/clusterresourcesetbinding_types_test.go

@@ -431,6 +431,9 @@ func Convert_v1beta2_BootstrapToken_To_v1beta1_BootstrapToken(in *bootstrapv1.Bo
 		return err
 	}
 	out.TTL = clusterv1.ConvertFromSeconds(in.TTLSeconds)
+	if !reflect.DeepEqual(in.Expires, metav1.Time{}) {
+		out.Expires = ptr.To(in.Expires)
+	}
 	return nil
 }
 
@@ -535,6 +538,9 @@ func Convert_v1beta1_BootstrapToken_To_v1beta2_BootstrapToken(in *BootstrapToken
 		return err
 	}
 	out.TTLSeconds = clusterv1.ConvertToSeconds(in.TTL)
+	if in.Expires != nil && !reflect.DeepEqual(in.Expires, &metav1.Time{}) {
+		out.Expires = *in.Expires
+	}
 	return nil
 }
 

api/addons/v1beta2/zz_generated.deepcopy.go

@@ -165,6 +165,9 @@ func spokeBootstrapToken(in *BootstrapToken, c randfill.Continue) {
 	if in.TTL != nil {
 		in.TTL = ptr.To[metav1.Duration](metav1.Duration{Duration: time.Duration(c.Int31()) * time.Second})
 	}
+	if reflect.DeepEqual(in.Expires, &metav1.Time{}) {
+		in.Expires = nil
+	}
 }
 
 func spokeDiscovery(in *Discovery, c randfill.Continue) {