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
d2bd6a7f
Commit
d2bd6a7f
authored
Oct 25, 2017
by
zhengjiajin
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove kubectl create namespace dependencies on kubernetes/pkg/api
parent
7f991a3b
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
7 deletions
+7
-7
namespace.go
pkg/kubectl/namespace.go
+2
-2
namespace_test.go
pkg/kubectl/namespace_test.go
+5
-5
No files found.
pkg/kubectl/namespace.go
View file @
d2bd6a7f
...
@@ -19,8 +19,8 @@ package kubectl
...
@@ -19,8 +19,8 @@ package kubectl
import
(
import
(
"fmt"
"fmt"
"k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/kubernetes/pkg/api"
)
)
// NamespaceGeneratorV1 supports stable generation of a namespace
// NamespaceGeneratorV1 supports stable generation of a namespace
...
@@ -65,7 +65,7 @@ func (g *NamespaceGeneratorV1) StructuredGenerate() (runtime.Object, error) {
...
@@ -65,7 +65,7 @@ func (g *NamespaceGeneratorV1) StructuredGenerate() (runtime.Object, error) {
if
err
:=
g
.
validate
();
err
!=
nil
{
if
err
:=
g
.
validate
();
err
!=
nil
{
return
nil
,
err
return
nil
,
err
}
}
namespace
:=
&
api
.
Namespace
{}
namespace
:=
&
v1
.
Namespace
{}
namespace
.
Name
=
g
.
Name
namespace
.
Name
=
g
.
Name
return
namespace
,
nil
return
namespace
,
nil
}
}
...
...
pkg/kubectl/namespace_test.go
View file @
d2bd6a7f
...
@@ -20,14 +20,14 @@ import (
...
@@ -20,14 +20,14 @@ import (
"reflect"
"reflect"
"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/kubernetes/pkg/api"
)
)
func
TestNamespaceGenerate
(
t
*
testing
.
T
)
{
func
TestNamespaceGenerate
(
t
*
testing
.
T
)
{
tests
:=
[]
struct
{
tests
:=
[]
struct
{
params
map
[
string
]
interface
{}
params
map
[
string
]
interface
{}
expected
*
api
.
Namespace
expected
*
v1
.
Namespace
expectErr
bool
expectErr
bool
index
int
index
int
}{
}{
...
@@ -35,7 +35,7 @@ func TestNamespaceGenerate(t *testing.T) {
...
@@ -35,7 +35,7 @@ func TestNamespaceGenerate(t *testing.T) {
params
:
map
[
string
]
interface
{}{
params
:
map
[
string
]
interface
{}{
"name"
:
"foo"
,
"name"
:
"foo"
,
},
},
expected
:
&
api
.
Namespace
{
expected
:
&
v1
.
Namespace
{
ObjectMeta
:
metav1
.
ObjectMeta
{
ObjectMeta
:
metav1
.
ObjectMeta
{
Name
:
"foo"
,
Name
:
"foo"
,
},
},
...
@@ -92,8 +92,8 @@ func TestNamespaceGenerate(t *testing.T) {
...
@@ -92,8 +92,8 @@ func TestNamespaceGenerate(t *testing.T) {
case
!
test
.
expectErr
&&
err
==
nil
:
case
!
test
.
expectErr
&&
err
==
nil
:
// do nothing and drop through
// do nothing and drop through
}
}
if
!
reflect
.
DeepEqual
(
obj
.
(
*
api
.
Namespace
),
test
.
expected
)
{
if
!
reflect
.
DeepEqual
(
obj
.
(
*
v1
.
Namespace
),
test
.
expected
)
{
t
.
Errorf
(
"
\n
expected:
\n
%#v
\n
saw:
\n
%#v"
,
test
.
expected
,
obj
.
(
*
api
.
Namespace
))
t
.
Errorf
(
"
\n
expected:
\n
%#v
\n
saw:
\n
%#v"
,
test
.
expected
,
obj
.
(
*
v1
.
Namespace
))
}
}
}
}
}
}
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