github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2026-01-29 21:29:24 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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 https://github.com/kubernetes/kubernetes/issues/42394
This commit is contained in:
Kubernetes Submit Queue
2017-09-22 23:35:52 -07:00
committed by GitHub
parent 7d716e4e91 fe6af20910
commit 1c0f22ea01
11 changed files with 740 additions and 709 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
pkg/api/types.go
View File

@@ -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