mirror of https://github.com/k3s-io/k3s
Merge pull request #63966 from mfojtik/cli-01-fix-flatten
Automatic merge from submit-queue (batch tested with PRs 63871, 63927, 63966, 63957, 63844). 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>. kubectl: fix Flatten() when used without Latest() **What this PR does / why we need it**: If `Flatten()` is used on resource builder the list is not flattened unless the `Latest()` is used in the chain. We should support `Flatten()` without Latest() as well. For example: ``` $ oc apply -l foo=bar -f /tmp/list.yaml ``` will fail with: ``` F0517 13:45:07.831195 31795 helpers.go:119] error: object does not implement the Object interfaces ``` **Release note**: ```release-note NONE ```pull/8/head
commit
221909540d
|
@ -1022,12 +1022,12 @@ func (b *Builder) visitByPaths() *Result {
|
|||
visitors = VisitorList(b.paths)
|
||||
}
|
||||
|
||||
if b.flatten {
|
||||
visitors = NewFlattenListVisitor(visitors, b.objectTyper, b.mapper)
|
||||
}
|
||||
|
||||
// only items from disk can be refetched
|
||||
if b.latest {
|
||||
// must flatten lists prior to fetching
|
||||
if b.flatten {
|
||||
visitors = NewFlattenListVisitor(visitors, b.objectTyper, b.mapper)
|
||||
}
|
||||
// must set namespace prior to fetching
|
||||
if b.defaultNamespace {
|
||||
visitors = NewDecoratedVisitor(visitors, SetNamespace(b.namespace))
|
||||
|
|
Loading…
Reference in New Issue