diff --git a/hack/testdata/sorted-pods/sorted-pod1.yaml b/hack/testdata/sorted-pods/sorted-pod1.yaml index cb8862678b..dd27241f95 100644 --- a/hack/testdata/sorted-pods/sorted-pod1.yaml +++ b/hack/testdata/sorted-pods/sorted-pod1.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Pod metadata: name: sorted-pod1 - creationTimestamp: 2018-08-30T14:10:58Z + creationTimestamp: "2018-08-30T14:10:58Z" labels: name: sorted-pod3-label spec: diff --git a/hack/testdata/sorted-pods/sorted-pod2.yaml b/hack/testdata/sorted-pods/sorted-pod2.yaml index 1837dcdf7a..9a811099e6 100644 --- a/hack/testdata/sorted-pods/sorted-pod2.yaml +++ b/hack/testdata/sorted-pods/sorted-pod2.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Pod metadata: name: sorted-pod2 - creationTimestamp: 2018-08-30T14:10:55Z + creationTimestamp: "2018-08-30T14:10:55Z" labels: name: sorted-pod2-label spec: diff --git a/hack/testdata/sorted-pods/sorted-pod3.yaml b/hack/testdata/sorted-pods/sorted-pod3.yaml index b77416fd22..dd209a5f65 100644 --- a/hack/testdata/sorted-pods/sorted-pod3.yaml +++ b/hack/testdata/sorted-pods/sorted-pod3.yaml @@ -2,7 +2,7 @@ apiVersion: v1 kind: Pod metadata: name: sorted-pod3 - creationTimestamp: 2018-08-30T14:10:53Z + creationTimestamp: "2018-08-30T14:10:53Z" labels: name: sorted-pod1-label spec: diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/2.edited b/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/2.edited index e7759c9c22..f1d7af7591 100755 --- a/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/2.edited +++ b/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/2.edited @@ -1,7 +1,7 @@ # Please edit the 'last-applied-configuration' annotations below. # Lines beginning with a '#' will be ignored, and an empty file will abort the edit. # -# The edited file had a syntax error: error converting YAML to JSON: yaml: line 12: could not find expected ':' +# The edited file had a syntax error: error converting YAML to JSON: yaml: line 13: could not find expected ':' # kind: Service metadata: diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/2.original b/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/2.original index 601ea3bda6..c098aac279 100755 --- a/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/2.original +++ b/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/2.original @@ -1,7 +1,7 @@ # Please edit the 'last-applied-configuration' annotations below. # Lines beginning with a '#' will be ignored, and an empty file will abort the edit. # -# The edited file had a syntax error: error parsing edited-file: error converting YAML to JSON: yaml: line 12: could not find expected ':' +# The edited file had a syntax error: error parsing edited-file: error converting YAML to JSON: yaml: line 13: could not find expected ':' # kind: Service metadata: diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied/1.edited b/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied/1.edited index 22e33fb814..a37d3d4062 100755 --- a/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied/1.edited +++ b/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied/1.edited @@ -5,7 +5,7 @@ apiVersion: v1 kind: Service metadata: annotations: {} - creationTimestamp: 2017-02-01T21:14:09Z + creationTimestamp: "2017-02-01T21:14:09Z" labels: app: svc1 new-label: new-value diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied/1.original b/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied/1.original index e863ac7098..60b0d14ad9 100755 --- a/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied/1.original +++ b/pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied/1.original @@ -5,7 +5,7 @@ apiVersion: v1 kind: Service metadata: annotations: {} - creationTimestamp: 2017-02-01T21:14:09Z + creationTimestamp: "2017-02-01T21:14:09Z" labels: app: svc1 new-label: new-value diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/0.edited b/pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/0.edited index 47a003047f..4cd5bf49e2 100755 --- a/pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/0.edited +++ b/pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/0.edited @@ -5,7 +5,7 @@ apiVersion: v1 kind: Service metadata: - creationTimestamp: 2017-02-03T06:44:47Z + creationTimestamp: "2017-02-03T06:44:47Z" labels: app: svc1modified name: svc1 diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/0.original b/pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/0.original index b69c7dca8b..15ac948341 100755 --- a/pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/0.original +++ b/pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/0.original @@ -5,7 +5,7 @@ apiVersion: v1 kind: Service metadata: - creationTimestamp: 2017-02-03T06:44:47Z + creationTimestamp: "2017-02-03T06:44:47Z" labels: app: svc1 name: svc1 diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/2.edited b/pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/2.edited index e764b13a65..e70025ab8f 100755 --- a/pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/2.edited +++ b/pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/2.edited @@ -5,7 +5,7 @@ apiVersion: v1 kind: Service metadata: - creationTimestamp: 2017-02-03T06:44:43Z + creationTimestamp: "2017-02-03T06:44:43Z" labels: app: svc2modified name: svc2 diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/2.original b/pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/2.original index 9c74ec3631..fc1a72bd1b 100755 --- a/pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/2.original +++ b/pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/2.original @@ -5,7 +5,7 @@ apiVersion: v1 kind: Service metadata: - creationTimestamp: 2017-02-03T06:44:43Z + creationTimestamp: "2017-02-03T06:44:43Z" labels: app: svc2 name: svc2 diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/svc.yaml b/pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/svc.yaml index 74e83157b0..5eac741a2f 100644 --- a/pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/svc.yaml +++ b/pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/svc.yaml @@ -3,7 +3,7 @@ items: - apiVersion: v1 kind: Service metadata: - creationTimestamp: 2017-02-03T06:44:47Z + creationTimestamp: "2017-02-03T06:44:47Z" labels: app: svc1 name: svc1 @@ -27,7 +27,7 @@ items: - apiVersion: v1 kind: Service metadata: - creationTimestamp: 2017-02-03T06:44:43Z + creationTimestamp: "2017-02-03T06:44:43Z" labels: app: svc2 name: svc2 diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-edit-error-reedit/1.edited b/pkg/kubectl/cmd/edit/testdata/testcase-edit-error-reedit/1.edited index cd3f5b5682..80f7e593b2 100755 --- a/pkg/kubectl/cmd/edit/testdata/testcase-edit-error-reedit/1.edited +++ b/pkg/kubectl/cmd/edit/testdata/testcase-edit-error-reedit/1.edited @@ -5,7 +5,7 @@ apiVersion: v1 kind: Service metadata: - creationTimestamp: 2017-02-01T21:14:09Z + creationTimestamp: "2017-02-01T21:14:09Z" labels: app: svc1 new-label: new-value diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-edit-error-reedit/1.original b/pkg/kubectl/cmd/edit/testdata/testcase-edit-error-reedit/1.original index 5d72e9bb28..18eae77d4c 100755 --- a/pkg/kubectl/cmd/edit/testdata/testcase-edit-error-reedit/1.original +++ b/pkg/kubectl/cmd/edit/testdata/testcase-edit-error-reedit/1.original @@ -5,7 +5,7 @@ apiVersion: v1 kind: Service metadata: - creationTimestamp: 2017-02-01T21:14:09Z + creationTimestamp: "2017-02-01T21:14:09Z" labels: app: svc1 new-label: new-value diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-edit-error-reedit/3.edited b/pkg/kubectl/cmd/edit/testdata/testcase-edit-error-reedit/3.edited index 46dd87bdec..f100978df4 100755 --- a/pkg/kubectl/cmd/edit/testdata/testcase-edit-error-reedit/3.edited +++ b/pkg/kubectl/cmd/edit/testdata/testcase-edit-error-reedit/3.edited @@ -9,7 +9,7 @@ apiVersion: v1 kind: Service metadata: - creationTimestamp: 2017-02-01T21:14:09Z + creationTimestamp: "2017-02-01T21:14:09Z" labels: app: svc1 new-label: new-value diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-edit-error-reedit/3.original b/pkg/kubectl/cmd/edit/testdata/testcase-edit-error-reedit/3.original index f06ff2cf6c..4612722d71 100755 --- a/pkg/kubectl/cmd/edit/testdata/testcase-edit-error-reedit/3.original +++ b/pkg/kubectl/cmd/edit/testdata/testcase-edit-error-reedit/3.original @@ -9,7 +9,7 @@ apiVersion: v1 kind: Service metadata: - creationTimestamp: 2017-02-01T21:14:09Z + creationTimestamp: "2017-02-01T21:14:09Z" labels: app: svc1 new-label: new-value diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-edit-output-patch/1.edited b/pkg/kubectl/cmd/edit/testdata/testcase-edit-output-patch/1.edited index cce0483dda..51de60e112 100755 --- a/pkg/kubectl/cmd/edit/testdata/testcase-edit-output-patch/1.edited +++ b/pkg/kubectl/cmd/edit/testdata/testcase-edit-output-patch/1.edited @@ -8,7 +8,7 @@ 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":{}}} - creationTimestamp: 2017-02-27T19:40:53Z + creationTimestamp: "2017-02-27T19:40:53Z" labels: app: svc1 new-label: new-value diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-edit-output-patch/1.original b/pkg/kubectl/cmd/edit/testdata/testcase-edit-output-patch/1.original index 1748e03ca7..38d71f2470 100755 --- a/pkg/kubectl/cmd/edit/testdata/testcase-edit-output-patch/1.original +++ b/pkg/kubectl/cmd/edit/testdata/testcase-edit-output-patch/1.original @@ -8,7 +8,7 @@ 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":{}}} - creationTimestamp: 2017-02-27T19:40:53Z + creationTimestamp: "2017-02-27T19:40:53Z" labels: app: svc1 name: svc1 diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-immutable-name/1.edited b/pkg/kubectl/cmd/edit/testdata/testcase-immutable-name/1.edited index 601b5d97da..385c8b1412 100755 --- a/pkg/kubectl/cmd/edit/testdata/testcase-immutable-name/1.edited +++ b/pkg/kubectl/cmd/edit/testdata/testcase-immutable-name/1.edited @@ -8,7 +8,7 @@ data: foo: changed-value2 kind: ConfigMap metadata: - creationTimestamp: 2017-02-03T06:12:07Z + creationTimestamp: "2017-02-03T06:12:07Z" name: cm1-modified namespace: edit-test resourceVersion: "2071" diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-immutable-name/1.original b/pkg/kubectl/cmd/edit/testdata/testcase-immutable-name/1.original index 2a801cfdea..c6a0dbaaff 100755 --- a/pkg/kubectl/cmd/edit/testdata/testcase-immutable-name/1.original +++ b/pkg/kubectl/cmd/edit/testdata/testcase-immutable-name/1.original @@ -8,7 +8,7 @@ data: foo: changed-value2 kind: ConfigMap metadata: - creationTimestamp: 2017-02-03T06:12:07Z + creationTimestamp: "2017-02-03T06:12:07Z" name: cm1 namespace: edit-test resourceVersion: "2071" diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/2.edited b/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/2.edited index 739e5f0b92..c0f056165c 100755 --- a/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/2.edited +++ b/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/2.edited @@ -7,7 +7,7 @@ items: - apiVersion: v1 kind: Service metadata: - creationTimestamp: 2017-02-03T06:11:32Z + creationTimestamp: "2017-02-03T06:11:32Z" labels: app: svc1 name: svc1 @@ -32,7 +32,7 @@ items: foo: changed-value2 kind: ConfigMap metadata: - creationTimestamp: 2017-02-03T06:12:07Z + creationTimestamp: "2017-02-03T06:12:07Z" name: cm1 namespace: edit-test resourceVersion: "1903" diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/2.original b/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/2.original index b8ddf66d86..6a5dc923af 100755 --- a/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/2.original +++ b/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/2.original @@ -10,7 +10,7 @@ items: foo: changed-value kind: ConfigMap metadata: - creationTimestamp: 2017-02-03T06:12:07Z + creationTimestamp: "2017-02-03T06:12:07Z" name: cm1 namespace: edit-test resourceVersion: "1903" @@ -19,7 +19,7 @@ items: - apiVersion: v1 kind: Service metadata: - creationTimestamp: 2017-02-03T06:11:32Z + creationTimestamp: "2017-02-03T06:11:32Z" labels: app: svc1 name: svc1 diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/5.edited b/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/5.edited index 09b5aee489..f4916d7131 100755 --- a/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/5.edited +++ b/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/5.edited @@ -11,7 +11,7 @@ items: - apiVersion: v1 kind: Service metadata: - creationTimestamp: 2017-02-03T06:11:32Z + creationTimestamp: "2017-02-03T06:11:32Z" labels: app: svc1 newvalue: modified @@ -37,7 +37,7 @@ items: foo: changed-value2 kind: ConfigMap metadata: - creationTimestamp: 2017-02-03T06:12:07Z + creationTimestamp: "2017-02-03T06:12:07Z" name: cm1 namespace: edit-test resourceVersion: "1903" diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/5.original b/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/5.original index b56a73ca4e..0eeeaff031 100755 --- a/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/5.original +++ b/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/5.original @@ -11,7 +11,7 @@ items: - apiVersion: v1 kind: Service metadata: - creationTimestamp: 2017-02-03T06:11:32Z + creationTimestamp: "2017-02-03T06:11:32Z" labels: app: svc1 name: svc1 @@ -36,7 +36,7 @@ items: foo: changed-value2 kind: ConfigMap metadata: - creationTimestamp: 2017-02-03T06:12:07Z + creationTimestamp: "2017-02-03T06:12:07Z" name: cm1 namespace: edit-test resourceVersion: "1903" diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/8.edited b/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/8.edited index 6c0168cd63..a49105433d 100755 --- a/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/8.edited +++ b/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/8.edited @@ -10,7 +10,7 @@ items: - apiVersion: v1 kind: Service metadata: - creationTimestamp: 2017-02-03T06:11:32Z + creationTimestamp: "2017-02-03T06:11:32Z" labels: app: svc1 newvalue: modified @@ -36,7 +36,7 @@ items: foo: changed-value2 kind: ConfigMap metadata: - creationTimestamp: 2017-02-03T06:12:07Z + creationTimestamp: "2017-02-03T06:12:07Z" name: cm1 namespace: edit-test resourceVersion: "1903" diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/8.original b/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/8.original index eee7f0d508..f69f06c3a8 100755 --- a/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/8.original +++ b/pkg/kubectl/cmd/edit/testdata/testcase-list-errors/8.original @@ -10,7 +10,7 @@ items: - apiVersion: v1 kind: Service metadata: - creationTimestamp: 2017-02-03T06:11:32Z + creationTimestamp: "2017-02-03T06:11:32Z" labels: app: svc1 newvalue: modified @@ -36,7 +36,7 @@ items: foo: changed-value2 kind: ConfigMap metadata: - creationTimestamp: 2017-02-03T06:12:07Z + creationTimestamp: "2017-02-03T06:12:07Z" name: cm1 namespace: edit-test resourceVersion: "1903" diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-list-record/2.edited b/pkg/kubectl/cmd/edit/testdata/testcase-list-record/2.edited index d9cf22bd03..5b93bde6ae 100755 --- a/pkg/kubectl/cmd/edit/testdata/testcase-list-record/2.edited +++ b/pkg/kubectl/cmd/edit/testdata/testcase-list-record/2.edited @@ -15,7 +15,7 @@ items: metadata: annotations: kubernetes.io/change-cause: original creating command a - creationTimestamp: 2017-02-03T06:12:07Z + creationTimestamp: "2017-02-03T06:12:07Z" name: cm1 namespace: edit-test resourceVersion: "1414" @@ -26,7 +26,7 @@ items: metadata: annotations: kubernetes.io/change-cause: original creating command b - creationTimestamp: 2017-02-03T06:11:32Z + creationTimestamp: "2017-02-03T06:11:32Z" labels: app: svc1 new-label: foo diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-list-record/2.original b/pkg/kubectl/cmd/edit/testdata/testcase-list-record/2.original index bbc7738e91..708d02d6f3 100755 --- a/pkg/kubectl/cmd/edit/testdata/testcase-list-record/2.original +++ b/pkg/kubectl/cmd/edit/testdata/testcase-list-record/2.original @@ -14,7 +14,7 @@ items: metadata: annotations: kubernetes.io/change-cause: original creating command a - creationTimestamp: 2017-02-03T06:12:07Z + creationTimestamp: "2017-02-03T06:12:07Z" name: cm1 namespace: edit-test resourceVersion: "1414" @@ -25,7 +25,7 @@ items: metadata: annotations: kubernetes.io/change-cause: original creating command b - creationTimestamp: 2017-02-03T06:11:32Z + creationTimestamp: "2017-02-03T06:11:32Z" labels: app: svc1 new-label: foo diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-list/2.edited b/pkg/kubectl/cmd/edit/testdata/testcase-list/2.edited index 641889169f..1c1674d04d 100755 --- a/pkg/kubectl/cmd/edit/testdata/testcase-list/2.edited +++ b/pkg/kubectl/cmd/edit/testdata/testcase-list/2.edited @@ -13,7 +13,7 @@ items: new-data3: newivalue kind: ConfigMap metadata: - creationTimestamp: 2017-02-03T06:12:07Z + creationTimestamp: "2017-02-03T06:12:07Z" name: cm1 namespace: edit-test resourceVersion: "1414" @@ -22,7 +22,7 @@ items: - apiVersion: v1 kind: Service metadata: - creationTimestamp: 2017-02-03T06:11:32Z + creationTimestamp: "2017-02-03T06:11:32Z" labels: app: svc1 new-label: foo diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-list/2.original b/pkg/kubectl/cmd/edit/testdata/testcase-list/2.original index c69a566ca6..6ae9a6f35e 100755 --- a/pkg/kubectl/cmd/edit/testdata/testcase-list/2.original +++ b/pkg/kubectl/cmd/edit/testdata/testcase-list/2.original @@ -12,7 +12,7 @@ items: new-data2: new-value kind: ConfigMap metadata: - creationTimestamp: 2017-02-03T06:12:07Z + creationTimestamp: "2017-02-03T06:12:07Z" name: cm1 namespace: edit-test resourceVersion: "1414" @@ -21,7 +21,7 @@ items: - apiVersion: v1 kind: Service metadata: - creationTimestamp: 2017-02-03T06:11:32Z + creationTimestamp: "2017-02-03T06:11:32Z" labels: app: svc1 new-label: foo diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-no-op/1.edited b/pkg/kubectl/cmd/edit/testdata/testcase-no-op/1.edited index 91de933c41..658dc20ed2 100755 --- a/pkg/kubectl/cmd/edit/testdata/testcase-no-op/1.edited +++ b/pkg/kubectl/cmd/edit/testdata/testcase-no-op/1.edited @@ -5,7 +5,7 @@ apiVersion: v1 kind: ConfigMap metadata: - creationTimestamp: 2017-02-03T05:59:00Z + creationTimestamp: "2017-02-03T05:59:00Z" name: mymap namespace: default resourceVersion: "149" diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-no-op/1.original b/pkg/kubectl/cmd/edit/testdata/testcase-no-op/1.original index 91de933c41..658dc20ed2 100755 --- a/pkg/kubectl/cmd/edit/testdata/testcase-no-op/1.original +++ b/pkg/kubectl/cmd/edit/testdata/testcase-no-op/1.original @@ -5,7 +5,7 @@ apiVersion: v1 kind: ConfigMap metadata: - creationTimestamp: 2017-02-03T05:59:00Z + creationTimestamp: "2017-02-03T05:59:00Z" name: mymap namespace: default resourceVersion: "149" diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-not-update-annotation/1.edited b/pkg/kubectl/cmd/edit/testdata/testcase-not-update-annotation/1.edited index cce0483dda..51de60e112 100755 --- a/pkg/kubectl/cmd/edit/testdata/testcase-not-update-annotation/1.edited +++ b/pkg/kubectl/cmd/edit/testdata/testcase-not-update-annotation/1.edited @@ -8,7 +8,7 @@ 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":{}}} - creationTimestamp: 2017-02-27T19:40:53Z + creationTimestamp: "2017-02-27T19:40:53Z" labels: app: svc1 new-label: new-value diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-not-update-annotation/1.original b/pkg/kubectl/cmd/edit/testdata/testcase-not-update-annotation/1.original index 1748e03ca7..38d71f2470 100755 --- a/pkg/kubectl/cmd/edit/testdata/testcase-not-update-annotation/1.original +++ b/pkg/kubectl/cmd/edit/testdata/testcase-not-update-annotation/1.original @@ -8,7 +8,7 @@ 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":{}}} - creationTimestamp: 2017-02-27T19:40:53Z + creationTimestamp: "2017-02-27T19:40:53Z" labels: app: svc1 name: svc1 diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-repeat-error/1.edited b/pkg/kubectl/cmd/edit/testdata/testcase-repeat-error/1.edited index 6820febdab..6bd4ae452d 100755 --- a/pkg/kubectl/cmd/edit/testdata/testcase-repeat-error/1.edited +++ b/pkg/kubectl/cmd/edit/testdata/testcase-repeat-error/1.edited @@ -5,7 +5,7 @@ apiVersion: v1 kind: Service metadata: - creationTimestamp: 2017-02-12T20:11:19Z + creationTimestamp: "2017-02-12T20:11:19Z" labels: component: apiserver provider: kubernetes diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-repeat-error/1.original b/pkg/kubectl/cmd/edit/testdata/testcase-repeat-error/1.original index 12b5687071..ce6c5ce359 100755 --- a/pkg/kubectl/cmd/edit/testdata/testcase-repeat-error/1.original +++ b/pkg/kubectl/cmd/edit/testdata/testcase-repeat-error/1.original @@ -5,7 +5,7 @@ apiVersion: v1 kind: Service metadata: - creationTimestamp: 2017-02-12T20:11:19Z + creationTimestamp: "2017-02-12T20:11:19Z" labels: component: apiserver provider: kubernetes diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-repeat-error/3.edited b/pkg/kubectl/cmd/edit/testdata/testcase-repeat-error/3.edited index 545eadd753..b83ab430ac 100755 --- a/pkg/kubectl/cmd/edit/testdata/testcase-repeat-error/3.edited +++ b/pkg/kubectl/cmd/edit/testdata/testcase-repeat-error/3.edited @@ -9,7 +9,7 @@ apiVersion: v1 kind: Service metadata: - creationTimestamp: 2017-02-12T20:11:19Z + creationTimestamp: "2017-02-12T20:11:19Z" labels: component: apiserver provider: kubernetes diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-repeat-error/3.original b/pkg/kubectl/cmd/edit/testdata/testcase-repeat-error/3.original index 545eadd753..b83ab430ac 100755 --- a/pkg/kubectl/cmd/edit/testdata/testcase-repeat-error/3.original +++ b/pkg/kubectl/cmd/edit/testdata/testcase-repeat-error/3.original @@ -9,7 +9,7 @@ apiVersion: v1 kind: Service metadata: - creationTimestamp: 2017-02-12T20:11:19Z + creationTimestamp: "2017-02-12T20:11:19Z" labels: component: apiserver provider: kubernetes diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/3.edited b/pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/3.edited index 2fc0a1aa25..fa5a108e93 100755 --- a/pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/3.edited +++ b/pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/3.edited @@ -7,7 +7,7 @@ items: - apiVersion: v1 kind: Service metadata: - creationTimestamp: 2017-02-12T20:11:19Z + creationTimestamp: "2017-02-12T20:11:19Z" labels: component: apiserver provider: kubernetes @@ -31,7 +31,7 @@ items: - apiVersion: company.com/v1 kind: Bar metadata: - creationTimestamp: 2017-02-13T00:47:26Z + creationTimestamp: "2017-02-13T00:47:26Z" name: test namespace: default resourceVersion: "16954" @@ -52,7 +52,7 @@ items: b: false kind: Bar metadata: - creationTimestamp: 2017-02-13T00:50:10Z + creationTimestamp: "2017-02-13T00:50:10Z" name: test2 namespace: default resourceVersion: "16955" diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/3.original b/pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/3.original index e9cb478b6b..b4cd8a2bb5 100755 --- a/pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/3.original +++ b/pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/3.original @@ -7,7 +7,7 @@ items: - apiVersion: v1 kind: Service metadata: - creationTimestamp: 2017-02-12T20:11:19Z + creationTimestamp: "2017-02-12T20:11:19Z" labels: component: apiserver provider: kubernetes @@ -30,7 +30,7 @@ items: - apiVersion: company.com/v1 kind: Bar metadata: - creationTimestamp: 2017-02-13T00:47:26Z + creationTimestamp: "2017-02-13T00:47:26Z" name: test namespace: default resourceVersion: "16954" @@ -49,7 +49,7 @@ items: b: false kind: Bar metadata: - creationTimestamp: 2017-02-13T00:50:10Z + creationTimestamp: "2017-02-13T00:50:10Z" name: test2 namespace: default resourceVersion: "16955" diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-single-service/1.edited b/pkg/kubectl/cmd/edit/testdata/testcase-single-service/1.edited index 0400429b95..f2b134ab65 100755 --- a/pkg/kubectl/cmd/edit/testdata/testcase-single-service/1.edited +++ b/pkg/kubectl/cmd/edit/testdata/testcase-single-service/1.edited @@ -5,7 +5,7 @@ apiVersion: v1 kind: Service metadata: - creationTimestamp: 2017-02-01T21:14:09Z + creationTimestamp: "2017-02-01T21:14:09Z" labels: app: svc1 new-label: new-value diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-single-service/1.original b/pkg/kubectl/cmd/edit/testdata/testcase-single-service/1.original index 166898cea1..ee8925d888 100755 --- a/pkg/kubectl/cmd/edit/testdata/testcase-single-service/1.original +++ b/pkg/kubectl/cmd/edit/testdata/testcase-single-service/1.original @@ -5,7 +5,7 @@ apiVersion: v1 kind: Service metadata: - creationTimestamp: 2017-02-01T21:14:09Z + creationTimestamp: "2017-02-01T21:14:09Z" labels: app: svc1 name: svc1 diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-syntax-error/1.edited b/pkg/kubectl/cmd/edit/testdata/testcase-syntax-error/1.edited index f6de9aefd9..30d3859a35 100755 --- a/pkg/kubectl/cmd/edit/testdata/testcase-syntax-error/1.edited +++ b/pkg/kubectl/cmd/edit/testdata/testcase-syntax-error/1.edited @@ -5,7 +5,7 @@ apiVersion: v1 kind: Service metadata: - creationTimestamp: 2017-02-12T20:11:19Z + creationTimestamp: "2017-02-12T20:11:19Z" labels: component: apiserver provider: kubernetes diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-syntax-error/1.original b/pkg/kubectl/cmd/edit/testdata/testcase-syntax-error/1.original index 12b5687071..ce6c5ce359 100755 --- a/pkg/kubectl/cmd/edit/testdata/testcase-syntax-error/1.original +++ b/pkg/kubectl/cmd/edit/testdata/testcase-syntax-error/1.original @@ -5,7 +5,7 @@ apiVersion: v1 kind: Service metadata: - creationTimestamp: 2017-02-12T20:11:19Z + creationTimestamp: "2017-02-12T20:11:19Z" labels: component: apiserver provider: kubernetes diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-syntax-error/2.edited b/pkg/kubectl/cmd/edit/testdata/testcase-syntax-error/2.edited index 7f63a24ce5..7d6945abba 100755 --- a/pkg/kubectl/cmd/edit/testdata/testcase-syntax-error/2.edited +++ b/pkg/kubectl/cmd/edit/testdata/testcase-syntax-error/2.edited @@ -7,7 +7,7 @@ apiVersion: v1 kind: Service metadata: - creationTimestamp: 2017-02-12T20:11:19Z + creationTimestamp: "2017-02-12T20:11:19Z" labels: component: apiserver provider: kubernetes diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-syntax-error/2.original b/pkg/kubectl/cmd/edit/testdata/testcase-syntax-error/2.original index a229c98f05..7cae611161 100755 --- a/pkg/kubectl/cmd/edit/testdata/testcase-syntax-error/2.original +++ b/pkg/kubectl/cmd/edit/testdata/testcase-syntax-error/2.original @@ -2,12 +2,12 @@ # and an empty file will abort the edit. If an error occurs while saving this file will be # reopened with the relevant failures. # -# The edited file had a syntax error: error parsing edited-file: error converting YAML to JSON: yaml: line 17: could not find expected ':' +# The edited file had a syntax error: error parsing edited-file: error converting YAML to JSON: yaml: line 18: could not find expected ':' # apiVersion: v1 kind: Service metadata: - creationTimestamp: 2017-02-12T20:11:19Z + creationTimestamp: "2017-02-12T20:11:19Z" labels: component: apiserver provider: kubernetes diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-unknown-field-known-group-kind/1.edited b/pkg/kubectl/cmd/edit/testdata/testcase-unknown-field-known-group-kind/1.edited index 9992272a81..3859fe06aa 100755 --- a/pkg/kubectl/cmd/edit/testdata/testcase-unknown-field-known-group-kind/1.edited +++ b/pkg/kubectl/cmd/edit/testdata/testcase-unknown-field-known-group-kind/1.edited @@ -5,7 +5,7 @@ apiVersion: storage.k8s.io/v1beta1 kind: StorageClass metadata: - creationTimestamp: 2017-02-13T02:04:04Z + creationTimestamp: "2017-02-13T02:04:04Z" labels: label1: value1 label2: value2 diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-unknown-field-known-group-kind/1.original b/pkg/kubectl/cmd/edit/testdata/testcase-unknown-field-known-group-kind/1.original index fe70875d00..d3a4c5a421 100755 --- a/pkg/kubectl/cmd/edit/testdata/testcase-unknown-field-known-group-kind/1.original +++ b/pkg/kubectl/cmd/edit/testdata/testcase-unknown-field-known-group-kind/1.original @@ -5,7 +5,7 @@ apiVersion: storage.k8s.io/v1beta1 kind: StorageClass metadata: - creationTimestamp: 2017-02-13T02:04:04Z + creationTimestamp: "2017-02-13T02:04:04Z" labels: label1: value1 name: foo diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-unknown-version-known-group-kind/1.edited b/pkg/kubectl/cmd/edit/testdata/testcase-unknown-version-known-group-kind/1.edited index 7cbf1c4ae7..f25e1bad83 100755 --- a/pkg/kubectl/cmd/edit/testdata/testcase-unknown-version-known-group-kind/1.edited +++ b/pkg/kubectl/cmd/edit/testdata/testcase-unknown-version-known-group-kind/1.edited @@ -8,7 +8,7 @@ extraField: addedData: "foo" kind: StorageClass metadata: - creationTimestamp: 2017-02-13T02:04:04Z + creationTimestamp: "2017-02-13T02:04:04Z" labels: label1: value1 label2: value2 diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-unknown-version-known-group-kind/1.original b/pkg/kubectl/cmd/edit/testdata/testcase-unknown-version-known-group-kind/1.original index b720c022f7..a5cffc14ee 100755 --- a/pkg/kubectl/cmd/edit/testdata/testcase-unknown-version-known-group-kind/1.original +++ b/pkg/kubectl/cmd/edit/testdata/testcase-unknown-version-known-group-kind/1.original @@ -7,7 +7,7 @@ extraField: otherData: true kind: StorageClass metadata: - creationTimestamp: 2017-02-13T02:04:04Z + creationTimestamp: "2017-02-13T02:04:04Z" labels: label1: value1 name: foo diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-update-annotation/1.edited b/pkg/kubectl/cmd/edit/testdata/testcase-update-annotation/1.edited index cce0483dda..51de60e112 100755 --- a/pkg/kubectl/cmd/edit/testdata/testcase-update-annotation/1.edited +++ b/pkg/kubectl/cmd/edit/testdata/testcase-update-annotation/1.edited @@ -8,7 +8,7 @@ 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":{}}} - creationTimestamp: 2017-02-27T19:40:53Z + creationTimestamp: "2017-02-27T19:40:53Z" labels: app: svc1 new-label: new-value diff --git a/pkg/kubectl/cmd/edit/testdata/testcase-update-annotation/1.original b/pkg/kubectl/cmd/edit/testdata/testcase-update-annotation/1.original index 1748e03ca7..38d71f2470 100755 --- a/pkg/kubectl/cmd/edit/testdata/testcase-update-annotation/1.original +++ b/pkg/kubectl/cmd/edit/testdata/testcase-update-annotation/1.original @@ -8,7 +8,7 @@ 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":{}}} - creationTimestamp: 2017-02-27T19:40:53Z + creationTimestamp: "2017-02-27T19:40:53Z" labels: app: svc1 name: svc1 diff --git a/pkg/printers/internalversion/printers_test.go b/pkg/printers/internalversion/printers_test.go index 2b0acc7940..0c5fd695fe 100644 --- a/pkg/printers/internalversion/printers_test.go +++ b/pkg/printers/internalversion/printers_test.go @@ -257,8 +257,12 @@ func testPrinter(t *testing.T, printer printers.ResourcePrinter, unmarshalFunc f } } +func yamlUnmarshal(data []byte, v interface{}) error { + return yaml.Unmarshal(data, v) +} + func TestYAMLPrinter(t *testing.T) { - testPrinter(t, genericprinters.NewTypeSetter(legacyscheme.Scheme).ToPrinter(&genericprinters.YAMLPrinter{}), yaml.Unmarshal) + testPrinter(t, genericprinters.NewTypeSetter(legacyscheme.Scheme).ToPrinter(&genericprinters.YAMLPrinter{}), yamlUnmarshal) } func TestJSONPrinter(t *testing.T) { diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/micro_time_test.go b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/micro_time_test.go index 339610aeba..985aa70b0d 100644 --- a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/micro_time_test.go +++ b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/micro_time_test.go @@ -35,8 +35,8 @@ func TestMicroTimeMarshalYAML(t *testing.T) { result string }{ {MicroTime{}, "t: null\n"}, - {DateMicro(1998, time.May, 5, 1, 5, 5, 50, time.FixedZone("test", -4*60*60)), "t: 1998-05-05T05:05:05.000000Z\n"}, - {DateMicro(1998, time.May, 5, 5, 5, 5, 0, time.UTC), "t: 1998-05-05T05:05:05.000000Z\n"}, + {DateMicro(1998, time.May, 5, 1, 5, 5, 50, time.FixedZone("test", -4*60*60)), "t: \"1998-05-05T05:05:05.000000Z\"\n"}, + {DateMicro(1998, time.May, 5, 5, 5, 5, 0, time.UTC), "t: \"1998-05-05T05:05:05.000000Z\"\n"}, } for _, c := range cases { diff --git a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/time_test.go b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/time_test.go index 9923958ee0..0bf6c36051 100644 --- a/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/time_test.go +++ b/staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/time_test.go @@ -35,8 +35,8 @@ func TestTimeMarshalYAML(t *testing.T) { result string }{ {Time{}, "t: null\n"}, - {Date(1998, time.May, 5, 1, 5, 5, 50, time.FixedZone("test", -4*60*60)), "t: 1998-05-05T05:05:05Z\n"}, - {Date(1998, time.May, 5, 5, 5, 5, 0, time.UTC), "t: 1998-05-05T05:05:05Z\n"}, + {Date(1998, time.May, 5, 1, 5, 5, 50, time.FixedZone("test", -4*60*60)), "t: \"1998-05-05T05:05:05Z\"\n"}, + {Date(1998, time.May, 5, 5, 5, 5, 0, time.UTC), "t: \"1998-05-05T05:05:05Z\"\n"}, } for _, c := range cases { diff --git a/staging/src/k8s.io/apimachinery/pkg/util/yaml/decoder_test.go b/staging/src/k8s.io/apimachinery/pkg/util/yaml/decoder_test.go index 03e502ec69..fa5e16a4f6 100644 --- a/staging/src/k8s.io/apimachinery/pkg/util/yaml/decoder_test.go +++ b/staging/src/k8s.io/apimachinery/pkg/util/yaml/decoder_test.go @@ -197,8 +197,8 @@ stuff: 1 t.Fatal("expected error with yaml: violate, got no error") } fmt.Printf("err: %s\n", err.Error()) - if !strings.Contains(err.Error(), "yaml: line 2:") { - t.Fatalf("expected %q to have 'yaml: line 2:' found a tab character", err.Error()) + if !strings.Contains(err.Error(), "yaml: line 3:") { + t.Fatalf("expected %q to have 'yaml: line 3:' found a tab character", err.Error()) } } diff --git a/test/fixtures/pkg/kubectl/cmd/apply/deploy-serverside.yaml b/test/fixtures/pkg/kubectl/cmd/apply/deploy-serverside.yaml index ffc11aa9df..566b18ab2c 100644 --- a/test/fixtures/pkg/kubectl/cmd/apply/deploy-serverside.yaml +++ b/test/fixtures/pkg/kubectl/cmd/apply/deploy-serverside.yaml @@ -4,7 +4,7 @@ metadata: annotations: deployment.kubernetes.io/revision: "1" kubectl.kubernetes.io/last-applied-configuration: '{"kind":"Deployment","apiVersion":"extensions/v1beta1","metadata":{"name":"nginx-deployment","creationTimestamp":null},"spec":{"template":{"metadata":{"creationTimestamp":null,"labels":{"name":"nginx"}},"spec":{"containers":[{"name":"nginx","image":"nginx","resources":{}}]}},"strategy":{}},"status":{}}' - creationTimestamp: 2016-10-24T22:15:06Z + creationTimestamp: "2016-10-24T22:15:06Z" generation: 6 labels: name: nginx