github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-08-02 16:29:21 +00:00
Code Issues Projects Releases Wiki Activity

Fix getting services in expose cmd

Browse Source
This commit is contained in:
kargakis 2015-04-28 14:45:05 +03:00
parent 7a122a42d4
commit e6ee32a6c6
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/kubectl/cmd/util/factory.go
View File

@ -150,23 +150,23 @@ func NewFactory(optionalClientConfig clientcmd.ClientConfig) *Factory {
} }
return kubectl.MakeLabels(rc.Spec.Selector), nil return kubectl.MakeLabels(rc.Spec.Selector), nil
case "Pod": case "Pod":
rc, err := client.Pods(namespace).Get(name) pod, err := client.Pods(namespace).Get(name)
if err != nil { if err != nil {
return "", err return "", err
} }
if len(rc.Labels) == 0 { if len(pod.Labels) == 0 {
return "", fmt.Errorf("the pod has no labels and cannot be exposed") return "", fmt.Errorf("the pod has no labels and cannot be exposed")
} }
return kubectl.MakeLabels(rc.Labels), nil return kubectl.MakeLabels(pod.Labels), nil
case "Service": case "Service":
rc, err := client.ReplicationControllers(namespace).Get(name) svc, err := client.Services(namespace).Get(name)
if err != nil { if err != nil {
return "", err return "", err
} }
if rc.Spec.Selector == nil { if svc.Spec.Selector == nil {
return "", fmt.Errorf("the service has no pod selector set") return "", fmt.Errorf("the service has no pod selector set")
} }
return kubectl.MakeLabels(rc.Spec.Selector), nil return kubectl.MakeLabels(svc.Spec.Selector), nil
default: default:
return "", fmt.Errorf("it is not possible to get a pod selector from %s", mapping.Kind) return "", fmt.Errorf("it is not possible to get a pod selector from %s", mapping.Kind)
} }