github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

let kubectl annotate use patch instead of replace

Browse Source
This commit is contained in:
Chao Xu
2015-10-13 22:25:18 -07:00
parent dfb400e2e9
commit d0d260fd03
2 changed files with 37 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/kubectl/cmd/annotate_test.go
View File

@@ -433,7 +433,7 @@ func TestAnnotateObject(t *testing.T) {
t.Fatalf("unexpected request: %#v\n%#v", req.URL, req)
return nil, nil
}
case "PUT":
case "PATCH":
switch req.URL.Path {
case "/namespaces/test/pods/foo":
return &http.Response{StatusCode: 200, Body: objBody(codec, &pods.Items[0])}, nil
@@ -458,7 +458,7 @@ func TestAnnotateObject(t *testing.T) {
if err := options.Validate(args); err != nil {
t.Fatalf("unexpected error: %v", err)
}
if err := options.RunAnnotate(); err != nil {
if err := options.RunAnnotate(f); err != nil {
t.Fatalf("unexpected error: %v", err)
}
}
@@ -480,7 +480,7 @@ func TestAnnotateObjectFromFile(t *testing.T) {
t.Fatalf("unexpected request: %#v\n%#v", req.URL, req)
return nil, nil
}
case "PUT":
case "PATCH":
switch req.URL.Path {
case "/namespaces/test/pods/cassandra":
return &http.Response{StatusCode: 200, Body: objBody(codec, &pods.Items[0])}, nil
@@ -506,7 +506,7 @@ func TestAnnotateObjectFromFile(t *testing.T) {
if err := options.Validate(args); err != nil {
t.Fatalf("unexpected error: %v", err)
}
if err := options.RunAnnotate(); err != nil {
if err := options.RunAnnotate(f); err != nil {
t.Fatalf("unexpected error: %v", err)
}
}
@@ -528,7 +528,7 @@ func TestAnnotateMultipleObjects(t *testing.T) {
t.Fatalf("unexpected request: %#v\n%#v", req.URL, req)
return nil, nil
}
case "PUT":
case "PATCH":
switch req.URL.Path {
case "/namespaces/test/pods/foo":
return &http.Response{StatusCode: 200, Body: objBody(codec, &pods.Items[0])}, nil
@@ -556,7 +556,7 @@ func TestAnnotateMultipleObjects(t *testing.T) {
if err := options.Validate(args); err != nil {
t.Fatalf("unexpected error: %v", err)
}
if err := options.RunAnnotate(); err != nil {
if err := options.RunAnnotate(f); err != nil {
t.Fatalf("unexpected error: %v", err)
}
}