github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-06 18:54:06 +00:00
Code Issues Projects Releases Wiki Activity

remove internal version api from kubectl annotate command

Browse Source
This commit is contained in:
zhengjiajin 2017-11-13 17:29:40 +08:00
parent d6cabaf706
commit aabee865cd
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -23,11 +23,11 @@ import (
"strings" "strings"
"testing" "testing"
"k8s.io/api/core/v1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime" "k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime/schema" "k8s.io/apimachinery/pkg/runtime/schema"
"k8s.io/client-go/rest/fake" "k8s.io/client-go/rest/fake"
api "k8s.io/kubernetes/pkg/apis/core"
cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing" cmdtesting "k8s.io/kubernetes/pkg/kubectl/cmd/testing"
) )
@ -226,7 +226,7 @@ func TestUpdateAnnotations(t *testing.T) {
expectErr bool expectErr bool
}{ }{
{ {
obj: &api.Pod{ obj: &v1.Pod{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{"a": "b"}, Annotations: map[string]string{"a": "b"},
}, },
@ -235,41 +235,41 @@ func TestUpdateAnnotations(t *testing.T) {
expectErr: true, expectErr: true,
}, },
{ {
obj: &api.Pod{ obj: &v1.Pod{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{"a": "b"}, Annotations: map[string]string{"a": "b"},
}, },
}, },
annotations: map[string]string{"a": "c"}, annotations: map[string]string{"a": "c"},
overwrite: true, overwrite: true,
expected: &api.Pod{ expected: &v1.Pod{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{"a": "c"}, Annotations: map[string]string{"a": "c"},
}, },
}, },
}, },
{ {
obj: &api.Pod{ obj: &v1.Pod{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{"a": "b"}, Annotations: map[string]string{"a": "b"},
}, },
}, },
annotations: map[string]string{"c": "d"}, annotations: map[string]string{"c": "d"},
expected: &api.Pod{ expected: &v1.Pod{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{"a": "b", "c": "d"}, Annotations: map[string]string{"a": "b", "c": "d"},
}, },
}, },
}, },
{ {
obj: &api.Pod{ obj: &v1.Pod{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{"a": "b"}, Annotations: map[string]string{"a": "b"},
}, },
}, },
annotations: map[string]string{"c": "d"}, annotations: map[string]string{"c": "d"},
version: "2", version: "2",
expected: &api.Pod{ expected: &v1.Pod{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{"a": "b", "c": "d"}, Annotations: map[string]string{"a": "b", "c": "d"},
ResourceVersion: "2", ResourceVersion: "2",
@ -277,28 +277,28 @@ func TestUpdateAnnotations(t *testing.T) {
}, },
}, },
{ {
obj: &api.Pod{ obj: &v1.Pod{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{"a": "b"}, Annotations: map[string]string{"a": "b"},
}, },
}, },
annotations: map[string]string{}, annotations: map[string]string{},
remove: []string{"a"}, remove: []string{"a"},
expected: &api.Pod{ expected: &v1.Pod{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{}, Annotations: map[string]string{},
}, },
}, },
}, },
{ {
obj: &api.Pod{ obj: &v1.Pod{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{"a": "b", "c": "d"}, Annotations: map[string]string{"a": "b", "c": "d"},
}, },
}, },
annotations: map[string]string{"e": "f"}, annotations: map[string]string{"e": "f"},
remove: []string{"a"}, remove: []string{"a"},
expected: &api.Pod{ expected: &v1.Pod{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{ Annotations: map[string]string{
"c": "d", "c": "d",
@ -308,14 +308,14 @@ func TestUpdateAnnotations(t *testing.T) {
}, },
}, },
{ {
obj: &api.Pod{ obj: &v1.Pod{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{"a": "b", "c": "d"}, Annotations: map[string]string{"a": "b", "c": "d"},
}, },
}, },
annotations: map[string]string{"e": "f"}, annotations: map[string]string{"e": "f"},
remove: []string{"g"}, remove: []string{"g"},
expected: &api.Pod{ expected: &v1.Pod{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{ Annotations: map[string]string{
"a": "b", "a": "b",
@ -326,13 +326,13 @@ func TestUpdateAnnotations(t *testing.T) {
}, },
}, },
{ {
obj: &api.Pod{ obj: &v1.Pod{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{"a": "b", "c": "d"}, Annotations: map[string]string{"a": "b", "c": "d"},
}, },
}, },
remove: []string{"e"}, remove: []string{"e"},
expected: &api.Pod{ expected: &v1.Pod{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{ Annotations: map[string]string{
"a": "b", "a": "b",
@ -342,11 +342,11 @@ func TestUpdateAnnotations(t *testing.T) {
}, },
}, },
{ {
obj: &api.Pod{ obj: &v1.Pod{
ObjectMeta: metav1.ObjectMeta{}, ObjectMeta: metav1.ObjectMeta{},
}, },
annotations: map[string]string{"a": "b"}, annotations: map[string]string{"a": "b"},
expected: &api.Pod{ expected: &v1.Pod{
ObjectMeta: metav1.ObjectMeta{ ObjectMeta: metav1.ObjectMeta{
Annotations: map[string]string{"a": "b"}, Annotations: map[string]string{"a": "b"},
}, },