github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

expose: Avoid selector resolution if a selector is not needed

Browse Source
This commit is contained in:
kargakis
2015-09-09 20:55:56 +02:00
parent d3b1e468e1
commit c9268e1faf
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/kubectl/cmd/expose.go
View File

@@ -129,14 +129,18 @@ func RunExpose(f *cmdutil.Factory, out io.Writer, cmd *cobra.Command, args []str
names := generator.ParamNames() names := generator.ParamNames()
params := kubectl.MakeParams(cmd, names) params := kubectl.MakeParams(cmd, names)
params["default-name"] = info.Name params["default-name"] = info.Name
if s, found := params["selector"]; !found || kubectl.IsZero(s) || cmdutil.GetFlagInt(cmd, "port") < 1 {
if kubectl.IsZero(s) { // For objects that need a pod selector, derive it from the exposed object in case a user
s, err := f.PodSelectorForObject(inputObject) // didn't explicitly specify one via --selector
if err != nil { if s, found := params["selector"]; found && kubectl.IsZero(s) {
return cmdutil.UsageError(cmd, fmt.Sprintf("couldn't find selectors via --selector flag or introspection: %s", err)) s, err := f.PodSelectorForObject(inputObject)
} if err != nil {
params["selector"] = s return cmdutil.UsageError(cmd, fmt.Sprintf("couldn't find selectors via --selector flag or introspection: %s", err))
} }
params["selector"] = s
}
if cmdutil.GetFlagInt(cmd, "port") < 1 {
noPorts := true noPorts := true
for _, param := range names { for _, param := range names {
if param.Name == "port" { if param.Name == "port" {