github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #56045 from mfojtik/fix-daemonset-logs 

Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>.

Fix getting logs from daemonset

This PR fixes getting logs from DaemonSets. Currently:

```
→ kubectl logs ds/ds-test
error: cannot get the logs from apps/__internal, Kind=DaemonSet
```

```release-note
NONE
```
pull/8/head
Kubernetes Submit Queue 2018-04-06 08:53:20 -07:00 committed by GitHub
parent f79ab9c1ee 40d8a4bf60
commit 4504deba8a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/kubectl/cmd/util/factory_object_mapping.go
View File

@ -248,6 +248,13 @@ func (f *ring1Factory) LogsForObject(object, options runtime.Object, timeout tim
return nil, fmt.Errorf("invalid label selector: %v", err)
}
case *extensions.DaemonSet:
namespace = t.Namespace
selector, err = metav1.LabelSelectorAsSelector(t.Spec.Selector)
if err != nil {
return nil, fmt.Errorf("invalid label selector: %v", err)
}
case *batch.Job:
namespace = t.Namespace
selector, err = metav1.LabelSelectorAsSelector(t.Spec.Selector)
@ -345,6 +352,12 @@ func (f *ring1Factory) AttachablePodForObject(object runtime.Object, timeout tim
if err != nil {
return nil, fmt.Errorf("invalid label selector: %v", err)
}
case *extensions.DaemonSet:
namespace = t.Namespace
selector, err = metav1.LabelSelectorAsSelector(t.Spec.Selector)
if err != nil {
return nil, fmt.Errorf("invalid label selector: %v", err)
}
case *extensions.Deployment:
namespace = t.Namespace