Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
aabee865
Commit
aabee865
authored
Nov 13, 2017
by
zhengjiajin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove internal version api from kubectl annotate command
parent
d6cabaf7
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
18 additions
and
18 deletions
+18
-18
annotate_test.go
pkg/kubectl/cmd/annotate_test.go
+18
-18
No files found.
pkg/kubectl/cmd/annotate_test.go
View file @
aabee865
...
@@ -23,11 +23,11 @@ import (
...
@@ -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) {
...
@@ -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) {
...
@@ -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) {
...
@@ -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) {
...
@@ -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) {
...
@@ -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) {
...
@@ -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"
},
},
},
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment