github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-20 02:11:09 +00:00
Code Issues Projects Releases Wiki Activity

cleanup: replace deprecated sets.String

Browse Source 
Replace with generics, including using the more-accurate type
types.UID for visitedUids.
This commit is contained in:
Justin SB 2023-03-01 09:05:59 -05:00
parent 9ef145d3a7
commit 0b5fa19342
3 changed files with 16 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
staging/src/k8s.io/kubectl/pkg/cmd/apply/apply.go
View File

@ -121,8 +121,8 @@ type ApplyOptions struct {
// Stores visited objects/namespaces for later use
// calculating the set of objects to prune.
VisitedUids sets.String
VisitedNamespaces sets.String
VisitedUids sets.Set[types.UID]
VisitedNamespaces sets.Set[string]
// Function run after the objects are generated and
// stored in the "objects" field, but before the
@ -352,8 +352,8 @@ func (flags *ApplyFlags) ToOptions(f cmdutil.Factory, cmd *cobra.Command, baseNa
objects: []*resource.Info{},
objectsCached: false,
VisitedUids: sets.NewString(),
VisitedNamespaces: sets.NewString(),
VisitedUids: sets.New[types.UID](),
VisitedNamespaces: sets.New[string](),
ApplySet: applySet,
}
@ -981,7 +981,7 @@ func (o *ApplyOptions) MarkObjectVisited(info *resource.Info) error {
if err != nil {
return err
}
o.VisitedUids.Insert(string(metadata.GetUID()))
o.VisitedUids.Insert(metadata.GetUID())
return nil
}

7
staging/src/k8s.io/kubectl/pkg/cmd/apply/prune.go
View File

@ -24,6 +24,7 @@ import (
corev1 "k8s.io/api/core/v1"
"k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/cli-runtime/pkg/printers"
"k8s.io/client-go/dynamic"
@ -35,8 +36,8 @@ type pruner struct {
mapper meta.RESTMapper
dynamicClient dynamic.Interface
visitedUids sets.String
visitedNamespaces sets.String
visitedUids sets.Set[types.UID]
visitedNamespaces sets.Set[string]
labelSelector string
fieldSelector string
@ -119,7 +120,7 @@ func (p *pruner) prune(namespace string, mapping *meta.RESTMapping) error {
continue
}
uid := metadata.GetUID()
if p.visitedUids.Has(string(uid)) {
if p.visitedUids.Has(uid) {
continue
}
name := metadata.GetName()

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

@ -24,6 +24,7 @@ import (
"k8s.io/apimachinery/pkg/api/meta"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/runtime"
"k8s.io/apimachinery/pkg/types"
"k8s.io/apimachinery/pkg/util/sets"
"k8s.io/cli-runtime/pkg/resource"
"k8s.io/client-go/dynamic"
@ -34,16 +35,16 @@ type pruner struct {
mapper meta.RESTMapper
dynamicClient dynamic.Interface
visitedUids sets.String
visitedNamespaces sets.String
visitedUids sets.Set[types.UID]
visitedNamespaces sets.Set[string]
labelSelector string
resources []prune.Resource
}
func newPruner(dc dynamic.Interface, m meta.RESTMapper, r []prune.Resource, selector string) *pruner {
return &pruner{
visitedUids: sets.NewString(),
visitedNamespaces: sets.NewString(),
visitedUids: sets.New[types.UID](),
visitedNamespaces: sets.New[string](),
dynamicClient: dc,
mapper: m,
resources: r,
@ -104,7 +105,7 @@ func (p *pruner) prune(namespace string, mapping *meta.RESTMapping) ([]runtime.O
continue
}
uid := metadata.GetUID()
if p.visitedUids.Has(string(uid)) {
if p.visitedUids.Has(uid) {
continue
}
@ -123,5 +124,5 @@ func (p *pruner) MarkVisited(info *resource.Info) {
if err != nil {
return
}
p.visitedUids.Insert(string(metadata.GetUID()))
p.visitedUids.Insert(metadata.GetUID())
}