diff --git a/pkg/cmd/apply/apply_test.go b/pkg/cmd/apply/apply_test.go index 8a48daa2..66992cdd 100644 --- a/pkg/cmd/apply/apply_test.go +++ b/pkg/cmd/apply/apply_test.go @@ -2605,7 +2605,6 @@ metadata: applyset.kubernetes.io/additional-namespaces: "" applyset.kubernetes.io/contains-group-kinds: ReplicationController applyset.kubernetes.io/tooling: kubectl/v0.0.0-master+$Format:%H$ - creationTimestamp: null labels: applyset.kubernetes.io/id: applyset-0eFHV8ySqp7XoShsGvyWFQD3s96yqwHmzc4e0HR1dsY-v1 name: my-set @@ -2639,7 +2638,6 @@ metadata: applyset.kubernetes.io/additional-namespaces: "" applyset.kubernetes.io/contains-group-kinds: ReplicationController,Service applyset.kubernetes.io/tooling: kubectl/v0.0.0-master+$Format:%H$ - creationTimestamp: null labels: applyset.kubernetes.io/id: applyset-0eFHV8ySqp7XoShsGvyWFQD3s96yqwHmzc4e0HR1dsY-v1 name: my-set @@ -2674,7 +2672,6 @@ metadata: applyset.kubernetes.io/additional-namespaces: "" applyset.kubernetes.io/contains-group-kinds: ReplicationController,Service applyset.kubernetes.io/tooling: kubectl/v0.0.0-master+$Format:%H$ - creationTimestamp: null labels: applyset.kubernetes.io/id: applyset-0eFHV8ySqp7XoShsGvyWFQD3s96yqwHmzc4e0HR1dsY-v1 name: my-set @@ -2709,7 +2706,6 @@ metadata: applyset.kubernetes.io/additional-namespaces: "" applyset.kubernetes.io/contains-group-kinds: Service applyset.kubernetes.io/tooling: kubectl/v0.0.0-master+$Format:%H$ - creationTimestamp: null labels: applyset.kubernetes.io/id: applyset-0eFHV8ySqp7XoShsGvyWFQD3s96yqwHmzc4e0HR1dsY-v1 name: my-set @@ -2872,7 +2868,6 @@ metadata: applyset.kubernetes.io/additional-namespaces: test applyset.kubernetes.io/contains-group-kinds: ReplicationController applyset.kubernetes.io/tooling: kubectl/v0.0.0-master+$Format:%H$ - creationTimestamp: null labels: applyset.kubernetes.io/id: applyset-rhp1a-HVAVT_dFgyEygyA1BEB82HPp2o10UiFTpqtAs-v1 name: my-set @@ -3090,7 +3085,6 @@ metadata: applyset.kubernetes.io/additional-namespaces: "" applyset.kubernetes.io/contains-group-resources: replicationcontrollers applyset.kubernetes.io/tooling: kubectl/v0.0.0-master+$Format:%H$ - creationTimestamp: null labels: applyset.kubernetes.io/id: applyset-0eFHV8ySqp7XoShsGvyWFQD3s96yqwHmzc4e0HR1dsY-v1 name: my-set diff --git a/pkg/cmd/auth/whoami_test.go b/pkg/cmd/auth/whoami_test.go index 895fd903..279686d2 100644 --- a/pkg/cmd/auth/whoami_test.go +++ b/pkg/cmd/auth/whoami_test.go @@ -75,9 +75,7 @@ func TestWhoAmIRun(t *testing.T) { `{ "kind": "SelfSubjectReview", "apiVersion": "authentication.k8s.io/v1", - "metadata": { - "creationTimestamp": null - }, + "metadata": {}, "status": { "userInfo": { "username": "jane.doe", @@ -131,9 +129,7 @@ func TestWhoAmIRun(t *testing.T) { `{ "kind": "SelfSubjectReview", "apiVersion": "authentication.k8s.io/v1beta1", - "metadata": { - "creationTimestamp": null - }, + "metadata": {}, "status": { "userInfo": { "username": "jane.doe", @@ -186,9 +182,7 @@ func TestWhoAmIRun(t *testing.T) { `{ "kind": "SelfSubjectReview", "apiVersion": "authentication.k8s.io/v1", - "metadata": { - "creationTimestamp": null - }, + "metadata": {}, "status": { "userInfo": { "username": "jane.doe", diff --git a/pkg/cmd/create/create_token_test.go b/pkg/cmd/create/create_token_test.go index fd928b9f..ee58cb0b 100644 --- a/pkg/cmd/create/create_token_test.go +++ b/pkg/cmd/create/create_token_test.go @@ -99,8 +99,7 @@ func TestCreateToken(t *testing.T) { serverResponseToken: "abc", expectStdout: `apiVersion: authentication.k8s.io/v1 kind: TokenRequest -metadata: - creationTimestamp: null +metadata: {} spec: audiences: null boundObjectRef: null diff --git a/pkg/cmd/edit/testdata/testcase-edit-output-patch/0.response b/pkg/cmd/edit/testdata/testcase-edit-output-patch/0.response index b4693de4..5f543d6a 100644 --- a/pkg/cmd/edit/testdata/testcase-edit-output-patch/0.response +++ b/pkg/cmd/edit/testdata/testcase-edit-output-patch/0.response @@ -3,7 +3,7 @@ "kind": "Service", "metadata": { "annotations": { - "kubectl.kubernetes.io/last-applied-configuration": "{\"kind\":\"Service\",\"apiVersion\":\"v1\",\"metadata\":{\"name\":\"svc1\",\"creationTimestamp\":null,\"labels\":{\"app\":\"svc1\"}},\"spec\":{\"ports\":[{\"name\":\"80\",\"protocol\":\"TCP\",\"port\":80,\"targetPort\":80}],\"selector\":{\"app\":\"svc1\"},\"type\":\"ClusterIP\"},\"status\":{\"loadBalancer\":{}}}\n" + "kubectl.kubernetes.io/last-applied-configuration": "{\"kind\":\"Service\",\"apiVersion\":\"v1\",\"metadata\":{\"name\":\"svc1\",\"labels\":{\"app\":\"svc1\"}},\"spec\":{\"ports\":[{\"name\":\"80\",\"protocol\":\"TCP\",\"port\":80,\"targetPort\":80}],\"selector\":{\"app\":\"svc1\"},\"type\":\"ClusterIP\"},\"status\":{\"loadBalancer\":{}}}\n" }, "creationTimestamp": "2017-02-27T19:40:53Z", "labels": { diff --git a/pkg/cmd/edit/testdata/testcase-edit-output-patch/1.edited b/pkg/cmd/edit/testdata/testcase-edit-output-patch/1.edited index 51de60e1..2ade8fa7 100644 --- a/pkg/cmd/edit/testdata/testcase-edit-output-patch/1.edited +++ b/pkg/cmd/edit/testdata/testcase-edit-output-patch/1.edited @@ -7,7 +7,7 @@ kind: Service metadata: annotations: kubectl.kubernetes.io/last-applied-configuration: | - {"kind":"Service","apiVersion":"v1","metadata":{"name":"svc1","creationTimestamp":null,"labels":{"app":"svc1"}},"spec":{"ports":[{"name":"80","protocol":"TCP","port":80,"targetPort":80}],"selector":{"app":"svc1"},"type":"ClusterIP"},"status":{"loadBalancer":{}}} + {"kind":"Service","apiVersion":"v1","metadata":{"name":"svc1","labels":{"app":"svc1"}},"spec":{"ports":[{"name":"80","protocol":"TCP","port":80,"targetPort":80}],"selector":{"app":"svc1"},"type":"ClusterIP"},"status":{"loadBalancer":{}}} creationTimestamp: "2017-02-27T19:40:53Z" labels: app: svc1 diff --git a/pkg/cmd/edit/testdata/testcase-edit-output-patch/1.original b/pkg/cmd/edit/testdata/testcase-edit-output-patch/1.original index 38d71f24..bcdea71b 100644 --- a/pkg/cmd/edit/testdata/testcase-edit-output-patch/1.original +++ b/pkg/cmd/edit/testdata/testcase-edit-output-patch/1.original @@ -7,7 +7,7 @@ kind: Service metadata: annotations: kubectl.kubernetes.io/last-applied-configuration: | - {"kind":"Service","apiVersion":"v1","metadata":{"name":"svc1","creationTimestamp":null,"labels":{"app":"svc1"}},"spec":{"ports":[{"name":"80","protocol":"TCP","port":80,"targetPort":80}],"selector":{"app":"svc1"},"type":"ClusterIP"},"status":{"loadBalancer":{}}} + {"kind":"Service","apiVersion":"v1","metadata":{"name":"svc1","labels":{"app":"svc1"}},"spec":{"ports":[{"name":"80","protocol":"TCP","port":80,"targetPort":80}],"selector":{"app":"svc1"},"type":"ClusterIP"},"status":{"loadBalancer":{}}} creationTimestamp: "2017-02-27T19:40:53Z" labels: app: svc1 diff --git a/pkg/cmd/edit/testdata/testcase-edit-subresource-status/0.response b/pkg/cmd/edit/testdata/testcase-edit-subresource-status/0.response index 0eb0dad8..eb89f133 100644 --- a/pkg/cmd/edit/testdata/testcase-edit-subresource-status/0.response +++ b/pkg/cmd/edit/testdata/testcase-edit-subresource-status/0.response @@ -33,7 +33,6 @@ }, "template": { "metadata": { - "creationTimestamp": null, "labels": { "app": "nginx" } diff --git a/pkg/cmd/edit/testdata/testcase-edit-subresource-status/1.edited b/pkg/cmd/edit/testdata/testcase-edit-subresource-status/1.edited index 5b00fe73..95e1ed8e 100644 --- a/pkg/cmd/edit/testdata/testcase-edit-subresource-status/1.edited +++ b/pkg/cmd/edit/testdata/testcase-edit-subresource-status/1.edited @@ -29,7 +29,6 @@ spec: type: RollingUpdate template: metadata: - creationTimestamp: null labels: app: nginx spec: diff --git a/pkg/cmd/edit/testdata/testcase-edit-subresource-status/1.original b/pkg/cmd/edit/testdata/testcase-edit-subresource-status/1.original index 8c6dff1c..25c047dc 100644 --- a/pkg/cmd/edit/testdata/testcase-edit-subresource-status/1.original +++ b/pkg/cmd/edit/testdata/testcase-edit-subresource-status/1.original @@ -29,7 +29,6 @@ spec: type: RollingUpdate template: metadata: - creationTimestamp: null labels: app: nginx spec: diff --git a/pkg/cmd/edit/testdata/testcase-edit-subresource-status/2.response b/pkg/cmd/edit/testdata/testcase-edit-subresource-status/2.response index e6c018b2..55375421 100644 --- a/pkg/cmd/edit/testdata/testcase-edit-subresource-status/2.response +++ b/pkg/cmd/edit/testdata/testcase-edit-subresource-status/2.response @@ -33,7 +33,6 @@ }, "template": { "metadata": { - "creationTimestamp": null, "labels": { "app": "nginx" } diff --git a/pkg/cmd/edit/testdata/testcase-not-update-annotation/0.response b/pkg/cmd/edit/testdata/testcase-not-update-annotation/0.response index b4693de4..5f543d6a 100644 --- a/pkg/cmd/edit/testdata/testcase-not-update-annotation/0.response +++ b/pkg/cmd/edit/testdata/testcase-not-update-annotation/0.response @@ -3,7 +3,7 @@ "kind": "Service", "metadata": { "annotations": { - "kubectl.kubernetes.io/last-applied-configuration": "{\"kind\":\"Service\",\"apiVersion\":\"v1\",\"metadata\":{\"name\":\"svc1\",\"creationTimestamp\":null,\"labels\":{\"app\":\"svc1\"}},\"spec\":{\"ports\":[{\"name\":\"80\",\"protocol\":\"TCP\",\"port\":80,\"targetPort\":80}],\"selector\":{\"app\":\"svc1\"},\"type\":\"ClusterIP\"},\"status\":{\"loadBalancer\":{}}}\n" + "kubectl.kubernetes.io/last-applied-configuration": "{\"kind\":\"Service\",\"apiVersion\":\"v1\",\"metadata\":{\"name\":\"svc1\",\"labels\":{\"app\":\"svc1\"}},\"spec\":{\"ports\":[{\"name\":\"80\",\"protocol\":\"TCP\",\"port\":80,\"targetPort\":80}],\"selector\":{\"app\":\"svc1\"},\"type\":\"ClusterIP\"},\"status\":{\"loadBalancer\":{}}}\n" }, "creationTimestamp": "2017-02-27T19:40:53Z", "labels": { diff --git a/pkg/cmd/edit/testdata/testcase-not-update-annotation/1.edited b/pkg/cmd/edit/testdata/testcase-not-update-annotation/1.edited index 51de60e1..2ade8fa7 100644 --- a/pkg/cmd/edit/testdata/testcase-not-update-annotation/1.edited +++ b/pkg/cmd/edit/testdata/testcase-not-update-annotation/1.edited @@ -7,7 +7,7 @@ kind: Service metadata: annotations: kubectl.kubernetes.io/last-applied-configuration: | - {"kind":"Service","apiVersion":"v1","metadata":{"name":"svc1","creationTimestamp":null,"labels":{"app":"svc1"}},"spec":{"ports":[{"name":"80","protocol":"TCP","port":80,"targetPort":80}],"selector":{"app":"svc1"},"type":"ClusterIP"},"status":{"loadBalancer":{}}} + {"kind":"Service","apiVersion":"v1","metadata":{"name":"svc1","labels":{"app":"svc1"}},"spec":{"ports":[{"name":"80","protocol":"TCP","port":80,"targetPort":80}],"selector":{"app":"svc1"},"type":"ClusterIP"},"status":{"loadBalancer":{}}} creationTimestamp: "2017-02-27T19:40:53Z" labels: app: svc1 diff --git a/pkg/cmd/edit/testdata/testcase-not-update-annotation/1.original b/pkg/cmd/edit/testdata/testcase-not-update-annotation/1.original index 38d71f24..bcdea71b 100644 --- a/pkg/cmd/edit/testdata/testcase-not-update-annotation/1.original +++ b/pkg/cmd/edit/testdata/testcase-not-update-annotation/1.original @@ -7,7 +7,7 @@ kind: Service metadata: annotations: kubectl.kubernetes.io/last-applied-configuration: | - {"kind":"Service","apiVersion":"v1","metadata":{"name":"svc1","creationTimestamp":null,"labels":{"app":"svc1"}},"spec":{"ports":[{"name":"80","protocol":"TCP","port":80,"targetPort":80}],"selector":{"app":"svc1"},"type":"ClusterIP"},"status":{"loadBalancer":{}}} + {"kind":"Service","apiVersion":"v1","metadata":{"name":"svc1","labels":{"app":"svc1"}},"spec":{"ports":[{"name":"80","protocol":"TCP","port":80,"targetPort":80}],"selector":{"app":"svc1"},"type":"ClusterIP"},"status":{"loadBalancer":{}}} creationTimestamp: "2017-02-27T19:40:53Z" labels: app: svc1 diff --git a/pkg/cmd/edit/testdata/testcase-update-annotation/0.response b/pkg/cmd/edit/testdata/testcase-update-annotation/0.response index b4693de4..5f543d6a 100644 --- a/pkg/cmd/edit/testdata/testcase-update-annotation/0.response +++ b/pkg/cmd/edit/testdata/testcase-update-annotation/0.response @@ -3,7 +3,7 @@ "kind": "Service", "metadata": { "annotations": { - "kubectl.kubernetes.io/last-applied-configuration": "{\"kind\":\"Service\",\"apiVersion\":\"v1\",\"metadata\":{\"name\":\"svc1\",\"creationTimestamp\":null,\"labels\":{\"app\":\"svc1\"}},\"spec\":{\"ports\":[{\"name\":\"80\",\"protocol\":\"TCP\",\"port\":80,\"targetPort\":80}],\"selector\":{\"app\":\"svc1\"},\"type\":\"ClusterIP\"},\"status\":{\"loadBalancer\":{}}}\n" + "kubectl.kubernetes.io/last-applied-configuration": "{\"kind\":\"Service\",\"apiVersion\":\"v1\",\"metadata\":{\"name\":\"svc1\",\"labels\":{\"app\":\"svc1\"}},\"spec\":{\"ports\":[{\"name\":\"80\",\"protocol\":\"TCP\",\"port\":80,\"targetPort\":80}],\"selector\":{\"app\":\"svc1\"},\"type\":\"ClusterIP\"},\"status\":{\"loadBalancer\":{}}}\n" }, "creationTimestamp": "2017-02-27T19:40:53Z", "labels": { diff --git a/pkg/cmd/edit/testdata/testcase-update-annotation/1.edited b/pkg/cmd/edit/testdata/testcase-update-annotation/1.edited index 51de60e1..2ade8fa7 100644 --- a/pkg/cmd/edit/testdata/testcase-update-annotation/1.edited +++ b/pkg/cmd/edit/testdata/testcase-update-annotation/1.edited @@ -7,7 +7,7 @@ kind: Service metadata: annotations: kubectl.kubernetes.io/last-applied-configuration: | - {"kind":"Service","apiVersion":"v1","metadata":{"name":"svc1","creationTimestamp":null,"labels":{"app":"svc1"}},"spec":{"ports":[{"name":"80","protocol":"TCP","port":80,"targetPort":80}],"selector":{"app":"svc1"},"type":"ClusterIP"},"status":{"loadBalancer":{}}} + {"kind":"Service","apiVersion":"v1","metadata":{"name":"svc1","labels":{"app":"svc1"}},"spec":{"ports":[{"name":"80","protocol":"TCP","port":80,"targetPort":80}],"selector":{"app":"svc1"},"type":"ClusterIP"},"status":{"loadBalancer":{}}} creationTimestamp: "2017-02-27T19:40:53Z" labels: app: svc1 diff --git a/pkg/cmd/edit/testdata/testcase-update-annotation/1.original b/pkg/cmd/edit/testdata/testcase-update-annotation/1.original index 38d71f24..bcdea71b 100644 --- a/pkg/cmd/edit/testdata/testcase-update-annotation/1.original +++ b/pkg/cmd/edit/testdata/testcase-update-annotation/1.original @@ -7,7 +7,7 @@ kind: Service metadata: annotations: kubectl.kubernetes.io/last-applied-configuration: | - {"kind":"Service","apiVersion":"v1","metadata":{"name":"svc1","creationTimestamp":null,"labels":{"app":"svc1"}},"spec":{"ports":[{"name":"80","protocol":"TCP","port":80,"targetPort":80}],"selector":{"app":"svc1"},"type":"ClusterIP"},"status":{"loadBalancer":{}}} + {"kind":"Service","apiVersion":"v1","metadata":{"name":"svc1","labels":{"app":"svc1"}},"spec":{"ports":[{"name":"80","protocol":"TCP","port":80,"targetPort":80}],"selector":{"app":"svc1"},"type":"ClusterIP"},"status":{"loadBalancer":{}}} creationTimestamp: "2017-02-27T19:40:53Z" labels: app: svc1 diff --git a/pkg/cmd/expose/expose_test.go b/pkg/cmd/expose/expose_test.go index e624d5c1..a1d32d9a 100644 --- a/pkg/cmd/expose/expose_test.go +++ b/pkg/cmd/expose/expose_test.go @@ -694,7 +694,6 @@ func TestExposeOverride(t *testing.T) { expected: `apiVersion: v1 kind: Service metadata: - creationTimestamp: null labels: svc: test name: foo @@ -717,7 +716,6 @@ status: expected: `apiVersion: v1 kind: Service metadata: - creationTimestamp: null labels: svc: test name: foo @@ -745,7 +743,6 @@ status: expected: `apiVersion: v1 kind: Service metadata: - creationTimestamp: null labels: svc: test name: foo @@ -773,7 +770,6 @@ status: expected: `apiVersion: v1 kind: Service metadata: - creationTimestamp: null labels: svc: test name: foo diff --git a/pkg/cmd/get/get_test.go b/pkg/cmd/get/get_test.go index 0776b674..95abf019 100644 --- a/pkg/cmd/get/get_test.go +++ b/pkg/cmd/get/get_test.go @@ -1438,7 +1438,6 @@ func TestGetMultipleTypeObjectsAsList(t *testing.T) { "apiVersion": "v1", "kind": "Pod", "metadata": { - "creationTimestamp": null, "name": "foo", "namespace": "test", "resourceVersion": "10" @@ -1457,7 +1456,6 @@ func TestGetMultipleTypeObjectsAsList(t *testing.T) { "apiVersion": "v1", "kind": "Pod", "metadata": { - "creationTimestamp": null, "name": "bar", "namespace": "test", "resourceVersion": "11" @@ -1476,7 +1474,6 @@ func TestGetMultipleTypeObjectsAsList(t *testing.T) { "apiVersion": "v1", "kind": "Service", "metadata": { - "creationTimestamp": null, "name": "baz", "namespace": "test", "resourceVersion": "12" @@ -2367,10 +2364,10 @@ DELETED test pod/foo 0/0 0 }, { format: "json", - expected: `{"type":"ADDED","object":{"apiVersion":"v1","kind":"Pod","metadata":{"creationTimestamp":null,"name":"bar","namespace":"test","resourceVersion":"9"},"spec":{"containers":null,"dnsPolicy":"ClusterFirst","enableServiceLinks":true,"restartPolicy":"Always","securityContext":{},"terminationGracePeriodSeconds":30},"status":{}}} -{"type":"ADDED","object":{"apiVersion":"v1","kind":"Pod","metadata":{"creationTimestamp":null,"name":"foo","namespace":"test","resourceVersion":"10"},"spec":{"containers":null,"dnsPolicy":"ClusterFirst","enableServiceLinks":true,"restartPolicy":"Always","securityContext":{},"terminationGracePeriodSeconds":30},"status":{}}} -{"type":"MODIFIED","object":{"apiVersion":"v1","kind":"Pod","metadata":{"creationTimestamp":null,"name":"foo","namespace":"test","resourceVersion":"11"},"spec":{"containers":null,"dnsPolicy":"ClusterFirst","enableServiceLinks":true,"restartPolicy":"Always","securityContext":{},"terminationGracePeriodSeconds":30},"status":{}}} -{"type":"DELETED","object":{"apiVersion":"v1","kind":"Pod","metadata":{"creationTimestamp":null,"name":"foo","namespace":"test","resourceVersion":"12"},"spec":{"containers":null,"dnsPolicy":"ClusterFirst","enableServiceLinks":true,"restartPolicy":"Always","securityContext":{},"terminationGracePeriodSeconds":30},"status":{}}} + expected: `{"type":"ADDED","object":{"apiVersion":"v1","kind":"Pod","metadata":{"name":"bar","namespace":"test","resourceVersion":"9"},"spec":{"containers":null,"dnsPolicy":"ClusterFirst","enableServiceLinks":true,"restartPolicy":"Always","securityContext":{},"terminationGracePeriodSeconds":30},"status":{}}} +{"type":"ADDED","object":{"apiVersion":"v1","kind":"Pod","metadata":{"name":"foo","namespace":"test","resourceVersion":"10"},"spec":{"containers":null,"dnsPolicy":"ClusterFirst","enableServiceLinks":true,"restartPolicy":"Always","securityContext":{},"terminationGracePeriodSeconds":30},"status":{}}} +{"type":"MODIFIED","object":{"apiVersion":"v1","kind":"Pod","metadata":{"name":"foo","namespace":"test","resourceVersion":"11"},"spec":{"containers":null,"dnsPolicy":"ClusterFirst","enableServiceLinks":true,"restartPolicy":"Always","securityContext":{},"terminationGracePeriodSeconds":30},"status":{}}} +{"type":"DELETED","object":{"apiVersion":"v1","kind":"Pod","metadata":{"name":"foo","namespace":"test","resourceVersion":"12"},"spec":{"containers":null,"dnsPolicy":"ClusterFirst","enableServiceLinks":true,"restartPolicy":"Always","securityContext":{},"terminationGracePeriodSeconds":30},"status":{}}} `, }, { @@ -2379,7 +2376,6 @@ DELETED test pod/foo 0/0 0 apiVersion: v1 kind: Pod metadata: - creationTimestamp: null name: bar namespace: test resourceVersion: "9" @@ -2397,7 +2393,6 @@ object: apiVersion: v1 kind: Pod metadata: - creationTimestamp: null name: foo namespace: test resourceVersion: "10" @@ -2415,7 +2410,6 @@ object: apiVersion: v1 kind: Pod metadata: - creationTimestamp: null name: foo namespace: test resourceVersion: "11" @@ -2433,7 +2427,6 @@ object: apiVersion: v1 kind: Pod metadata: - creationTimestamp: null name: foo namespace: test resourceVersion: "12" diff --git a/pkg/cmd/rollout/rollout_history_test.go b/pkg/cmd/rollout/rollout_history_test.go index 1c8baff2..c3390d1f 100644 --- a/pkg/cmd/rollout/rollout_history_test.go +++ b/pkg/cmd/rollout/rollout_history_test.go @@ -280,15 +280,12 @@ func TestRolloutHistoryWithOutput(t *testing.T) { "kind": "ReplicaSet", "apiVersion": "apps/v1", "metadata": { - "name": "rev2", - "creationTimestamp": null + "name": "rev2" }, "spec": { "selector": null, "template": { - "metadata": { - "creationTimestamp": null - }, + "metadata": {}, "spec": { "containers": null } @@ -305,13 +302,11 @@ func TestRolloutHistoryWithOutput(t *testing.T) { expectedOutput: `apiVersion: apps/v1 kind: ReplicaSet metadata: - creationTimestamp: null name: rev2 spec: selector: null template: - metadata: - creationTimestamp: null + metadata: {} spec: containers: null status: @@ -323,13 +318,11 @@ status: expectedOutput: `apiVersion: apps/v1 kind: ReplicaSet metadata: - creationTimestamp: null name: rev1 spec: selector: null template: - metadata: - creationTimestamp: null + metadata: {} spec: containers: null status: @@ -338,13 +331,11 @@ status: apiVersion: apps/v1 kind: ReplicaSet metadata: - creationTimestamp: null name: rev2 spec: selector: null template: - metadata: - creationTimestamp: null + metadata: {} spec: containers: null status: diff --git a/pkg/cmd/run/run_test.go b/pkg/cmd/run/run_test.go index 86fe0346..8344fc47 100644 --- a/pkg/cmd/run/run_test.go +++ b/pkg/cmd/run/run_test.go @@ -655,7 +655,6 @@ func TestRunOverride(t *testing.T) { expectedOutput: `apiVersion: v1 kind: Pod metadata: - creationTimestamp: null labels: run: test name: test @@ -678,7 +677,6 @@ status: {} expectedOutput: `apiVersion: v1 kind: Pod metadata: - creationTimestamp: null labels: run: test name: test @@ -701,7 +699,6 @@ status: {} expectedOutput: `apiVersion: v1 kind: Pod metadata: - creationTimestamp: null labels: run: test name: test @@ -729,7 +726,6 @@ status: {} expectedOutput: `apiVersion: v1 kind: Pod metadata: - creationTimestamp: null labels: foo: bar run: test diff --git a/pkg/polymorphichelpers/rollback_test.go b/pkg/polymorphichelpers/rollback_test.go index eaeb0513..cd3fdb52 100644 --- a/pkg/polymorphichelpers/rollback_test.go +++ b/pkg/polymorphichelpers/rollback_test.go @@ -62,7 +62,7 @@ func TestGetDeploymentPatch(t *testing.T) { t.Errorf("expected strategic merge patch, got %v", patchType) } expectedPatch := `[` + - `{"op":"replace","path":"/spec/template","value":{"metadata":{"creationTimestamp":null},"spec":{"containers":[{"name":"","image":"foo","resources":{}}]}}},` + + `{"op":"replace","path":"/spec/template","value":{"metadata":{},"spec":{"containers":[{"name":"","image":"foo","resources":{}}]}}},` + `{"op":"replace","path":"/metadata/annotations","value":{"a":"true"}}` + `]` if string(patchBytes) != expectedPatch { diff --git a/testdata/apply/deploy-serverside.yaml b/testdata/apply/deploy-serverside.yaml index 664b87fd..fd211f58 100644 --- a/testdata/apply/deploy-serverside.yaml +++ b/testdata/apply/deploy-serverside.yaml @@ -3,7 +3,7 @@ kind: Deployment metadata: annotations: deployment.kubernetes.io/revision: "1" - kubectl.kubernetes.io/last-applied-configuration: '{"kind":"Deployment","apiVersion":"apps/v1","metadata":{"name":"nginx-deployment","creationTimestamp":null,"labels":{"name":"nginx"}},"spec":{"selector":{"matchLabels":{"name":"nginx"}},"template":{"metadata":{"creationTimestamp":null,"labels":{"name":"nginx"}},"spec":{"containers":[{"name":"nginx","image":"nginx","resources":{}}]}},"strategy":{}},"status":{}}' + kubectl.kubernetes.io/last-applied-configuration: '{"kind":"Deployment","apiVersion":"apps/v1","metadata":{"name":"nginx-deployment","labels":{"name":"nginx"}},"spec":{"selector":{"matchLabels":{"name":"nginx"}},"template":{"metadata":{"labels":{"name":"nginx"}},"spec":{"containers":[{"name":"nginx","image":"nginx","resources":{}}]}},"strategy":{}},"status":{}}' creationTimestamp: "2016-10-24T22:15:06Z" generation: 6 labels: @@ -25,7 +25,6 @@ spec: type: RollingUpdate template: metadata: - creationTimestamp: null labels: name: nginx spec: diff --git a/testdata/apply/rc-managedfields-lastapplied.yaml b/testdata/apply/rc-managedfields-lastapplied.yaml index a457e331..e9f79359 100644 --- a/testdata/apply/rc-managedfields-lastapplied.yaml +++ b/testdata/apply/rc-managedfields-lastapplied.yaml @@ -77,7 +77,6 @@ spec: name: test-rc template: metadata: - creationTimestamp: null labels: name: test-rc spec: