Merge pull request #43016 from liggitt/time-added-pointer

Automatic merge from submit-queue (batch tested with PRs 43016, 50503, 51281, 51518, 51582). If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>..

Omit timeAdded from taint when empty

Fixes omitempty portion of #42394

cmd/kubeadm/app/phases/markmaster/markmaster_test.go

@@ -49,7 +49,7 @@ func TestMarkMaster(t *testing.T) {
 			"master label and taint missing",
 			"",
 			nil,
-			"{\"metadata\":{\"labels\":{\"node-role.kubernetes.io/master\":\"\"}},\"spec\":{\"taints\":[{\"effect\":\"NoSchedule\",\"key\":\"node-role.kubernetes.io/master\",\"timeAdded\":null}]}}",
+			"{\"metadata\":{\"labels\":{\"node-role.kubernetes.io/master\":\"\"}},\"spec\":{\"taints\":[{\"effect\":\"NoSchedule\",\"key\":\"node-role.kubernetes.io/master\"}]}}",
 		},
 		{
 			"master label missing",
@@ -61,7 +61,7 @@ func TestMarkMaster(t *testing.T) {
 			"master taint missing",
 			kubeadmconstants.LabelNodeRoleMaster,
 			nil,
-			"{\"spec\":{\"taints\":[{\"effect\":\"NoSchedule\",\"key\":\"node-role.kubernetes.io/master\",\"timeAdded\":null}]}}",
+			"{\"spec\":{\"taints\":[{\"effect\":\"NoSchedule\",\"key\":\"node-role.kubernetes.io/master\"}]}}",
 		},
 		{
 			"nothing missing",

pkg/api/types.go

@@ -2229,7 +2229,7 @@ type Taint struct {
 	// TimeAdded represents the time at which the taint was added.
 	// It is only written for NoExecute taints.
 	// +optional
-	TimeAdded metav1.Time
+	TimeAdded *metav1.Time
 }
 
 type TaintEffect string

pkg/api/v1/zz_generated.conversion.go

@@ -5101,7 +5101,7 @@ func autoConvert_v1_Taint_To_api_Taint(in *v1.Taint, out *api.Taint, s conversio
 	out.Key = in.Key
 	out.Value = in.Value
 	out.Effect = api.TaintEffect(in.Effect)
-	out.TimeAdded = in.TimeAdded
+	out.TimeAdded = (*meta_v1.Time)(unsafe.Pointer(in.TimeAdded))
 	return nil
 }
 
@@ -5114,7 +5114,7 @@ func autoConvert_api_Taint_To_v1_Taint(in *api.Taint, out *v1.Taint, s conversio
 	out.Key = in.Key
 	out.Value = in.Value
 	out.Effect = v1.TaintEffect(in.Effect)
-	out.TimeAdded = in.TimeAdded
+	out.TimeAdded = (*meta_v1.Time)(unsafe.Pointer(in.TimeAdded))
 	return nil
 }
 

pkg/api/zz_generated.deepcopy.go

@@ -5903,7 +5903,15 @@ func (in *TCPSocketAction) DeepCopy() *TCPSocketAction {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Taint) DeepCopyInto(out *Taint) {
 	*out = *in
-	in.TimeAdded.DeepCopyInto(&out.TimeAdded)
+	if in.TimeAdded != nil {
+		in, out := &in.TimeAdded, &out.TimeAdded
+		if *in == nil {
+			*out = nil
+		} else {
+			*out = new(v1.Time)
+			(*in).DeepCopyInto(*out)
+		}
+	}
 	return
 }
 

pkg/controller/daemon/daemon_controller_test.go

@@ -63,17 +63,22 @@ var (
 	noExecuteTaints       = []v1.Taint{{Key: "dedicated", Value: "user1", Effect: "NoExecute"}}
 )
 
+func nowPointer() *metav1.Time {
+	now := metav1.Now()
+	return &now
+}
+
 var (
 	nodeNotReady = []v1.Taint{{
 		Key:       algorithm.TaintNodeNotReady,
 		Effect:    v1.TaintEffectNoExecute,
-		TimeAdded: metav1.Now(),
+		TimeAdded: nowPointer(),
 	}}
 
 	nodeUnreachable = []v1.Taint{{
 		Key:       algorithm.TaintNodeUnreachable,
 		Effect:    v1.TaintEffectNoExecute,
-		TimeAdded: metav1.Now(),
+		TimeAdded: nowPointer(),
 	}}
 )
 

pkg/controller/node/scheduler/taint_controller_test.go

@@ -33,11 +33,12 @@ import (
 var timeForControllerToProgress = 500 * time.Millisecond
 
 func createNoExecuteTaint(index int) v1.Taint {
+	now := metav1.Now()
 	return v1.Taint{
 		Key:       "testTaint" + fmt.Sprintf("%v", index),
 		Value:     "test" + fmt.Sprintf("%v", index),
 		Effect:    v1.TaintEffectNoExecute,
-		TimeAdded: metav1.Now(),
+		TimeAdded: &now,
 	}
 }
 

pkg/controller/node/util/controller_utils.go

@@ -256,7 +256,8 @@ func RecordNodeStatusChange(recorder record.EventRecorder, node *v1.Node, newSta
 // otherwise.
 func SwapNodeControllerTaint(kubeClient clientset.Interface, taintsToAdd, taintsToRemove []*v1.Taint, node *v1.Node) bool {
 	for _, taintToAdd := range taintsToAdd {
-		taintToAdd.TimeAdded = metav1.Now()
+		now := metav1.Now()
+		taintToAdd.TimeAdded = &now
 	}
 
 	err := controller.AddOrUpdateTaintOnNode(kubeClient, node.Name, taintsToAdd...)

staging/src/k8s.io/api/core/v1/types.go

@@ -2469,7 +2469,7 @@ type Taint struct {
 	// TimeAdded represents the time at which the taint was added.
 	// It is only written for NoExecute taints.
 	// +optional
-	TimeAdded metav1.Time `json:"timeAdded,omitempty" protobuf:"bytes,4,opt,name=timeAdded"`
+	TimeAdded *metav1.Time `json:"timeAdded,omitempty" protobuf:"bytes,4,opt,name=timeAdded"`
 }
 
 type TaintEffect string

staging/src/k8s.io/api/core/v1/zz_generated.deepcopy.go

@@ -5905,7 +5905,15 @@ func (in *TCPSocketAction) DeepCopy() *TCPSocketAction {
 // DeepCopyInto is an autogenerated deepcopy function, copying the receiver, writing into out. in must be non-nil.
 func (in *Taint) DeepCopyInto(out *Taint) {
 	*out = *in
-	in.TimeAdded.DeepCopyInto(&out.TimeAdded)
+	if in.TimeAdded != nil {
+		in, out := &in.TimeAdded, &out.TimeAdded
+		if *in == nil {
+			*out = nil
+		} else {
+			*out = new(meta_v1.Time)
+			(*in).DeepCopyInto(*out)
+		}
+	}
 	return
 }
 

test/e2e/scheduling/taints_test.go

@@ -36,11 +36,12 @@ import (
 )
 
 func getTestTaint() v1.Taint {
+	now := metav1.Now()
 	return v1.Taint{
 		Key:       "kubernetes.io/e2e-evict-taint-key",
 		Value:     "evictTaintVal",
 		Effect:    v1.TaintEffectNoExecute,
-		TimeAdded: metav1.Now(),
+		TimeAdded: &now,
 	}
 }