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
84bfda05
Commit
84bfda05
authored
Mar 27, 2015
by
Young
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove cmd arg
related issue "Remove cmd from kubectl/cmd/factory arguments #4470"
parent
8a7a1273
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
11 additions
and
11 deletions
+11
-11
clusterinfo.go
pkg/kubectl/cmd/clusterinfo.go
+1
-1
cmd.go
pkg/kubectl/cmd/cmd.go
+2
-2
create.go
pkg/kubectl/cmd/create.go
+1
-1
delete.go
pkg/kubectl/cmd/delete.go
+1
-1
get.go
pkg/kubectl/cmd/get.go
+2
-2
label.go
pkg/kubectl/cmd/label.go
+1
-1
rollingupdate.go
pkg/kubectl/cmd/rollingupdate.go
+1
-1
stop.go
pkg/kubectl/cmd/stop.go
+1
-1
update.go
pkg/kubectl/cmd/update.go
+1
-1
No files found.
pkg/kubectl/cmd/clusterinfo.go
View file @
84bfda05
...
@@ -56,7 +56,7 @@ func RunClusterInfo(factory *Factory, out io.Writer, cmd *cobra.Command) error {
...
@@ -56,7 +56,7 @@ func RunClusterInfo(factory *Factory, out io.Writer, cmd *cobra.Command) error {
}
}
// TODO use generalized labels once they are implemented (#341)
// TODO use generalized labels once they are implemented (#341)
b
:=
resource
.
NewBuilder
(
mapper
,
typer
,
factory
.
ClientMapperForCommand
(
cmd
))
.
b
:=
resource
.
NewBuilder
(
mapper
,
typer
,
factory
.
ClientMapperForCommand
())
.
NamespaceParam
(
cmdNamespace
)
.
DefaultNamespace
()
.
NamespaceParam
(
cmdNamespace
)
.
DefaultNamespace
()
.
SelectorParam
(
"kubernetes.io/cluster-service=true"
)
.
SelectorParam
(
"kubernetes.io/cluster-service=true"
)
.
ResourceTypeOrNameArgs
(
false
,
[]
string
{
"services"
}
...
)
.
ResourceTypeOrNameArgs
(
false
,
[]
string
{
"services"
}
...
)
.
...
...
pkg/kubectl/cmd/cmd.go
View file @
84bfda05
...
@@ -320,8 +320,8 @@ func (f *Factory) PrinterForMapping(cmd *cobra.Command, mapping *meta.RESTMappin
...
@@ -320,8 +320,8 @@ func (f *Factory) PrinterForMapping(cmd *cobra.Command, mapping *meta.RESTMappin
return
printer
,
nil
return
printer
,
nil
}
}
// ClientMapperForCommand returns a ClientMapper for the
given command and
factory.
// ClientMapperForCommand returns a ClientMapper for the factory.
func
(
f
*
Factory
)
ClientMapperForCommand
(
cmd
*
cobra
.
Command
)
resource
.
ClientMapper
{
func
(
f
*
Factory
)
ClientMapperForCommand
()
resource
.
ClientMapper
{
return
resource
.
ClientMapperFunc
(
func
(
mapping
*
meta
.
RESTMapping
)
(
resource
.
RESTClient
,
error
)
{
return
resource
.
ClientMapperFunc
(
func
(
mapping
*
meta
.
RESTMapping
)
(
resource
.
RESTClient
,
error
)
{
return
f
.
RESTClient
(
mapping
)
return
f
.
RESTClient
(
mapping
)
})
})
...
...
pkg/kubectl/cmd/create.go
View file @
84bfda05
...
@@ -73,7 +73,7 @@ func RunCreate(f *Factory, out io.Writer, cmd *cobra.Command, filenames util.Str
...
@@ -73,7 +73,7 @@ func RunCreate(f *Factory, out io.Writer, cmd *cobra.Command, filenames util.Str
}
}
mapper
,
typer
:=
f
.
Object
()
mapper
,
typer
:=
f
.
Object
()
r
:=
resource
.
NewBuilder
(
mapper
,
typer
,
f
.
ClientMapperForCommand
(
cmd
))
.
r
:=
resource
.
NewBuilder
(
mapper
,
typer
,
f
.
ClientMapperForCommand
())
.
ContinueOnError
()
.
ContinueOnError
()
.
NamespaceParam
(
cmdNamespace
)
.
RequireNamespace
()
.
NamespaceParam
(
cmdNamespace
)
.
RequireNamespace
()
.
FilenameParam
(
filenames
...
)
.
FilenameParam
(
filenames
...
)
.
...
...
pkg/kubectl/cmd/delete.go
View file @
84bfda05
...
@@ -79,7 +79,7 @@ func RunDelete(f *Factory, out io.Writer, cmd *cobra.Command, args []string, fil
...
@@ -79,7 +79,7 @@ func RunDelete(f *Factory, out io.Writer, cmd *cobra.Command, args []string, fil
return
err
return
err
}
}
mapper
,
typer
:=
f
.
Object
()
mapper
,
typer
:=
f
.
Object
()
r
:=
resource
.
NewBuilder
(
mapper
,
typer
,
f
.
ClientMapperForCommand
(
cmd
))
.
r
:=
resource
.
NewBuilder
(
mapper
,
typer
,
f
.
ClientMapperForCommand
())
.
ContinueOnError
()
.
ContinueOnError
()
.
NamespaceParam
(
cmdNamespace
)
.
DefaultNamespace
()
.
NamespaceParam
(
cmdNamespace
)
.
DefaultNamespace
()
.
FilenameParam
(
filenames
...
)
.
FilenameParam
(
filenames
...
)
.
...
...
pkg/kubectl/cmd/get.go
View file @
84bfda05
...
@@ -91,7 +91,7 @@ func RunGet(f *Factory, out io.Writer, cmd *cobra.Command, args []string) error
...
@@ -91,7 +91,7 @@ func RunGet(f *Factory, out io.Writer, cmd *cobra.Command, args []string) error
// handle watch separately since we cannot watch multiple resource types
// handle watch separately since we cannot watch multiple resource types
isWatch
,
isWatchOnly
:=
util
.
GetFlagBool
(
cmd
,
"watch"
),
util
.
GetFlagBool
(
cmd
,
"watch-only"
)
isWatch
,
isWatchOnly
:=
util
.
GetFlagBool
(
cmd
,
"watch"
),
util
.
GetFlagBool
(
cmd
,
"watch-only"
)
if
isWatch
||
isWatchOnly
{
if
isWatch
||
isWatchOnly
{
r
:=
resource
.
NewBuilder
(
mapper
,
typer
,
f
.
ClientMapperForCommand
(
cmd
))
.
r
:=
resource
.
NewBuilder
(
mapper
,
typer
,
f
.
ClientMapperForCommand
())
.
NamespaceParam
(
cmdNamespace
)
.
DefaultNamespace
()
.
NamespaceParam
(
cmdNamespace
)
.
DefaultNamespace
()
.
SelectorParam
(
selector
)
.
SelectorParam
(
selector
)
.
ResourceTypeOrNameArgs
(
true
,
args
...
)
.
ResourceTypeOrNameArgs
(
true
,
args
...
)
.
...
@@ -140,7 +140,7 @@ func RunGet(f *Factory, out io.Writer, cmd *cobra.Command, args []string) error
...
@@ -140,7 +140,7 @@ func RunGet(f *Factory, out io.Writer, cmd *cobra.Command, args []string) error
return
nil
return
nil
}
}
b
:=
resource
.
NewBuilder
(
mapper
,
typer
,
f
.
ClientMapperForCommand
(
cmd
))
.
b
:=
resource
.
NewBuilder
(
mapper
,
typer
,
f
.
ClientMapperForCommand
())
.
NamespaceParam
(
cmdNamespace
)
.
DefaultNamespace
()
.
NamespaceParam
(
cmdNamespace
)
.
DefaultNamespace
()
.
SelectorParam
(
selector
)
.
SelectorParam
(
selector
)
.
ResourceTypeOrNameArgs
(
true
,
args
...
)
.
ResourceTypeOrNameArgs
(
true
,
args
...
)
.
...
...
pkg/kubectl/cmd/label.go
View file @
84bfda05
...
@@ -189,7 +189,7 @@ func RunLabel(f *Factory, out io.Writer, cmd *cobra.Command, args []string) erro
...
@@ -189,7 +189,7 @@ func RunLabel(f *Factory, out io.Writer, cmd *cobra.Command, args []string) erro
}
}
mapper
,
typer
:=
f
.
Object
()
mapper
,
typer
:=
f
.
Object
()
b
:=
resource
.
NewBuilder
(
mapper
,
typer
,
f
.
ClientMapperForCommand
(
cmd
))
.
b
:=
resource
.
NewBuilder
(
mapper
,
typer
,
f
.
ClientMapperForCommand
())
.
ContinueOnError
()
.
ContinueOnError
()
.
NamespaceParam
(
cmdNamespace
)
.
DefaultNamespace
()
.
NamespaceParam
(
cmdNamespace
)
.
DefaultNamespace
()
.
SelectorParam
(
selector
)
.
SelectorParam
(
selector
)
.
...
...
pkg/kubectl/cmd/rollingupdate.go
View file @
84bfda05
...
@@ -81,7 +81,7 @@ func RunRollingUpdate(f *Factory, out io.Writer, cmd *cobra.Command, args []stri
...
@@ -81,7 +81,7 @@ func RunRollingUpdate(f *Factory, out io.Writer, cmd *cobra.Command, args []stri
mapper
,
typer
:=
f
.
Object
()
mapper
,
typer
:=
f
.
Object
()
// TODO: use resource.Builder instead
// TODO: use resource.Builder instead
obj
,
err
:=
resource
.
NewBuilder
(
mapper
,
typer
,
f
.
ClientMapperForCommand
(
cmd
))
.
obj
,
err
:=
resource
.
NewBuilder
(
mapper
,
typer
,
f
.
ClientMapperForCommand
())
.
NamespaceParam
(
cmdNamespace
)
.
RequireNamespace
()
.
NamespaceParam
(
cmdNamespace
)
.
RequireNamespace
()
.
FilenameParam
(
filename
)
.
FilenameParam
(
filename
)
.
Do
()
.
Do
()
.
...
...
pkg/kubectl/cmd/stop.go
View file @
84bfda05
...
@@ -57,7 +57,7 @@ func (f *Factory) NewCmdStop(out io.Writer) *cobra.Command {
...
@@ -57,7 +57,7 @@ func (f *Factory) NewCmdStop(out io.Writer) *cobra.Command {
cmdNamespace
,
err
:=
f
.
DefaultNamespace
()
cmdNamespace
,
err
:=
f
.
DefaultNamespace
()
cmdutil
.
CheckErr
(
err
)
cmdutil
.
CheckErr
(
err
)
mapper
,
typer
:=
f
.
Object
()
mapper
,
typer
:=
f
.
Object
()
r
:=
resource
.
NewBuilder
(
mapper
,
typer
,
f
.
ClientMapperForCommand
(
cmd
))
.
r
:=
resource
.
NewBuilder
(
mapper
,
typer
,
f
.
ClientMapperForCommand
())
.
ContinueOnError
()
.
ContinueOnError
()
.
NamespaceParam
(
cmdNamespace
)
.
RequireNamespace
()
.
NamespaceParam
(
cmdNamespace
)
.
RequireNamespace
()
.
ResourceTypeOrNameArgs
(
false
,
args
...
)
.
ResourceTypeOrNameArgs
(
false
,
args
...
)
.
...
...
pkg/kubectl/cmd/update.go
View file @
84bfda05
...
@@ -87,7 +87,7 @@ func RunUpdate(f *Factory, out io.Writer, cmd *cobra.Command, args []string, fil
...
@@ -87,7 +87,7 @@ func RunUpdate(f *Factory, out io.Writer, cmd *cobra.Command, args []string, fil
}
}
mapper
,
typer
:=
f
.
Object
()
mapper
,
typer
:=
f
.
Object
()
r
:=
resource
.
NewBuilder
(
mapper
,
typer
,
f
.
ClientMapperForCommand
(
cmd
))
.
r
:=
resource
.
NewBuilder
(
mapper
,
typer
,
f
.
ClientMapperForCommand
())
.
ContinueOnError
()
.
ContinueOnError
()
.
NamespaceParam
(
cmdNamespace
)
.
RequireNamespace
()
.
NamespaceParam
(
cmdNamespace
)
.
RequireNamespace
()
.
FilenameParam
(
filenames
...
)
.
FilenameParam
(
filenames
...
)
.
...
...
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