github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-03 09:22:44 +00:00
Code Issues Projects Releases Wiki Activity

Invalid JSON in examples and tests

Browse Source
This commit is contained in:
Clayton Coleman 2015-03-16 23:40:27 -04:00
parent a8f2cee8c5
commit 1b1866d836
2 changed files with 24 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
examples/limitrange/valid-pod.json
View File

@ -13,8 +13,8 @@
"name": "kubernetes-serve-hostname", "name": "kubernetes-serve-hostname",
"image": "kubernetes/serve_hostname", "image": "kubernetes/serve_hostname",
"cpu": 1000, "cpu": 1000,
"memory": 1048576, "memory": 1048576
}] }]
} }
}, }
} }

39
test/integration/auth_test.go
View File

@ -73,7 +73,7 @@ var aPod string = `
"manifest": { "manifest": {
"version": "v1beta1", "version": "v1beta1",
"id": "a", "id": "a",
"containers": [{ "name": "foo", "image": "bar/foo", }] "containers": [{ "name": "foo", "image": "bar/foo" }]
} }
}%s }%s
} }
@ -87,7 +87,7 @@ var aPodInBar string = `
"manifest": { "manifest": {
"version": "v1beta1", "version": "v1beta1",
"id": "a", "id": "a",
"containers": [{ "name": "foo", "image": "bar/foo", }] "containers": [{ "name": "foo", "image": "bar/foo" }]
} }
}%s }%s
} }
@ -102,17 +102,18 @@ var aRC string = `
"replicaSelector": {"name": "a"}, "replicaSelector": {"name": "a"},
"podTemplate": { "podTemplate": {
"desiredState": { "desiredState": {
"manifest": { "manifest": {
"version": "v1beta1", "version": "v1beta1",
"id": "a", "id": "a",
"containers": [{ "containers": [{
"name": "foo", "name": "foo",
"image": "bar/foo", "image": "bar/foo"
}] }]
} }
}, },
"labels": {"name": "a"} "labels": {"name": "a"}
}}, }
},
"labels": {"name": "a"}%s "labels": {"name": "a"}%s
} }
` `
@ -145,7 +146,7 @@ var aEvent string = `
"kind": "Minion", "kind": "Minion",
"name": "a", "name": "a",
"namespace": "default", "namespace": "default",
"apiVersion": "v1beta1", "apiVersion": "v1beta1"
}%s }%s
} }
` `
@ -343,10 +344,11 @@ func TestAuthModeAlwaysAllow(t *testing.T) {
sub += fmt.Sprintf(",\r\n\"resourceVersion\": %v", resVersion) sub += fmt.Sprintf(",\r\n\"resourceVersion\": %v", resVersion)
} }
namespace := "default" namespace := "default"
sub += fmt.Sprintf(",\r\n\"namespace\": %v", namespace) sub += fmt.Sprintf(",\r\n\"namespace\": %q", namespace)
} }
bodyStr = fmt.Sprintf(r.body, sub) bodyStr = fmt.Sprintf(r.body, sub)
} }
r.body = bodyStr
bodyBytes := bytes.NewReader([]byte(bodyStr)) bodyBytes := bytes.NewReader([]byte(bodyStr))
req, err := http.NewRequest(r.verb, s.URL+r.URL, bodyBytes) req, err := http.NewRequest(r.verb, s.URL+r.URL, bodyBytes)
if err != nil { if err != nil {
@ -514,10 +516,11 @@ func TestAliceNotForbiddenOrUnauthorized(t *testing.T) {
sub += fmt.Sprintf(",\r\n\"resourceVersion\": %v", resVersion) sub += fmt.Sprintf(",\r\n\"resourceVersion\": %v", resVersion)
} }
namespace := "default" namespace := "default"
sub += fmt.Sprintf(",\r\n\"namespace\": %v", namespace) sub += fmt.Sprintf(",\r\n\"namespace\": %q", namespace)
} }
bodyStr = fmt.Sprintf(r.body, sub) bodyStr = fmt.Sprintf(r.body, sub)
} }
r.body = bodyStr
bodyBytes := bytes.NewReader([]byte(bodyStr)) bodyBytes := bytes.NewReader([]byte(bodyStr))
req, err := http.NewRequest(r.verb, s.URL+r.URL, bodyBytes) req, err := http.NewRequest(r.verb, s.URL+r.URL, bodyBytes)
if err != nil { if err != nil {
@ -767,10 +770,11 @@ func TestNamespaceAuthorization(t *testing.T) {
if len(namespace) == 0 { if len(namespace) == 0 {
namespace = "default" namespace = "default"
} }
sub += fmt.Sprintf(",\r\n\"namespace\": %v", namespace) sub += fmt.Sprintf(",\r\n\"namespace\": %q", namespace)
} }
bodyStr = fmt.Sprintf(r.body, sub) bodyStr = fmt.Sprintf(r.body, sub)
} }
r.body = bodyStr
bodyBytes := bytes.NewReader([]byte(bodyStr)) bodyBytes := bytes.NewReader([]byte(bodyStr))
req, err := http.NewRequest(r.verb, s.URL+r.URL, bodyBytes) req, err := http.NewRequest(r.verb, s.URL+r.URL, bodyBytes)
if err != nil { if err != nil {
@ -873,6 +877,7 @@ func TestKindAuthorization(t *testing.T) {
} }
} }
} }
r.body = bodyStr
bodyBytes := bytes.NewReader([]byte(bodyStr)) bodyBytes := bytes.NewReader([]byte(bodyStr))
req, err := http.NewRequest(r.verb, s.URL+r.URL, bodyBytes) req, err := http.NewRequest(r.verb, s.URL+r.URL, bodyBytes)
if err != nil { if err != nil {