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
a456b4c4
Commit
a456b4c4
authored
Oct 19, 2015
by
feihujiang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove useless codes about Minion kind
parent
56093b77
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
2 additions
and
14 deletions
+2
-14
kubectl
contrib/completions/bash/kubectl
+0
-1
install.go
pkg/api/install/install.go
+0
-3
nodecontroller_test.go
pkg/controller/node/nodecontroller_test.go
+1
-1
describe.go
pkg/kubectl/describe.go
+0
-1
etcd.go
pkg/registry/pod/etcd/etcd.go
+1
-1
etcd_test.go
pkg/registry/pod/etcd/etcd_test.go
+0
-7
No files found.
contrib/completions/bash/kubectl
View file @
a456b4c4
...
...
@@ -331,7 +331,6 @@ _kubectl_describe()
must_have_one_flag
=()
must_have_one_noun
=()
must_have_one_noun+
=(
"limitrange"
)
must_have_one_noun+
=(
"minion"
)
must_have_one_noun+
=(
"namespace"
)
must_have_one_noun+
=(
"node"
)
must_have_one_noun+
=(
"persistentvolume"
)
...
...
pkg/api/install/install.go
View file @
a456b4c4
...
...
@@ -70,11 +70,8 @@ func init() {
// the list of kinds that are scoped at the root of the api hierarchy
// if a kind is not enumerated here, it is assumed to have a namespace scope
// the list of kinds that are scoped at the root of the api hierarchy
// if a kind is not enumerated here, it is assumed to have a namespace scope
rootScoped
:=
sets
.
NewString
(
"Node"
,
"Minion"
,
"Namespace"
,
"PersistentVolume"
,
"ComponentStatus"
,
...
...
pkg/controller/node/nodecontroller_test.go
View file @
a456b4c4
...
...
@@ -75,7 +75,7 @@ func (m *FakeNodeHandler) Create(node *api.Node) (*api.Node, error) {
}()
for
_
,
n
:=
range
m
.
Existing
{
if
n
.
Name
==
node
.
Name
{
return
nil
,
apierrors
.
NewAlreadyExists
(
"
Minion
"
,
node
.
Name
)
return
nil
,
apierrors
.
NewAlreadyExists
(
"
Node
"
,
node
.
Name
)
}
}
if
m
.
CreateHook
==
nil
||
m
.
CreateHook
(
m
,
node
)
{
...
...
pkg/kubectl/describe.go
View file @
a456b4c4
...
...
@@ -73,7 +73,6 @@ func describerMap(c *client.Client) map[string]Describer {
"Secret"
:
&
SecretDescriber
{
c
},
"Service"
:
&
ServiceDescriber
{
c
},
"ServiceAccount"
:
&
ServiceAccountDescriber
{
c
},
"Minion"
:
&
NodeDescriber
{
c
},
"Node"
:
&
NodeDescriber
{
c
},
"LimitRange"
:
&
LimitRangeDescriber
{
c
},
"ResourceQuota"
:
&
ResourceQuotaDescriber
{
c
},
...
...
pkg/registry/pod/etcd/etcd.go
View file @
a456b4c4
...
...
@@ -142,7 +142,7 @@ var _ = rest.Creater(&BindingREST{})
func
(
r
*
BindingREST
)
Create
(
ctx
api
.
Context
,
obj
runtime
.
Object
)
(
out
runtime
.
Object
,
err
error
)
{
binding
:=
obj
.
(
*
api
.
Binding
)
// TODO: move me to a binding strategy
if
len
(
binding
.
Target
.
Kind
)
!=
0
&&
(
binding
.
Target
.
Kind
!=
"Node"
&&
binding
.
Target
.
Kind
!=
"Minion"
)
{
if
len
(
binding
.
Target
.
Kind
)
!=
0
&&
binding
.
Target
.
Kind
!=
"Node"
{
return
nil
,
errors
.
NewInvalid
(
"binding"
,
binding
.
Name
,
fielderrors
.
ValidationErrorList
{
fielderrors
.
NewFieldInvalid
(
"to.kind"
,
binding
.
Target
.
Kind
,
"must be empty, 'Node', or 'Minion'"
)})
}
if
len
(
binding
.
Target
.
Name
)
==
0
{
...
...
pkg/registry/pod/etcd/etcd_test.go
View file @
a456b4c4
...
...
@@ -541,13 +541,6 @@ func TestEtcdCreateBinding(t *testing.T) {
},
errOK
:
func
(
err
error
)
bool
{
return
err
==
nil
},
},
"kindMinion"
:
{
binding
:
api
.
Binding
{
ObjectMeta
:
api
.
ObjectMeta
{
Namespace
:
api
.
NamespaceDefault
,
Name
:
"foo"
},
Target
:
api
.
ObjectReference
{
Name
:
"machine4"
,
Kind
:
"Minion"
},
},
errOK
:
func
(
err
error
)
bool
{
return
err
==
nil
},
},
}
for
k
,
test
:=
range
testCases
{
storage
,
bindingStorage
,
_
,
fakeClient
:=
newStorage
(
t
)
...
...
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