Skip to content

K
k3s
Unverified Commit 40d8a4bf authored by Michal Fojtik's avatar Michal Fojtik
Browse files
Options

Fix getting logs from daemonset

parent 44ffcdd9
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 0 deletions
pkg/kubectl/cmd/util/factory_object_mapping.go
View file @ 40d8a4bf
......@@ -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
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment