Skip to content

K
k3s
Unverified Commit 4504deba authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

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 ```
parents f79ab9c1 40d8a4bf
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 0 deletions
pkg/kubectl/cmd/util/factory_object_mapping.go
View file @ 4504deba
...@@ -248,6 +248,13 @@ func (f *ring1Factory) LogsForObject(object, options runtime.Object, timeout tim ...@@ -248,6 +248,13 @@ func (f *ring1Factory) LogsForObject(object, options runtime.Object, timeout tim
return nil, fmt.Errorf("invalid label selector: %v", err) 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: case *batch.Job:
namespace = t.Namespace namespace = t.Namespace
selector, err = metav1.LabelSelectorAsSelector(t.Spec.Selector) selector, err = metav1.LabelSelectorAsSelector(t.Spec.Selector)
...@@ -345,6 +352,12 @@ func (f *ring1Factory) AttachablePodForObject(object runtime.Object, timeout tim ...@@ -345,6 +352,12 @@ func (f *ring1Factory) AttachablePodForObject(object runtime.Object, timeout tim
if err != nil { if err != nil {
return nil, fmt.Errorf("invalid label selector: %v", err) 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: case *extensions.Deployment:
namespace = t.Namespace 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