Skip to content

K
k3s
Unverified Commit 65da81f4 authored by Davanum Srinivas's avatar Davanum Srinivas
Browse files
Options

Fix up test cases

Change-Id: Ib9245f78dbfb88f1f37a26ca64bf80d3f78d7497
parent 6364af12
Hide whitespace changes
Inline Side-by-side
Showing with 80 additions and 76 deletions
hack/testdata/sorted-pods/sorted-pod1.yaml
View file @ 65da81f4
...@@ -2,7 +2,7 @@ apiVersion: v1 ...@@ -2,7 +2,7 @@ apiVersion: v1
kind: Pod kind: Pod
metadata: metadata:
name: sorted-pod1 name: sorted-pod1
creationTimestamp: 2018-08-30T14:10:58Z creationTimestamp: "2018-08-30T14:10:58Z"
labels: labels:
name: sorted-pod3-label name: sorted-pod3-label
spec: spec:
......
hack/testdata/sorted-pods/sorted-pod2.yaml
View file @ 65da81f4
...@@ -2,7 +2,7 @@ apiVersion: v1 ...@@ -2,7 +2,7 @@ apiVersion: v1
kind: Pod kind: Pod
metadata: metadata:
name: sorted-pod2 name: sorted-pod2
creationTimestamp: 2018-08-30T14:10:55Z creationTimestamp: "2018-08-30T14:10:55Z"
labels: labels:
name: sorted-pod2-label name: sorted-pod2-label
spec: spec:
......
hack/testdata/sorted-pods/sorted-pod3.yaml
View file @ 65da81f4
...@@ -2,7 +2,7 @@ apiVersion: v1 ...@@ -2,7 +2,7 @@ apiVersion: v1
kind: Pod kind: Pod
metadata: metadata:
name: sorted-pod3 name: sorted-pod3
creationTimestamp: 2018-08-30T14:10:53Z creationTimestamp: "2018-08-30T14:10:53Z"
labels: labels:
name: sorted-pod1-label name: sorted-pod1-label
spec: spec:
......
pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/2.edited
View file @ 65da81f4
# Please edit the 'last-applied-configuration' annotations below. # Please edit the 'last-applied-configuration' annotations below.
# Lines beginning with a '#' will be ignored, and an empty file will abort the edit. # 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 kind: Service
metadata: metadata:
......
pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied-syntax-error/2.original
View file @ 65da81f4
# Please edit the 'last-applied-configuration' annotations below. # Please edit the 'last-applied-configuration' annotations below.
# Lines beginning with a '#' will be ignored, and an empty file will abort the edit. # 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 kind: Service
metadata: metadata:
......
pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied/1.edited
View file @ 65da81f4
...@@ -5,7 +5,7 @@ apiVersion: v1 ...@@ -5,7 +5,7 @@ apiVersion: v1
kind: Service kind: Service
metadata: metadata:
annotations: {} annotations: {}
creationTimestamp: 2017-02-01T21:14:09Z creationTimestamp: "2017-02-01T21:14:09Z"
labels: labels:
app: svc1 app: svc1
new-label: new-value new-label: new-value
......
pkg/kubectl/cmd/edit/testdata/testcase-apply-edit-last-applied/1.original
View file @ 65da81f4
...@@ -5,7 +5,7 @@ apiVersion: v1 ...@@ -5,7 +5,7 @@ apiVersion: v1
kind: Service kind: Service
metadata: metadata:
annotations: {} annotations: {}
creationTimestamp: 2017-02-01T21:14:09Z creationTimestamp: "2017-02-01T21:14:09Z"
labels: labels:
app: svc1 app: svc1
new-label: new-value new-label: new-value
......
pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/0.edited
View file @ 65da81f4
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
creationTimestamp: 2017-02-03T06:44:47Z creationTimestamp: "2017-02-03T06:44:47Z"
labels: labels:
app: svc1modified app: svc1modified
name: svc1 name: svc1
......
pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/0.original
View file @ 65da81f4
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
creationTimestamp: 2017-02-03T06:44:47Z creationTimestamp: "2017-02-03T06:44:47Z"
labels: labels:
app: svc1 app: svc1
name: svc1 name: svc1
......
pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/2.edited
View file @ 65da81f4
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
creationTimestamp: 2017-02-03T06:44:43Z creationTimestamp: "2017-02-03T06:44:43Z"
labels: labels:
app: svc2modified app: svc2modified
name: svc2 name: svc2
......
pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/2.original
View file @ 65da81f4
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
creationTimestamp: 2017-02-03T06:44:43Z creationTimestamp: "2017-02-03T06:44:43Z"
labels: labels:
app: svc2 app: svc2
name: svc2 name: svc2
......
pkg/kubectl/cmd/edit/testdata/testcase-create-list-error/svc.yaml
View file @ 65da81f4
...@@ -3,7 +3,7 @@ items: ...@@ -3,7 +3,7 @@ items:
- apiVersion: v1 - apiVersion: v1
kind: Service kind: Service
metadata: metadata:
creationTimestamp: 2017-02-03T06:44:47Z creationTimestamp: "2017-02-03T06:44:47Z"
labels: labels:
app: svc1 app: svc1
name: svc1 name: svc1
...@@ -27,7 +27,7 @@ items: ...@@ -27,7 +27,7 @@ items:
- apiVersion: v1 - apiVersion: v1
kind: Service kind: Service
metadata: metadata:
creationTimestamp: 2017-02-03T06:44:43Z creationTimestamp: "2017-02-03T06:44:43Z"
labels: labels:
app: svc2 app: svc2
name: svc2 name: svc2
......
pkg/kubectl/cmd/edit/testdata/testcase-edit-error-reedit/1.edited
View file @ 65da81f4
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
creationTimestamp: 2017-02-01T21:14:09Z creationTimestamp: "2017-02-01T21:14:09Z"
labels: labels:
app: svc1 app: svc1
new-label: new-value new-label: new-value
......
pkg/kubectl/cmd/edit/testdata/testcase-edit-error-reedit/1.original
View file @ 65da81f4
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
creationTimestamp: 2017-02-01T21:14:09Z creationTimestamp: "2017-02-01T21:14:09Z"
labels: labels:
app: svc1 app: svc1
new-label: new-value new-label: new-value
......
pkg/kubectl/cmd/edit/testdata/testcase-edit-error-reedit/3.edited
View file @ 65da81f4
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
creationTimestamp: 2017-02-01T21:14:09Z creationTimestamp: "2017-02-01T21:14:09Z"
labels: labels:
app: svc1 app: svc1
new-label: new-value new-label: new-value
......
pkg/kubectl/cmd/edit/testdata/testcase-edit-error-reedit/3.original
View file @ 65da81f4
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
creationTimestamp: 2017-02-01T21:14:09Z creationTimestamp: "2017-02-01T21:14:09Z"
labels: labels:
app: svc1 app: svc1
new-label: new-value new-label: new-value
......
pkg/kubectl/cmd/edit/testdata/testcase-edit-output-patch/1.edited
View file @ 65da81f4
...@@ -8,7 +8,7 @@ metadata: ...@@ -8,7 +8,7 @@ metadata:
annotations: annotations:
kubectl.kubernetes.io/last-applied-configuration: | 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","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: labels:
app: svc1 app: svc1
new-label: new-value new-label: new-value
......
pkg/kubectl/cmd/edit/testdata/testcase-edit-output-patch/1.original
View file @ 65da81f4
...@@ -8,7 +8,7 @@ metadata: ...@@ -8,7 +8,7 @@ metadata:
annotations: annotations:
kubectl.kubernetes.io/last-applied-configuration: | 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","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: labels:
app: svc1 app: svc1
name: svc1 name: svc1
......
pkg/kubectl/cmd/edit/testdata/testcase-immutable-name/1.edited
View file @ 65da81f4
...@@ -8,7 +8,7 @@ data: ...@@ -8,7 +8,7 @@ data:
foo: changed-value2 foo: changed-value2
kind: ConfigMap kind: ConfigMap
metadata: metadata:
creationTimestamp: 2017-02-03T06:12:07Z creationTimestamp: "2017-02-03T06:12:07Z"
name: cm1-modified name: cm1-modified
namespace: edit-test namespace: edit-test
resourceVersion: "2071" resourceVersion: "2071"
......
pkg/kubectl/cmd/edit/testdata/testcase-immutable-name/1.original
View file @ 65da81f4
...@@ -8,7 +8,7 @@ data: ...@@ -8,7 +8,7 @@ data:
foo: changed-value2 foo: changed-value2
kind: ConfigMap kind: ConfigMap
metadata: metadata:
creationTimestamp: 2017-02-03T06:12:07Z creationTimestamp: "2017-02-03T06:12:07Z"
name: cm1 name: cm1
namespace: edit-test namespace: edit-test
resourceVersion: "2071" resourceVersion: "2071"
......
pkg/kubectl/cmd/edit/testdata/testcase-list-errors/2.edited
View file @ 65da81f4
...@@ -7,7 +7,7 @@ items: ...@@ -7,7 +7,7 @@ items:
- apiVersion: v1 - apiVersion: v1
kind: Service kind: Service
metadata: metadata:
creationTimestamp: 2017-02-03T06:11:32Z creationTimestamp: "2017-02-03T06:11:32Z"
labels: labels:
app: svc1 app: svc1
name: svc1 name: svc1
...@@ -32,7 +32,7 @@ items: ...@@ -32,7 +32,7 @@ items:
foo: changed-value2 foo: changed-value2
kind: ConfigMap kind: ConfigMap
metadata: metadata:
creationTimestamp: 2017-02-03T06:12:07Z creationTimestamp: "2017-02-03T06:12:07Z"
name: cm1 name: cm1
namespace: edit-test namespace: edit-test
resourceVersion: "1903" resourceVersion: "1903"
......
pkg/kubectl/cmd/edit/testdata/testcase-list-errors/2.original
View file @ 65da81f4
...@@ -10,7 +10,7 @@ items: ...@@ -10,7 +10,7 @@ items:
foo: changed-value foo: changed-value
kind: ConfigMap kind: ConfigMap
metadata: metadata:
creationTimestamp: 2017-02-03T06:12:07Z creationTimestamp: "2017-02-03T06:12:07Z"
name: cm1 name: cm1
namespace: edit-test namespace: edit-test
resourceVersion: "1903" resourceVersion: "1903"
...@@ -19,7 +19,7 @@ items: ...@@ -19,7 +19,7 @@ items:
- apiVersion: v1 - apiVersion: v1
kind: Service kind: Service
metadata: metadata:
creationTimestamp: 2017-02-03T06:11:32Z creationTimestamp: "2017-02-03T06:11:32Z"
labels: labels:
app: svc1 app: svc1
name: svc1 name: svc1
......
pkg/kubectl/cmd/edit/testdata/testcase-list-errors/5.edited
View file @ 65da81f4
...@@ -11,7 +11,7 @@ items: ...@@ -11,7 +11,7 @@ items:
- apiVersion: v1 - apiVersion: v1
kind: Service kind: Service
metadata: metadata:
creationTimestamp: 2017-02-03T06:11:32Z creationTimestamp: "2017-02-03T06:11:32Z"
labels: labels:
app: svc1 app: svc1
newvalue: modified newvalue: modified
...@@ -37,7 +37,7 @@ items: ...@@ -37,7 +37,7 @@ items:
foo: changed-value2 foo: changed-value2
kind: ConfigMap kind: ConfigMap
metadata: metadata:
creationTimestamp: 2017-02-03T06:12:07Z creationTimestamp: "2017-02-03T06:12:07Z"
name: cm1 name: cm1
namespace: edit-test namespace: edit-test
resourceVersion: "1903" resourceVersion: "1903"
......
pkg/kubectl/cmd/edit/testdata/testcase-list-errors/5.original
View file @ 65da81f4
...@@ -11,7 +11,7 @@ items: ...@@ -11,7 +11,7 @@ items:
- apiVersion: v1 - apiVersion: v1
kind: Service kind: Service
metadata: metadata:
creationTimestamp: 2017-02-03T06:11:32Z creationTimestamp: "2017-02-03T06:11:32Z"
labels: labels:
app: svc1 app: svc1
name: svc1 name: svc1
...@@ -36,7 +36,7 @@ items: ...@@ -36,7 +36,7 @@ items:
foo: changed-value2 foo: changed-value2
kind: ConfigMap kind: ConfigMap
metadata: metadata:
creationTimestamp: 2017-02-03T06:12:07Z creationTimestamp: "2017-02-03T06:12:07Z"
name: cm1 name: cm1
namespace: edit-test namespace: edit-test
resourceVersion: "1903" resourceVersion: "1903"
......
pkg/kubectl/cmd/edit/testdata/testcase-list-errors/8.edited
View file @ 65da81f4
...@@ -10,7 +10,7 @@ items: ...@@ -10,7 +10,7 @@ items:
- apiVersion: v1 - apiVersion: v1
kind: Service kind: Service
metadata: metadata:
creationTimestamp: 2017-02-03T06:11:32Z creationTimestamp: "2017-02-03T06:11:32Z"
labels: labels:
app: svc1 app: svc1
newvalue: modified newvalue: modified
...@@ -36,7 +36,7 @@ items: ...@@ -36,7 +36,7 @@ items:
foo: changed-value2 foo: changed-value2
kind: ConfigMap kind: ConfigMap
metadata: metadata:
creationTimestamp: 2017-02-03T06:12:07Z creationTimestamp: "2017-02-03T06:12:07Z"
name: cm1 name: cm1
namespace: edit-test namespace: edit-test
resourceVersion: "1903" resourceVersion: "1903"
......
pkg/kubectl/cmd/edit/testdata/testcase-list-errors/8.original
View file @ 65da81f4
...@@ -10,7 +10,7 @@ items: ...@@ -10,7 +10,7 @@ items:
- apiVersion: v1 - apiVersion: v1
kind: Service kind: Service
metadata: metadata:
creationTimestamp: 2017-02-03T06:11:32Z creationTimestamp: "2017-02-03T06:11:32Z"
labels: labels:
app: svc1 app: svc1
newvalue: modified newvalue: modified
...@@ -36,7 +36,7 @@ items: ...@@ -36,7 +36,7 @@ items:
foo: changed-value2 foo: changed-value2
kind: ConfigMap kind: ConfigMap
metadata: metadata:
creationTimestamp: 2017-02-03T06:12:07Z creationTimestamp: "2017-02-03T06:12:07Z"
name: cm1 name: cm1
namespace: edit-test namespace: edit-test
resourceVersion: "1903" resourceVersion: "1903"
......
pkg/kubectl/cmd/edit/testdata/testcase-list-record/2.edited
View file @ 65da81f4
...@@ -15,7 +15,7 @@ items: ...@@ -15,7 +15,7 @@ items:
metadata: metadata:
annotations: annotations:
kubernetes.io/change-cause: original creating command a kubernetes.io/change-cause: original creating command a
creationTimestamp: 2017-02-03T06:12:07Z creationTimestamp: "2017-02-03T06:12:07Z"
name: cm1 name: cm1
namespace: edit-test namespace: edit-test
resourceVersion: "1414" resourceVersion: "1414"
...@@ -26,7 +26,7 @@ items: ...@@ -26,7 +26,7 @@ items:
metadata: metadata:
annotations: annotations:
kubernetes.io/change-cause: original creating command b kubernetes.io/change-cause: original creating command b
creationTimestamp: 2017-02-03T06:11:32Z creationTimestamp: "2017-02-03T06:11:32Z"
labels: labels:
app: svc1 app: svc1
new-label: foo new-label: foo
......
pkg/kubectl/cmd/edit/testdata/testcase-list-record/2.original
View file @ 65da81f4
...@@ -14,7 +14,7 @@ items: ...@@ -14,7 +14,7 @@ items:
metadata: metadata:
annotations: annotations:
kubernetes.io/change-cause: original creating command a kubernetes.io/change-cause: original creating command a
creationTimestamp: 2017-02-03T06:12:07Z creationTimestamp: "2017-02-03T06:12:07Z"
name: cm1 name: cm1
namespace: edit-test namespace: edit-test
resourceVersion: "1414" resourceVersion: "1414"
...@@ -25,7 +25,7 @@ items: ...@@ -25,7 +25,7 @@ items:
metadata: metadata:
annotations: annotations:
kubernetes.io/change-cause: original creating command b kubernetes.io/change-cause: original creating command b
creationTimestamp: 2017-02-03T06:11:32Z creationTimestamp: "2017-02-03T06:11:32Z"
labels: labels:
app: svc1 app: svc1
new-label: foo new-label: foo
......
pkg/kubectl/cmd/edit/testdata/testcase-list/2.edited
View file @ 65da81f4
...@@ -13,7 +13,7 @@ items: ...@@ -13,7 +13,7 @@ items:
new-data3: newivalue new-data3: newivalue
kind: ConfigMap kind: ConfigMap
metadata: metadata:
creationTimestamp: 2017-02-03T06:12:07Z creationTimestamp: "2017-02-03T06:12:07Z"
name: cm1 name: cm1
namespace: edit-test namespace: edit-test
resourceVersion: "1414" resourceVersion: "1414"
...@@ -22,7 +22,7 @@ items: ...@@ -22,7 +22,7 @@ items:
- apiVersion: v1 - apiVersion: v1
kind: Service kind: Service
metadata: metadata:
creationTimestamp: 2017-02-03T06:11:32Z creationTimestamp: "2017-02-03T06:11:32Z"
labels: labels:
app: svc1 app: svc1
new-label: foo new-label: foo
......
pkg/kubectl/cmd/edit/testdata/testcase-list/2.original
View file @ 65da81f4
...@@ -12,7 +12,7 @@ items: ...@@ -12,7 +12,7 @@ items:
new-data2: new-value new-data2: new-value
kind: ConfigMap kind: ConfigMap
metadata: metadata:
creationTimestamp: 2017-02-03T06:12:07Z creationTimestamp: "2017-02-03T06:12:07Z"
name: cm1 name: cm1
namespace: edit-test namespace: edit-test
resourceVersion: "1414" resourceVersion: "1414"
...@@ -21,7 +21,7 @@ items: ...@@ -21,7 +21,7 @@ items:
- apiVersion: v1 - apiVersion: v1
kind: Service kind: Service
metadata: metadata:
creationTimestamp: 2017-02-03T06:11:32Z creationTimestamp: "2017-02-03T06:11:32Z"
labels: labels:
app: svc1 app: svc1
new-label: foo new-label: foo
......
pkg/kubectl/cmd/edit/testdata/testcase-no-op/1.edited
View file @ 65da81f4
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
apiVersion: v1 apiVersion: v1
kind: ConfigMap kind: ConfigMap
metadata: metadata:
creationTimestamp: 2017-02-03T05:59:00Z creationTimestamp: "2017-02-03T05:59:00Z"
name: mymap name: mymap
namespace: default namespace: default
resourceVersion: "149" resourceVersion: "149"
......
pkg/kubectl/cmd/edit/testdata/testcase-no-op/1.original
View file @ 65da81f4
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
apiVersion: v1 apiVersion: v1
kind: ConfigMap kind: ConfigMap
metadata: metadata:
creationTimestamp: 2017-02-03T05:59:00Z creationTimestamp: "2017-02-03T05:59:00Z"
name: mymap name: mymap
namespace: default namespace: default
resourceVersion: "149" resourceVersion: "149"
......
pkg/kubectl/cmd/edit/testdata/testcase-not-update-annotation/1.edited
View file @ 65da81f4
...@@ -8,7 +8,7 @@ metadata: ...@@ -8,7 +8,7 @@ metadata:
annotations: annotations:
kubectl.kubernetes.io/last-applied-configuration: | 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","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: labels:
app: svc1 app: svc1
new-label: new-value new-label: new-value
......
pkg/kubectl/cmd/edit/testdata/testcase-not-update-annotation/1.original
View file @ 65da81f4
...@@ -8,7 +8,7 @@ metadata: ...@@ -8,7 +8,7 @@ metadata:
annotations: annotations:
kubectl.kubernetes.io/last-applied-configuration: | 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","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: labels:
app: svc1 app: svc1
name: svc1 name: svc1
......
pkg/kubectl/cmd/edit/testdata/testcase-repeat-error/1.edited
View file @ 65da81f4
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
creationTimestamp: 2017-02-12T20:11:19Z creationTimestamp: "2017-02-12T20:11:19Z"
labels: labels:
component: apiserver component: apiserver
provider: kubernetes provider: kubernetes
......
pkg/kubectl/cmd/edit/testdata/testcase-repeat-error/1.original
View file @ 65da81f4
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
creationTimestamp: 2017-02-12T20:11:19Z creationTimestamp: "2017-02-12T20:11:19Z"
labels: labels:
component: apiserver component: apiserver
provider: kubernetes provider: kubernetes
......
pkg/kubectl/cmd/edit/testdata/testcase-repeat-error/3.edited
View file @ 65da81f4
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
creationTimestamp: 2017-02-12T20:11:19Z creationTimestamp: "2017-02-12T20:11:19Z"
labels: labels:
component: apiserver component: apiserver
provider: kubernetes provider: kubernetes
......
pkg/kubectl/cmd/edit/testdata/testcase-repeat-error/3.original
View file @ 65da81f4
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
creationTimestamp: 2017-02-12T20:11:19Z creationTimestamp: "2017-02-12T20:11:19Z"
labels: labels:
component: apiserver component: apiserver
provider: kubernetes provider: kubernetes
......
pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/3.edited
View file @ 65da81f4
...@@ -7,7 +7,7 @@ items: ...@@ -7,7 +7,7 @@ items:
- apiVersion: v1 - apiVersion: v1
kind: Service kind: Service
metadata: metadata:
creationTimestamp: 2017-02-12T20:11:19Z creationTimestamp: "2017-02-12T20:11:19Z"
labels: labels:
component: apiserver component: apiserver
provider: kubernetes provider: kubernetes
...@@ -31,7 +31,7 @@ items: ...@@ -31,7 +31,7 @@ items:
- apiVersion: company.com/v1 - apiVersion: company.com/v1
kind: Bar kind: Bar
metadata: metadata:
creationTimestamp: 2017-02-13T00:47:26Z creationTimestamp: "2017-02-13T00:47:26Z"
name: test name: test
namespace: default namespace: default
resourceVersion: "16954" resourceVersion: "16954"
...@@ -52,7 +52,7 @@ items: ...@@ -52,7 +52,7 @@ items:
b: false b: false
kind: Bar kind: Bar
metadata: metadata:
creationTimestamp: 2017-02-13T00:50:10Z creationTimestamp: "2017-02-13T00:50:10Z"
name: test2 name: test2
namespace: default namespace: default
resourceVersion: "16955" resourceVersion: "16955"
......
pkg/kubectl/cmd/edit/testdata/testcase-schemaless-list/3.original
View file @ 65da81f4
...@@ -7,7 +7,7 @@ items: ...@@ -7,7 +7,7 @@ items:
- apiVersion: v1 - apiVersion: v1
kind: Service kind: Service
metadata: metadata:
creationTimestamp: 2017-02-12T20:11:19Z creationTimestamp: "2017-02-12T20:11:19Z"
labels: labels:
component: apiserver component: apiserver
provider: kubernetes provider: kubernetes
...@@ -30,7 +30,7 @@ items: ...@@ -30,7 +30,7 @@ items:
- apiVersion: company.com/v1 - apiVersion: company.com/v1
kind: Bar kind: Bar
metadata: metadata:
creationTimestamp: 2017-02-13T00:47:26Z creationTimestamp: "2017-02-13T00:47:26Z"
name: test name: test
namespace: default namespace: default
resourceVersion: "16954" resourceVersion: "16954"
...@@ -49,7 +49,7 @@ items: ...@@ -49,7 +49,7 @@ items:
b: false b: false
kind: Bar kind: Bar
metadata: metadata:
creationTimestamp: 2017-02-13T00:50:10Z creationTimestamp: "2017-02-13T00:50:10Z"
name: test2 name: test2
namespace: default namespace: default
resourceVersion: "16955" resourceVersion: "16955"
......
pkg/kubectl/cmd/edit/testdata/testcase-single-service/1.edited
View file @ 65da81f4
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
creationTimestamp: 2017-02-01T21:14:09Z creationTimestamp: "2017-02-01T21:14:09Z"
labels: labels:
app: svc1 app: svc1
new-label: new-value new-label: new-value
......
pkg/kubectl/cmd/edit/testdata/testcase-single-service/1.original
View file @ 65da81f4
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
creationTimestamp: 2017-02-01T21:14:09Z creationTimestamp: "2017-02-01T21:14:09Z"
labels: labels:
app: svc1 app: svc1
name: svc1 name: svc1
......
pkg/kubectl/cmd/edit/testdata/testcase-syntax-error/1.edited
View file @ 65da81f4
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
creationTimestamp: 2017-02-12T20:11:19Z creationTimestamp: "2017-02-12T20:11:19Z"
labels: labels:
component: apiserver component: apiserver
provider: kubernetes provider: kubernetes
......
pkg/kubectl/cmd/edit/testdata/testcase-syntax-error/1.original
View file @ 65da81f4
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
creationTimestamp: 2017-02-12T20:11:19Z creationTimestamp: "2017-02-12T20:11:19Z"
labels: labels:
component: apiserver component: apiserver
provider: kubernetes provider: kubernetes
......
pkg/kubectl/cmd/edit/testdata/testcase-syntax-error/2.edited
View file @ 65da81f4
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
apiVersion: v1 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
creationTimestamp: 2017-02-12T20:11:19Z creationTimestamp: "2017-02-12T20:11:19Z"
labels: labels:
component: apiserver component: apiserver
provider: kubernetes provider: kubernetes
......
pkg/kubectl/cmd/edit/testdata/testcase-syntax-error/2.original
View file @ 65da81f4
...@@ -2,12 +2,12 @@ ...@@ -2,12 +2,12 @@
# and an empty file will abort the edit. If an error occurs while saving this file will be # and an empty file will abort the edit. If an error occurs while saving this file will be
# reopened with the relevant failures. # 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 apiVersion: v1
kind: Service kind: Service
metadata: metadata:
creationTimestamp: 2017-02-12T20:11:19Z creationTimestamp: "2017-02-12T20:11:19Z"
labels: labels:
component: apiserver component: apiserver
provider: kubernetes provider: kubernetes
......
pkg/kubectl/cmd/edit/testdata/testcase-unknown-field-known-group-kind/1.edited
View file @ 65da81f4
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
apiVersion: storage.k8s.io/v1beta1 apiVersion: storage.k8s.io/v1beta1
kind: StorageClass kind: StorageClass
metadata: metadata:
creationTimestamp: 2017-02-13T02:04:04Z creationTimestamp: "2017-02-13T02:04:04Z"
labels: labels:
label1: value1 label1: value1
label2: value2 label2: value2
......
pkg/kubectl/cmd/edit/testdata/testcase-unknown-field-known-group-kind/1.original
View file @ 65da81f4
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
apiVersion: storage.k8s.io/v1beta1 apiVersion: storage.k8s.io/v1beta1
kind: StorageClass kind: StorageClass
metadata: metadata:
creationTimestamp: 2017-02-13T02:04:04Z creationTimestamp: "2017-02-13T02:04:04Z"
labels: labels:
label1: value1 label1: value1
name: foo name: foo
......
pkg/kubectl/cmd/edit/testdata/testcase-unknown-version-known-group-kind/1.edited
View file @ 65da81f4
...@@ -8,7 +8,7 @@ extraField: ...@@ -8,7 +8,7 @@ extraField:
addedData: "foo" addedData: "foo"
kind: StorageClass kind: StorageClass
metadata: metadata:
creationTimestamp: 2017-02-13T02:04:04Z creationTimestamp: "2017-02-13T02:04:04Z"
labels: labels:
label1: value1 label1: value1
label2: value2 label2: value2
......
pkg/kubectl/cmd/edit/testdata/testcase-unknown-version-known-group-kind/1.original
View file @ 65da81f4
...@@ -7,7 +7,7 @@ extraField: ...@@ -7,7 +7,7 @@ extraField:
otherData: true otherData: true
kind: StorageClass kind: StorageClass
metadata: metadata:
creationTimestamp: 2017-02-13T02:04:04Z creationTimestamp: "2017-02-13T02:04:04Z"
labels: labels:
label1: value1 label1: value1
name: foo name: foo
......
pkg/kubectl/cmd/edit/testdata/testcase-update-annotation/1.edited
View file @ 65da81f4
...@@ -8,7 +8,7 @@ metadata: ...@@ -8,7 +8,7 @@ metadata:
annotations: annotations:
kubectl.kubernetes.io/last-applied-configuration: | 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","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: labels:
app: svc1 app: svc1
new-label: new-value new-label: new-value
......
pkg/kubectl/cmd/edit/testdata/testcase-update-annotation/1.original
View file @ 65da81f4
...@@ -8,7 +8,7 @@ metadata: ...@@ -8,7 +8,7 @@ metadata:
annotations: annotations:
kubectl.kubernetes.io/last-applied-configuration: | 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","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: labels:
app: svc1 app: svc1
name: svc1 name: svc1
......
pkg/printers/internalversion/printers_test.go
View file @ 65da81f4
...@@ -257,8 +257,12 @@ func testPrinter(t *testing.T, printer printers.ResourcePrinter, unmarshalFunc f ...@@ -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) { 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) { func TestJSONPrinter(t *testing.T) {
......
staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/micro_time_test.go
View file @ 65da81f4
...@@ -35,8 +35,8 @@ func TestMicroTimeMarshalYAML(t *testing.T) { ...@@ -35,8 +35,8 @@ func TestMicroTimeMarshalYAML(t *testing.T) {
result string result string
}{ }{
{MicroTime{}, "t: null\n"}, {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, 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, 5, 5, 5, 0, time.UTC), "t: \"1998-05-05T05:05:05.000000Z\"\n"},
} }
for _, c := range cases { for _, c := range cases {
......
staging/src/k8s.io/apimachinery/pkg/apis/meta/v1/time_test.go
View file @ 65da81f4
...@@ -35,8 +35,8 @@ func TestTimeMarshalYAML(t *testing.T) { ...@@ -35,8 +35,8 @@ func TestTimeMarshalYAML(t *testing.T) {
result string result string
}{ }{
{Time{}, "t: null\n"}, {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, 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, 5, 5, 5, 0, time.UTC), "t: \"1998-05-05T05:05:05Z\"\n"},
} }
for _, c := range cases { for _, c := range cases {
......
staging/src/k8s.io/apimachinery/pkg/util/yaml/decoder_test.go
View file @ 65da81f4
...@@ -197,8 +197,8 @@ stuff: 1 ...@@ -197,8 +197,8 @@ stuff: 1
t.Fatal("expected error with yaml: violate, got no error") t.Fatal("expected error with yaml: violate, got no error")
} }
fmt.Printf("err: %s\n", err.Error()) fmt.Printf("err: %s\n", err.Error())
if !strings.Contains(err.Error(), "yaml: line 2:") { if !strings.Contains(err.Error(), "yaml: line 3:") {
t.Fatalf("expected %q to have 'yaml: line 2:' found a tab character", err.Error()) t.Fatalf("expected %q to have 'yaml: line 3:' found a tab character", err.Error())
} }
} }
......
test/fixtures/pkg/kubectl/cmd/apply/deploy-serverside.yaml
View file @ 65da81f4
...@@ -4,7 +4,7 @@ metadata: ...@@ -4,7 +4,7 @@ metadata:
annotations: annotations:
deployment.kubernetes.io/revision: "1" 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":{}}' 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 generation: 6
labels: labels:
name: nginx name: nginx
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment