output empty creationTimestamp as null

kubernetes · Oct 9, 2017 · 465edb2 · 465edb2
1 parent 33f911c
commit 465edb2
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 0 deletions.
diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured/unstructured.go b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured/unstructured.go
@@ -464,6 +464,10 @@ func (u *Unstructured) GetCreationTimestamp() metav1.Time {
 
 func (u *Unstructured) SetCreationTimestamp(timestamp metav1.Time) {
 	ts, _ := timestamp.MarshalQueryParameter()
+	if len(ts) == 0 {
+		u.setNestedField(nil, "metadata", "creationTimestamp")
+		return
+	}
 	u.setNestedField(ts, "metadata", "creationTimestamp")
 }
 

diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured/unstructured_test.go b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/unstructured/unstructured_test.go
@@ -76,3 +76,14 @@ func TestNilDeletionTimestamp(t *testing.T) {
 		t.Errorf("unexpected deletion timestamp field: %q", deletionTimestamp)
 	}
 }
+
+func TestNilCreationTimestamp(t *testing.T) {
+	var u Unstructured
+	u.SetCreationTimestamp(u.GetCreationTimestamp())
+
+	metadata := u.Object["metadata"].(map[string]interface{})
+	creationTimestamp := metadata["creationTimestamp"]
+	if creationTimestamp != nil {
+		t.Errorf("unexpected creation timestamp field: %q", creationTimestamp)
+	}
+}