github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-10-22 15:09:39 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #20981 from madhusudancs/labelselector-error-string-fix

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot
2016-02-14 03:14:46 -08:00
parent b0d8f361ab 525d7a7732
commit ee33ed2cf5
5 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -263,7 +263,7 @@ func NewFactory(optionalClientConfig clientcmd.ClientConfig) *Factory {
case *extensions.Deployment:
selector, err := unversioned.LabelSelectorAsSelector(t.Spec.Selector)
if err != nil {
return "", fmt.Errorf("failed to convert label selector to selector: %v", err)
return "", fmt.Errorf("invalid label selector: %v", err)
}
return selector.String(), nil
case *extensions.ReplicaSet:
@@ -505,13 +505,13 @@ func NewFactory(optionalClientConfig clientcmd.ClientConfig) *Factory {
case *extensions.Deployment:
selector, err := unversioned.LabelSelectorAsSelector(t.Spec.Selector)
if err != nil {
return nil, fmt.Errorf("failed to convert label selector to selector: %v", err)
return nil, fmt.Errorf("invalid label selector: %v", err)
}
return GetFirstPod(client, t.Namespace, selector)
case *extensions.Job:
selector, err := unversioned.LabelSelectorAsSelector(t.Spec.Selector)
if err != nil {
return nil, fmt.Errorf("failed to convert label selector to selector: %v", err)
return nil, fmt.Errorf("invalid label selector: %v", err)
}
return GetFirstPod(client, t.Namespace, selector)
case *api.Pod: