github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-23 03:41:45 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #114863 from danlenar/master

Browse Source 
Use label selector for filtering out resources when pruning for kubectl diff.
This commit is contained in:
Kubernetes Prow Robot 2023-01-09 22:13:25 -08:00 committed by GitHub
commit 3742d14998
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
staging/src/k8s.io/kubectl/pkg/cmd/diff/diff.go
View File

@ -659,7 +659,7 @@ func (o *DiffOptions) Complete(f cmdutil.Factory, cmd *cobra.Command, args []str
if err != nil { if err != nil {
return err return err
} }
o.pruner = newPruner(o.DynamicClient, mapper, resources) o.pruner = newPruner(o.DynamicClient, mapper, resources, o.Selector)
} }
o.Builder = f.NewBuilder() o.Builder = f.NewBuilder()

3
staging/src/k8s.io/kubectl/pkg/cmd/diff/prune.go
View File

@ -40,13 +40,14 @@ type pruner struct {
resources []prune.Resource resources []prune.Resource
} }
func newPruner(dc dynamic.Interface, m meta.RESTMapper, r []prune.Resource) *pruner { func newPruner(dc dynamic.Interface, m meta.RESTMapper, r []prune.Resource, selector string) *pruner {
return &pruner{ return &pruner{
visitedUids: sets.NewString(), visitedUids: sets.NewString(),
visitedNamespaces: sets.NewString(), visitedNamespaces: sets.NewString(),
dynamicClient: dc, dynamicClient: dc,
mapper: m, mapper: m,
resources: r, resources: r,
labelSelector: selector,
} }
} }