Fixing all deprecated use of sets.String (#2915)

* Fixing all deprecated use of sets.String

* review comments

* Fixing deprecated use of sets.String
This commit is contained in:
navin 2024-01-08 20:51:18 +05:30 committed by GitHub
parent a65a9e2510
commit de3e9cc204
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
39 changed files with 170 additions and 170 deletions

View File

@ -338,14 +338,14 @@ func (r *reconcilerImpl) updateStatus(ctx context.Context, logger *zap.SugaredLo
// updateFinalizersFiltered will update the Finalizers of the resource. // updateFinalizersFiltered will update the Finalizers of the resource.
// TODO: this method could be generic and sync all finalizers. For now it only // TODO: this method could be generic and sync all finalizers. For now it only
// updates defaultFinalizerName or its override. // updates defaultFinalizerName or its override.
func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource *v1.CustomResourceDefinition, desiredFinalizers sets.String) (*v1.CustomResourceDefinition, error) { func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource *v1.CustomResourceDefinition, desiredFinalizers sets.Set[string]) (*v1.CustomResourceDefinition, error) {
// Don't modify the informers copy. // Don't modify the informers copy.
existing := resource.DeepCopy() existing := resource.DeepCopy()
var finalizers []string var finalizers []string
// If there's nothing to update, just return. // If there's nothing to update, just return.
existingFinalizers := sets.NewString(existing.Finalizers...) existingFinalizers := sets.New[string](existing.Finalizers...)
if desiredFinalizers.Has(r.finalizerName) { if desiredFinalizers.Has(r.finalizerName) {
if existingFinalizers.Has(r.finalizerName) { if existingFinalizers.Has(r.finalizerName) {
@ -361,7 +361,7 @@ func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource
} }
// Remove the finalizer. // Remove the finalizer.
existingFinalizers.Delete(r.finalizerName) existingFinalizers.Delete(r.finalizerName)
finalizers = existingFinalizers.List() finalizers = sets.List(existingFinalizers)
} }
mergePatch := map[string]interface{}{ mergePatch := map[string]interface{}{
@ -395,7 +395,7 @@ func (r *reconcilerImpl) setFinalizerIfFinalizer(ctx context.Context, resource *
return resource, nil return resource, nil
} }
finalizers := sets.NewString(resource.Finalizers...) finalizers := sets.New[string](resource.Finalizers...)
// If this resource is not being deleted, mark the finalizer. // If this resource is not being deleted, mark the finalizer.
if resource.GetDeletionTimestamp().IsZero() { if resource.GetDeletionTimestamp().IsZero() {
@ -414,7 +414,7 @@ func (r *reconcilerImpl) clearFinalizer(ctx context.Context, resource *v1.Custom
return resource, nil return resource, nil
} }
finalizers := sets.NewString(resource.Finalizers...) finalizers := sets.New[string](resource.Finalizers...)
if reconcileEvent != nil { if reconcileEvent != nil {
var event *reconciler.ReconcilerEvent var event *reconciler.ReconcilerEvent

View File

@ -338,14 +338,14 @@ func (r *reconcilerImpl) updateStatus(ctx context.Context, logger *zap.SugaredLo
// updateFinalizersFiltered will update the Finalizers of the resource. // updateFinalizersFiltered will update the Finalizers of the resource.
// TODO: this method could be generic and sync all finalizers. For now it only // TODO: this method could be generic and sync all finalizers. For now it only
// updates defaultFinalizerName or its override. // updates defaultFinalizerName or its override.
func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource *v1beta1.CustomResourceDefinition, desiredFinalizers sets.String) (*v1beta1.CustomResourceDefinition, error) { func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource *v1beta1.CustomResourceDefinition, desiredFinalizers sets.Set[string]) (*v1beta1.CustomResourceDefinition, error) {
// Don't modify the informers copy. // Don't modify the informers copy.
existing := resource.DeepCopy() existing := resource.DeepCopy()
var finalizers []string var finalizers []string
// If there's nothing to update, just return. // If there's nothing to update, just return.
existingFinalizers := sets.NewString(existing.Finalizers...) existingFinalizers := sets.New[string](existing.Finalizers...)
if desiredFinalizers.Has(r.finalizerName) { if desiredFinalizers.Has(r.finalizerName) {
if existingFinalizers.Has(r.finalizerName) { if existingFinalizers.Has(r.finalizerName) {
@ -361,7 +361,7 @@ func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource
} }
// Remove the finalizer. // Remove the finalizer.
existingFinalizers.Delete(r.finalizerName) existingFinalizers.Delete(r.finalizerName)
finalizers = existingFinalizers.List() finalizers = sets.List(existingFinalizers)
} }
mergePatch := map[string]interface{}{ mergePatch := map[string]interface{}{
@ -395,7 +395,7 @@ func (r *reconcilerImpl) setFinalizerIfFinalizer(ctx context.Context, resource *
return resource, nil return resource, nil
} }
finalizers := sets.NewString(resource.Finalizers...) finalizers := sets.New[string](resource.Finalizers...)
// If this resource is not being deleted, mark the finalizer. // If this resource is not being deleted, mark the finalizer.
if resource.GetDeletionTimestamp().IsZero() { if resource.GetDeletionTimestamp().IsZero() {
@ -414,7 +414,7 @@ func (r *reconcilerImpl) clearFinalizer(ctx context.Context, resource *v1beta1.C
return resource, nil return resource, nil
} }
finalizers := sets.NewString(resource.Finalizers...) finalizers := sets.New[string](resource.Finalizers...)
if reconcileEvent != nil { if reconcileEvent != nil {
var event *reconciler.ReconcilerEvent var event *reconciler.ReconcilerEvent

View File

@ -271,14 +271,14 @@ func (r *reconcilerImpl) Reconcile(ctx context.Context, key string) error {
// updateFinalizersFiltered will update the Finalizers of the resource. // updateFinalizersFiltered will update the Finalizers of the resource.
// TODO: this method could be generic and sync all finalizers. For now it only // TODO: this method could be generic and sync all finalizers. For now it only
// updates defaultFinalizerName or its override. // updates defaultFinalizerName or its override.
func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource *v1.MutatingWebhookConfiguration, desiredFinalizers sets.String) (*v1.MutatingWebhookConfiguration, error) { func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource *v1.MutatingWebhookConfiguration, desiredFinalizers sets.Set[string]) (*v1.MutatingWebhookConfiguration, error) {
// Don't modify the informers copy. // Don't modify the informers copy.
existing := resource.DeepCopy() existing := resource.DeepCopy()
var finalizers []string var finalizers []string
// If there's nothing to update, just return. // If there's nothing to update, just return.
existingFinalizers := sets.NewString(existing.Finalizers...) existingFinalizers := sets.New[string](existing.Finalizers...)
if desiredFinalizers.Has(r.finalizerName) { if desiredFinalizers.Has(r.finalizerName) {
if existingFinalizers.Has(r.finalizerName) { if existingFinalizers.Has(r.finalizerName) {
@ -294,7 +294,7 @@ func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource
} }
// Remove the finalizer. // Remove the finalizer.
existingFinalizers.Delete(r.finalizerName) existingFinalizers.Delete(r.finalizerName)
finalizers = existingFinalizers.List() finalizers = sets.List(existingFinalizers)
} }
mergePatch := map[string]interface{}{ mergePatch := map[string]interface{}{
@ -328,7 +328,7 @@ func (r *reconcilerImpl) setFinalizerIfFinalizer(ctx context.Context, resource *
return resource, nil return resource, nil
} }
finalizers := sets.NewString(resource.Finalizers...) finalizers := sets.New[string](resource.Finalizers...)
// If this resource is not being deleted, mark the finalizer. // If this resource is not being deleted, mark the finalizer.
if resource.GetDeletionTimestamp().IsZero() { if resource.GetDeletionTimestamp().IsZero() {
@ -347,7 +347,7 @@ func (r *reconcilerImpl) clearFinalizer(ctx context.Context, resource *v1.Mutati
return resource, nil return resource, nil
} }
finalizers := sets.NewString(resource.Finalizers...) finalizers := sets.New[string](resource.Finalizers...)
if reconcileEvent != nil { if reconcileEvent != nil {
var event *reconciler.ReconcilerEvent var event *reconciler.ReconcilerEvent

View File

@ -271,14 +271,14 @@ func (r *reconcilerImpl) Reconcile(ctx context.Context, key string) error {
// updateFinalizersFiltered will update the Finalizers of the resource. // updateFinalizersFiltered will update the Finalizers of the resource.
// TODO: this method could be generic and sync all finalizers. For now it only // TODO: this method could be generic and sync all finalizers. For now it only
// updates defaultFinalizerName or its override. // updates defaultFinalizerName or its override.
func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource *v1.ValidatingWebhookConfiguration, desiredFinalizers sets.String) (*v1.ValidatingWebhookConfiguration, error) { func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource *v1.ValidatingWebhookConfiguration, desiredFinalizers sets.Set[string]) (*v1.ValidatingWebhookConfiguration, error) {
// Don't modify the informers copy. // Don't modify the informers copy.
existing := resource.DeepCopy() existing := resource.DeepCopy()
var finalizers []string var finalizers []string
// If there's nothing to update, just return. // If there's nothing to update, just return.
existingFinalizers := sets.NewString(existing.Finalizers...) existingFinalizers := sets.New[string](existing.Finalizers...)
if desiredFinalizers.Has(r.finalizerName) { if desiredFinalizers.Has(r.finalizerName) {
if existingFinalizers.Has(r.finalizerName) { if existingFinalizers.Has(r.finalizerName) {
@ -294,7 +294,7 @@ func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource
} }
// Remove the finalizer. // Remove the finalizer.
existingFinalizers.Delete(r.finalizerName) existingFinalizers.Delete(r.finalizerName)
finalizers = existingFinalizers.List() finalizers = sets.List(existingFinalizers)
} }
mergePatch := map[string]interface{}{ mergePatch := map[string]interface{}{
@ -328,7 +328,7 @@ func (r *reconcilerImpl) setFinalizerIfFinalizer(ctx context.Context, resource *
return resource, nil return resource, nil
} }
finalizers := sets.NewString(resource.Finalizers...) finalizers := sets.New[string](resource.Finalizers...)
// If this resource is not being deleted, mark the finalizer. // If this resource is not being deleted, mark the finalizer.
if resource.GetDeletionTimestamp().IsZero() { if resource.GetDeletionTimestamp().IsZero() {
@ -347,7 +347,7 @@ func (r *reconcilerImpl) clearFinalizer(ctx context.Context, resource *v1.Valida
return resource, nil return resource, nil
} }
finalizers := sets.NewString(resource.Finalizers...) finalizers := sets.New[string](resource.Finalizers...)
if reconcileEvent != nil { if reconcileEvent != nil {
var event *reconciler.ReconcilerEvent var event *reconciler.ReconcilerEvent

View File

@ -271,14 +271,14 @@ func (r *reconcilerImpl) Reconcile(ctx context.Context, key string) error {
// updateFinalizersFiltered will update the Finalizers of the resource. // updateFinalizersFiltered will update the Finalizers of the resource.
// TODO: this method could be generic and sync all finalizers. For now it only // TODO: this method could be generic and sync all finalizers. For now it only
// updates defaultFinalizerName or its override. // updates defaultFinalizerName or its override.
func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource *v1beta1.MutatingWebhookConfiguration, desiredFinalizers sets.String) (*v1beta1.MutatingWebhookConfiguration, error) { func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource *v1beta1.MutatingWebhookConfiguration, desiredFinalizers sets.Set[string]) (*v1beta1.MutatingWebhookConfiguration, error) {
// Don't modify the informers copy. // Don't modify the informers copy.
existing := resource.DeepCopy() existing := resource.DeepCopy()
var finalizers []string var finalizers []string
// If there's nothing to update, just return. // If there's nothing to update, just return.
existingFinalizers := sets.NewString(existing.Finalizers...) existingFinalizers := sets.New[string](existing.Finalizers...)
if desiredFinalizers.Has(r.finalizerName) { if desiredFinalizers.Has(r.finalizerName) {
if existingFinalizers.Has(r.finalizerName) { if existingFinalizers.Has(r.finalizerName) {
@ -294,7 +294,7 @@ func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource
} }
// Remove the finalizer. // Remove the finalizer.
existingFinalizers.Delete(r.finalizerName) existingFinalizers.Delete(r.finalizerName)
finalizers = existingFinalizers.List() finalizers = sets.List(existingFinalizers)
} }
mergePatch := map[string]interface{}{ mergePatch := map[string]interface{}{
@ -328,7 +328,7 @@ func (r *reconcilerImpl) setFinalizerIfFinalizer(ctx context.Context, resource *
return resource, nil return resource, nil
} }
finalizers := sets.NewString(resource.Finalizers...) finalizers := sets.New[string](resource.Finalizers...)
// If this resource is not being deleted, mark the finalizer. // If this resource is not being deleted, mark the finalizer.
if resource.GetDeletionTimestamp().IsZero() { if resource.GetDeletionTimestamp().IsZero() {
@ -347,7 +347,7 @@ func (r *reconcilerImpl) clearFinalizer(ctx context.Context, resource *v1beta1.M
return resource, nil return resource, nil
} }
finalizers := sets.NewString(resource.Finalizers...) finalizers := sets.New[string](resource.Finalizers...)
if reconcileEvent != nil { if reconcileEvent != nil {
var event *reconciler.ReconcilerEvent var event *reconciler.ReconcilerEvent

View File

@ -271,14 +271,14 @@ func (r *reconcilerImpl) Reconcile(ctx context.Context, key string) error {
// updateFinalizersFiltered will update the Finalizers of the resource. // updateFinalizersFiltered will update the Finalizers of the resource.
// TODO: this method could be generic and sync all finalizers. For now it only // TODO: this method could be generic and sync all finalizers. For now it only
// updates defaultFinalizerName or its override. // updates defaultFinalizerName or its override.
func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource *v1beta1.ValidatingWebhookConfiguration, desiredFinalizers sets.String) (*v1beta1.ValidatingWebhookConfiguration, error) { func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource *v1beta1.ValidatingWebhookConfiguration, desiredFinalizers sets.Set[string]) (*v1beta1.ValidatingWebhookConfiguration, error) {
// Don't modify the informers copy. // Don't modify the informers copy.
existing := resource.DeepCopy() existing := resource.DeepCopy()
var finalizers []string var finalizers []string
// If there's nothing to update, just return. // If there's nothing to update, just return.
existingFinalizers := sets.NewString(existing.Finalizers...) existingFinalizers := sets.New[string](existing.Finalizers...)
if desiredFinalizers.Has(r.finalizerName) { if desiredFinalizers.Has(r.finalizerName) {
if existingFinalizers.Has(r.finalizerName) { if existingFinalizers.Has(r.finalizerName) {
@ -294,7 +294,7 @@ func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource
} }
// Remove the finalizer. // Remove the finalizer.
existingFinalizers.Delete(r.finalizerName) existingFinalizers.Delete(r.finalizerName)
finalizers = existingFinalizers.List() finalizers = sets.List(existingFinalizers)
} }
mergePatch := map[string]interface{}{ mergePatch := map[string]interface{}{
@ -328,7 +328,7 @@ func (r *reconcilerImpl) setFinalizerIfFinalizer(ctx context.Context, resource *
return resource, nil return resource, nil
} }
finalizers := sets.NewString(resource.Finalizers...) finalizers := sets.New[string](resource.Finalizers...)
// If this resource is not being deleted, mark the finalizer. // If this resource is not being deleted, mark the finalizer.
if resource.GetDeletionTimestamp().IsZero() { if resource.GetDeletionTimestamp().IsZero() {
@ -347,7 +347,7 @@ func (r *reconcilerImpl) clearFinalizer(ctx context.Context, resource *v1beta1.V
return resource, nil return resource, nil
} }
finalizers := sets.NewString(resource.Finalizers...) finalizers := sets.New[string](resource.Finalizers...)
if reconcileEvent != nil { if reconcileEvent != nil {
var event *reconciler.ReconcilerEvent var event *reconciler.ReconcilerEvent

View File

@ -338,14 +338,14 @@ func (r *reconcilerImpl) updateStatus(ctx context.Context, logger *zap.SugaredLo
// updateFinalizersFiltered will update the Finalizers of the resource. // updateFinalizersFiltered will update the Finalizers of the resource.
// TODO: this method could be generic and sync all finalizers. For now it only // TODO: this method could be generic and sync all finalizers. For now it only
// updates defaultFinalizerName or its override. // updates defaultFinalizerName or its override.
func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource *v1.Deployment, desiredFinalizers sets.String) (*v1.Deployment, error) { func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource *v1.Deployment, desiredFinalizers sets.Set[string]) (*v1.Deployment, error) {
// Don't modify the informers copy. // Don't modify the informers copy.
existing := resource.DeepCopy() existing := resource.DeepCopy()
var finalizers []string var finalizers []string
// If there's nothing to update, just return. // If there's nothing to update, just return.
existingFinalizers := sets.NewString(existing.Finalizers...) existingFinalizers := sets.New[string](existing.Finalizers...)
if desiredFinalizers.Has(r.finalizerName) { if desiredFinalizers.Has(r.finalizerName) {
if existingFinalizers.Has(r.finalizerName) { if existingFinalizers.Has(r.finalizerName) {
@ -361,7 +361,7 @@ func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource
} }
// Remove the finalizer. // Remove the finalizer.
existingFinalizers.Delete(r.finalizerName) existingFinalizers.Delete(r.finalizerName)
finalizers = existingFinalizers.List() finalizers = sets.List(existingFinalizers)
} }
mergePatch := map[string]interface{}{ mergePatch := map[string]interface{}{
@ -395,7 +395,7 @@ func (r *reconcilerImpl) setFinalizerIfFinalizer(ctx context.Context, resource *
return resource, nil return resource, nil
} }
finalizers := sets.NewString(resource.Finalizers...) finalizers := sets.New[string](resource.Finalizers...)
// If this resource is not being deleted, mark the finalizer. // If this resource is not being deleted, mark the finalizer.
if resource.GetDeletionTimestamp().IsZero() { if resource.GetDeletionTimestamp().IsZero() {
@ -414,7 +414,7 @@ func (r *reconcilerImpl) clearFinalizer(ctx context.Context, resource *v1.Deploy
return resource, nil return resource, nil
} }
finalizers := sets.NewString(resource.Finalizers...) finalizers := sets.New[string](resource.Finalizers...)
if reconcileEvent != nil { if reconcileEvent != nil {
var event *reconciler.ReconcilerEvent var event *reconciler.ReconcilerEvent

View File

@ -338,14 +338,14 @@ func (r *reconcilerImpl) updateStatus(ctx context.Context, logger *zap.SugaredLo
// updateFinalizersFiltered will update the Finalizers of the resource. // updateFinalizersFiltered will update the Finalizers of the resource.
// TODO: this method could be generic and sync all finalizers. For now it only // TODO: this method could be generic and sync all finalizers. For now it only
// updates defaultFinalizerName or its override. // updates defaultFinalizerName or its override.
func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource *v1beta1.Deployment, desiredFinalizers sets.String) (*v1beta1.Deployment, error) { func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource *v1beta1.Deployment, desiredFinalizers sets.Set[string]) (*v1beta1.Deployment, error) {
// Don't modify the informers copy. // Don't modify the informers copy.
existing := resource.DeepCopy() existing := resource.DeepCopy()
var finalizers []string var finalizers []string
// If there's nothing to update, just return. // If there's nothing to update, just return.
existingFinalizers := sets.NewString(existing.Finalizers...) existingFinalizers := sets.New[string](existing.Finalizers...)
if desiredFinalizers.Has(r.finalizerName) { if desiredFinalizers.Has(r.finalizerName) {
if existingFinalizers.Has(r.finalizerName) { if existingFinalizers.Has(r.finalizerName) {
@ -361,7 +361,7 @@ func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource
} }
// Remove the finalizer. // Remove the finalizer.
existingFinalizers.Delete(r.finalizerName) existingFinalizers.Delete(r.finalizerName)
finalizers = existingFinalizers.List() finalizers = sets.List(existingFinalizers)
} }
mergePatch := map[string]interface{}{ mergePatch := map[string]interface{}{
@ -395,7 +395,7 @@ func (r *reconcilerImpl) setFinalizerIfFinalizer(ctx context.Context, resource *
return resource, nil return resource, nil
} }
finalizers := sets.NewString(resource.Finalizers...) finalizers := sets.New[string](resource.Finalizers...)
// If this resource is not being deleted, mark the finalizer. // If this resource is not being deleted, mark the finalizer.
if resource.GetDeletionTimestamp().IsZero() { if resource.GetDeletionTimestamp().IsZero() {
@ -414,7 +414,7 @@ func (r *reconcilerImpl) clearFinalizer(ctx context.Context, resource *v1beta1.D
return resource, nil return resource, nil
} }
finalizers := sets.NewString(resource.Finalizers...) finalizers := sets.New[string](resource.Finalizers...)
if reconcileEvent != nil { if reconcileEvent != nil {
var event *reconciler.ReconcilerEvent var event *reconciler.ReconcilerEvent

View File

@ -338,14 +338,14 @@ func (r *reconcilerImpl) updateStatus(ctx context.Context, logger *zap.SugaredLo
// updateFinalizersFiltered will update the Finalizers of the resource. // updateFinalizersFiltered will update the Finalizers of the resource.
// TODO: this method could be generic and sync all finalizers. For now it only // TODO: this method could be generic and sync all finalizers. For now it only
// updates defaultFinalizerName or its override. // updates defaultFinalizerName or its override.
func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource *v1beta2.Deployment, desiredFinalizers sets.String) (*v1beta2.Deployment, error) { func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource *v1beta2.Deployment, desiredFinalizers sets.Set[string]) (*v1beta2.Deployment, error) {
// Don't modify the informers copy. // Don't modify the informers copy.
existing := resource.DeepCopy() existing := resource.DeepCopy()
var finalizers []string var finalizers []string
// If there's nothing to update, just return. // If there's nothing to update, just return.
existingFinalizers := sets.NewString(existing.Finalizers...) existingFinalizers := sets.New[string](existing.Finalizers...)
if desiredFinalizers.Has(r.finalizerName) { if desiredFinalizers.Has(r.finalizerName) {
if existingFinalizers.Has(r.finalizerName) { if existingFinalizers.Has(r.finalizerName) {
@ -361,7 +361,7 @@ func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource
} }
// Remove the finalizer. // Remove the finalizer.
existingFinalizers.Delete(r.finalizerName) existingFinalizers.Delete(r.finalizerName)
finalizers = existingFinalizers.List() finalizers = sets.List(existingFinalizers)
} }
mergePatch := map[string]interface{}{ mergePatch := map[string]interface{}{
@ -395,7 +395,7 @@ func (r *reconcilerImpl) setFinalizerIfFinalizer(ctx context.Context, resource *
return resource, nil return resource, nil
} }
finalizers := sets.NewString(resource.Finalizers...) finalizers := sets.New[string](resource.Finalizers...)
// If this resource is not being deleted, mark the finalizer. // If this resource is not being deleted, mark the finalizer.
if resource.GetDeletionTimestamp().IsZero() { if resource.GetDeletionTimestamp().IsZero() {
@ -414,7 +414,7 @@ func (r *reconcilerImpl) clearFinalizer(ctx context.Context, resource *v1beta2.D
return resource, nil return resource, nil
} }
finalizers := sets.NewString(resource.Finalizers...) finalizers := sets.New[string](resource.Finalizers...)
if reconcileEvent != nil { if reconcileEvent != nil {
var event *reconciler.ReconcilerEvent var event *reconciler.ReconcilerEvent

View File

@ -338,14 +338,14 @@ func (r *reconcilerImpl) updateStatus(ctx context.Context, logger *zap.SugaredLo
// updateFinalizersFiltered will update the Finalizers of the resource. // updateFinalizersFiltered will update the Finalizers of the resource.
// TODO: this method could be generic and sync all finalizers. For now it only // TODO: this method could be generic and sync all finalizers. For now it only
// updates defaultFinalizerName or its override. // updates defaultFinalizerName or its override.
func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource *v1.CronJob, desiredFinalizers sets.String) (*v1.CronJob, error) { func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource *v1.CronJob, desiredFinalizers sets.Set[string]) (*v1.CronJob, error) {
// Don't modify the informers copy. // Don't modify the informers copy.
existing := resource.DeepCopy() existing := resource.DeepCopy()
var finalizers []string var finalizers []string
// If there's nothing to update, just return. // If there's nothing to update, just return.
existingFinalizers := sets.NewString(existing.Finalizers...) existingFinalizers := sets.New[string](existing.Finalizers...)
if desiredFinalizers.Has(r.finalizerName) { if desiredFinalizers.Has(r.finalizerName) {
if existingFinalizers.Has(r.finalizerName) { if existingFinalizers.Has(r.finalizerName) {
@ -361,7 +361,7 @@ func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource
} }
// Remove the finalizer. // Remove the finalizer.
existingFinalizers.Delete(r.finalizerName) existingFinalizers.Delete(r.finalizerName)
finalizers = existingFinalizers.List() finalizers = sets.List(existingFinalizers)
} }
mergePatch := map[string]interface{}{ mergePatch := map[string]interface{}{
@ -395,7 +395,7 @@ func (r *reconcilerImpl) setFinalizerIfFinalizer(ctx context.Context, resource *
return resource, nil return resource, nil
} }
finalizers := sets.NewString(resource.Finalizers...) finalizers := sets.New[string](resource.Finalizers...)
// If this resource is not being deleted, mark the finalizer. // If this resource is not being deleted, mark the finalizer.
if resource.GetDeletionTimestamp().IsZero() { if resource.GetDeletionTimestamp().IsZero() {
@ -414,7 +414,7 @@ func (r *reconcilerImpl) clearFinalizer(ctx context.Context, resource *v1.CronJo
return resource, nil return resource, nil
} }
finalizers := sets.NewString(resource.Finalizers...) finalizers := sets.New[string](resource.Finalizers...)
if reconcileEvent != nil { if reconcileEvent != nil {
var event *reconciler.ReconcilerEvent var event *reconciler.ReconcilerEvent

View File

@ -338,14 +338,14 @@ func (r *reconcilerImpl) updateStatus(ctx context.Context, logger *zap.SugaredLo
// updateFinalizersFiltered will update the Finalizers of the resource. // updateFinalizersFiltered will update the Finalizers of the resource.
// TODO: this method could be generic and sync all finalizers. For now it only // TODO: this method could be generic and sync all finalizers. For now it only
// updates defaultFinalizerName or its override. // updates defaultFinalizerName or its override.
func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource *v1beta1.CronJob, desiredFinalizers sets.String) (*v1beta1.CronJob, error) { func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource *v1beta1.CronJob, desiredFinalizers sets.Set[string]) (*v1beta1.CronJob, error) {
// Don't modify the informers copy. // Don't modify the informers copy.
existing := resource.DeepCopy() existing := resource.DeepCopy()
var finalizers []string var finalizers []string
// If there's nothing to update, just return. // If there's nothing to update, just return.
existingFinalizers := sets.NewString(existing.Finalizers...) existingFinalizers := sets.New[string](existing.Finalizers...)
if desiredFinalizers.Has(r.finalizerName) { if desiredFinalizers.Has(r.finalizerName) {
if existingFinalizers.Has(r.finalizerName) { if existingFinalizers.Has(r.finalizerName) {
@ -361,7 +361,7 @@ func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource
} }
// Remove the finalizer. // Remove the finalizer.
existingFinalizers.Delete(r.finalizerName) existingFinalizers.Delete(r.finalizerName)
finalizers = existingFinalizers.List() finalizers = sets.List(existingFinalizers)
} }
mergePatch := map[string]interface{}{ mergePatch := map[string]interface{}{
@ -395,7 +395,7 @@ func (r *reconcilerImpl) setFinalizerIfFinalizer(ctx context.Context, resource *
return resource, nil return resource, nil
} }
finalizers := sets.NewString(resource.Finalizers...) finalizers := sets.New[string](resource.Finalizers...)
// If this resource is not being deleted, mark the finalizer. // If this resource is not being deleted, mark the finalizer.
if resource.GetDeletionTimestamp().IsZero() { if resource.GetDeletionTimestamp().IsZero() {
@ -414,7 +414,7 @@ func (r *reconcilerImpl) clearFinalizer(ctx context.Context, resource *v1beta1.C
return resource, nil return resource, nil
} }
finalizers := sets.NewString(resource.Finalizers...) finalizers := sets.New[string](resource.Finalizers...)
if reconcileEvent != nil { if reconcileEvent != nil {
var event *reconciler.ReconcilerEvent var event *reconciler.ReconcilerEvent

View File

@ -270,14 +270,14 @@ func (r *reconcilerImpl) Reconcile(ctx context.Context, key string) error {
// updateFinalizersFiltered will update the Finalizers of the resource. // updateFinalizersFiltered will update the Finalizers of the resource.
// TODO: this method could be generic and sync all finalizers. For now it only // TODO: this method could be generic and sync all finalizers. For now it only
// updates defaultFinalizerName or its override. // updates defaultFinalizerName or its override.
func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource *v1.ConfigMap, desiredFinalizers sets.String) (*v1.ConfigMap, error) { func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource *v1.ConfigMap, desiredFinalizers sets.Set[string]) (*v1.ConfigMap, error) {
// Don't modify the informers copy. // Don't modify the informers copy.
existing := resource.DeepCopy() existing := resource.DeepCopy()
var finalizers []string var finalizers []string
// If there's nothing to update, just return. // If there's nothing to update, just return.
existingFinalizers := sets.NewString(existing.Finalizers...) existingFinalizers := sets.New[string](existing.Finalizers...)
if desiredFinalizers.Has(r.finalizerName) { if desiredFinalizers.Has(r.finalizerName) {
if existingFinalizers.Has(r.finalizerName) { if existingFinalizers.Has(r.finalizerName) {
@ -293,7 +293,7 @@ func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource
} }
// Remove the finalizer. // Remove the finalizer.
existingFinalizers.Delete(r.finalizerName) existingFinalizers.Delete(r.finalizerName)
finalizers = existingFinalizers.List() finalizers = sets.List(existingFinalizers)
} }
mergePatch := map[string]interface{}{ mergePatch := map[string]interface{}{
@ -327,7 +327,7 @@ func (r *reconcilerImpl) setFinalizerIfFinalizer(ctx context.Context, resource *
return resource, nil return resource, nil
} }
finalizers := sets.NewString(resource.Finalizers...) finalizers := sets.New[string](resource.Finalizers...)
// If this resource is not being deleted, mark the finalizer. // If this resource is not being deleted, mark the finalizer.
if resource.GetDeletionTimestamp().IsZero() { if resource.GetDeletionTimestamp().IsZero() {
@ -346,7 +346,7 @@ func (r *reconcilerImpl) clearFinalizer(ctx context.Context, resource *v1.Config
return resource, nil return resource, nil
} }
finalizers := sets.NewString(resource.Finalizers...) finalizers := sets.New[string](resource.Finalizers...)
if reconcileEvent != nil { if reconcileEvent != nil {
var event *reconciler.ReconcilerEvent var event *reconciler.ReconcilerEvent

View File

@ -337,14 +337,14 @@ func (r *reconcilerImpl) updateStatus(ctx context.Context, logger *zap.SugaredLo
// updateFinalizersFiltered will update the Finalizers of the resource. // updateFinalizersFiltered will update the Finalizers of the resource.
// TODO: this method could be generic and sync all finalizers. For now it only // TODO: this method could be generic and sync all finalizers. For now it only
// updates defaultFinalizerName or its override. // updates defaultFinalizerName or its override.
func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource *v1.Namespace, desiredFinalizers sets.String) (*v1.Namespace, error) { func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource *v1.Namespace, desiredFinalizers sets.Set[string]) (*v1.Namespace, error) {
// Don't modify the informers copy. // Don't modify the informers copy.
existing := resource.DeepCopy() existing := resource.DeepCopy()
var finalizers []string var finalizers []string
// If there's nothing to update, just return. // If there's nothing to update, just return.
existingFinalizers := sets.NewString(existing.Finalizers...) existingFinalizers := sets.New[string](existing.Finalizers...)
if desiredFinalizers.Has(r.finalizerName) { if desiredFinalizers.Has(r.finalizerName) {
if existingFinalizers.Has(r.finalizerName) { if existingFinalizers.Has(r.finalizerName) {
@ -360,7 +360,7 @@ func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource
} }
// Remove the finalizer. // Remove the finalizer.
existingFinalizers.Delete(r.finalizerName) existingFinalizers.Delete(r.finalizerName)
finalizers = existingFinalizers.List() finalizers = sets.List(existingFinalizers)
} }
mergePatch := map[string]interface{}{ mergePatch := map[string]interface{}{
@ -394,7 +394,7 @@ func (r *reconcilerImpl) setFinalizerIfFinalizer(ctx context.Context, resource *
return resource, nil return resource, nil
} }
finalizers := sets.NewString(resource.Finalizers...) finalizers := sets.New[string](resource.Finalizers...)
// If this resource is not being deleted, mark the finalizer. // If this resource is not being deleted, mark the finalizer.
if resource.GetDeletionTimestamp().IsZero() { if resource.GetDeletionTimestamp().IsZero() {
@ -413,7 +413,7 @@ func (r *reconcilerImpl) clearFinalizer(ctx context.Context, resource *v1.Namesp
return resource, nil return resource, nil
} }
finalizers := sets.NewString(resource.Finalizers...) finalizers := sets.New[string](resource.Finalizers...)
if reconcileEvent != nil { if reconcileEvent != nil {
var event *reconciler.ReconcilerEvent var event *reconciler.ReconcilerEvent

View File

@ -337,14 +337,14 @@ func (r *reconcilerImpl) updateStatus(ctx context.Context, logger *zap.SugaredLo
// updateFinalizersFiltered will update the Finalizers of the resource. // updateFinalizersFiltered will update the Finalizers of the resource.
// TODO: this method could be generic and sync all finalizers. For now it only // TODO: this method could be generic and sync all finalizers. For now it only
// updates defaultFinalizerName or its override. // updates defaultFinalizerName or its override.
func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource *v1.Node, desiredFinalizers sets.String) (*v1.Node, error) { func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource *v1.Node, desiredFinalizers sets.Set[string]) (*v1.Node, error) {
// Don't modify the informers copy. // Don't modify the informers copy.
existing := resource.DeepCopy() existing := resource.DeepCopy()
var finalizers []string var finalizers []string
// If there's nothing to update, just return. // If there's nothing to update, just return.
existingFinalizers := sets.NewString(existing.Finalizers...) existingFinalizers := sets.New[string](existing.Finalizers...)
if desiredFinalizers.Has(r.finalizerName) { if desiredFinalizers.Has(r.finalizerName) {
if existingFinalizers.Has(r.finalizerName) { if existingFinalizers.Has(r.finalizerName) {
@ -360,7 +360,7 @@ func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource
} }
// Remove the finalizer. // Remove the finalizer.
existingFinalizers.Delete(r.finalizerName) existingFinalizers.Delete(r.finalizerName)
finalizers = existingFinalizers.List() finalizers = sets.List(existingFinalizers)
} }
mergePatch := map[string]interface{}{ mergePatch := map[string]interface{}{
@ -394,7 +394,7 @@ func (r *reconcilerImpl) setFinalizerIfFinalizer(ctx context.Context, resource *
return resource, nil return resource, nil
} }
finalizers := sets.NewString(resource.Finalizers...) finalizers := sets.New[string](resource.Finalizers...)
// If this resource is not being deleted, mark the finalizer. // If this resource is not being deleted, mark the finalizer.
if resource.GetDeletionTimestamp().IsZero() { if resource.GetDeletionTimestamp().IsZero() {
@ -413,7 +413,7 @@ func (r *reconcilerImpl) clearFinalizer(ctx context.Context, resource *v1.Node,
return resource, nil return resource, nil
} }
finalizers := sets.NewString(resource.Finalizers...) finalizers := sets.New[string](resource.Finalizers...)
if reconcileEvent != nil { if reconcileEvent != nil {
var event *reconciler.ReconcilerEvent var event *reconciler.ReconcilerEvent

View File

@ -337,14 +337,14 @@ func (r *reconcilerImpl) updateStatus(ctx context.Context, logger *zap.SugaredLo
// updateFinalizersFiltered will update the Finalizers of the resource. // updateFinalizersFiltered will update the Finalizers of the resource.
// TODO: this method could be generic and sync all finalizers. For now it only // TODO: this method could be generic and sync all finalizers. For now it only
// updates defaultFinalizerName or its override. // updates defaultFinalizerName or its override.
func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource *v1.Pod, desiredFinalizers sets.String) (*v1.Pod, error) { func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource *v1.Pod, desiredFinalizers sets.Set[string]) (*v1.Pod, error) {
// Don't modify the informers copy. // Don't modify the informers copy.
existing := resource.DeepCopy() existing := resource.DeepCopy()
var finalizers []string var finalizers []string
// If there's nothing to update, just return. // If there's nothing to update, just return.
existingFinalizers := sets.NewString(existing.Finalizers...) existingFinalizers := sets.New[string](existing.Finalizers...)
if desiredFinalizers.Has(r.finalizerName) { if desiredFinalizers.Has(r.finalizerName) {
if existingFinalizers.Has(r.finalizerName) { if existingFinalizers.Has(r.finalizerName) {
@ -360,7 +360,7 @@ func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource
} }
// Remove the finalizer. // Remove the finalizer.
existingFinalizers.Delete(r.finalizerName) existingFinalizers.Delete(r.finalizerName)
finalizers = existingFinalizers.List() finalizers = sets.List(existingFinalizers)
} }
mergePatch := map[string]interface{}{ mergePatch := map[string]interface{}{
@ -394,7 +394,7 @@ func (r *reconcilerImpl) setFinalizerIfFinalizer(ctx context.Context, resource *
return resource, nil return resource, nil
} }
finalizers := sets.NewString(resource.Finalizers...) finalizers := sets.New[string](resource.Finalizers...)
// If this resource is not being deleted, mark the finalizer. // If this resource is not being deleted, mark the finalizer.
if resource.GetDeletionTimestamp().IsZero() { if resource.GetDeletionTimestamp().IsZero() {
@ -413,7 +413,7 @@ func (r *reconcilerImpl) clearFinalizer(ctx context.Context, resource *v1.Pod, r
return resource, nil return resource, nil
} }
finalizers := sets.NewString(resource.Finalizers...) finalizers := sets.New[string](resource.Finalizers...)
if reconcileEvent != nil { if reconcileEvent != nil {
var event *reconciler.ReconcilerEvent var event *reconciler.ReconcilerEvent

View File

@ -270,14 +270,14 @@ func (r *reconcilerImpl) Reconcile(ctx context.Context, key string) error {
// updateFinalizersFiltered will update the Finalizers of the resource. // updateFinalizersFiltered will update the Finalizers of the resource.
// TODO: this method could be generic and sync all finalizers. For now it only // TODO: this method could be generic and sync all finalizers. For now it only
// updates defaultFinalizerName or its override. // updates defaultFinalizerName or its override.
func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource *v1.Secret, desiredFinalizers sets.String) (*v1.Secret, error) { func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource *v1.Secret, desiredFinalizers sets.Set[string]) (*v1.Secret, error) {
// Don't modify the informers copy. // Don't modify the informers copy.
existing := resource.DeepCopy() existing := resource.DeepCopy()
var finalizers []string var finalizers []string
// If there's nothing to update, just return. // If there's nothing to update, just return.
existingFinalizers := sets.NewString(existing.Finalizers...) existingFinalizers := sets.New[string](existing.Finalizers...)
if desiredFinalizers.Has(r.finalizerName) { if desiredFinalizers.Has(r.finalizerName) {
if existingFinalizers.Has(r.finalizerName) { if existingFinalizers.Has(r.finalizerName) {
@ -293,7 +293,7 @@ func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource
} }
// Remove the finalizer. // Remove the finalizer.
existingFinalizers.Delete(r.finalizerName) existingFinalizers.Delete(r.finalizerName)
finalizers = existingFinalizers.List() finalizers = sets.List(existingFinalizers)
} }
mergePatch := map[string]interface{}{ mergePatch := map[string]interface{}{
@ -327,7 +327,7 @@ func (r *reconcilerImpl) setFinalizerIfFinalizer(ctx context.Context, resource *
return resource, nil return resource, nil
} }
finalizers := sets.NewString(resource.Finalizers...) finalizers := sets.New[string](resource.Finalizers...)
// If this resource is not being deleted, mark the finalizer. // If this resource is not being deleted, mark the finalizer.
if resource.GetDeletionTimestamp().IsZero() { if resource.GetDeletionTimestamp().IsZero() {
@ -346,7 +346,7 @@ func (r *reconcilerImpl) clearFinalizer(ctx context.Context, resource *v1.Secret
return resource, nil return resource, nil
} }
finalizers := sets.NewString(resource.Finalizers...) finalizers := sets.New[string](resource.Finalizers...)
if reconcileEvent != nil { if reconcileEvent != nil {
var event *reconciler.ReconcilerEvent var event *reconciler.ReconcilerEvent

View File

@ -337,14 +337,14 @@ func (r *reconcilerImpl) updateStatus(ctx context.Context, logger *zap.SugaredLo
// updateFinalizersFiltered will update the Finalizers of the resource. // updateFinalizersFiltered will update the Finalizers of the resource.
// TODO: this method could be generic and sync all finalizers. For now it only // TODO: this method could be generic and sync all finalizers. For now it only
// updates defaultFinalizerName or its override. // updates defaultFinalizerName or its override.
func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource *v1.Service, desiredFinalizers sets.String) (*v1.Service, error) { func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource *v1.Service, desiredFinalizers sets.Set[string]) (*v1.Service, error) {
// Don't modify the informers copy. // Don't modify the informers copy.
existing := resource.DeepCopy() existing := resource.DeepCopy()
var finalizers []string var finalizers []string
// If there's nothing to update, just return. // If there's nothing to update, just return.
existingFinalizers := sets.NewString(existing.Finalizers...) existingFinalizers := sets.New[string](existing.Finalizers...)
if desiredFinalizers.Has(r.finalizerName) { if desiredFinalizers.Has(r.finalizerName) {
if existingFinalizers.Has(r.finalizerName) { if existingFinalizers.Has(r.finalizerName) {
@ -360,7 +360,7 @@ func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource
} }
// Remove the finalizer. // Remove the finalizer.
existingFinalizers.Delete(r.finalizerName) existingFinalizers.Delete(r.finalizerName)
finalizers = existingFinalizers.List() finalizers = sets.List(existingFinalizers)
} }
mergePatch := map[string]interface{}{ mergePatch := map[string]interface{}{
@ -394,7 +394,7 @@ func (r *reconcilerImpl) setFinalizerIfFinalizer(ctx context.Context, resource *
return resource, nil return resource, nil
} }
finalizers := sets.NewString(resource.Finalizers...) finalizers := sets.New[string](resource.Finalizers...)
// If this resource is not being deleted, mark the finalizer. // If this resource is not being deleted, mark the finalizer.
if resource.GetDeletionTimestamp().IsZero() { if resource.GetDeletionTimestamp().IsZero() {
@ -413,7 +413,7 @@ func (r *reconcilerImpl) clearFinalizer(ctx context.Context, resource *v1.Servic
return resource, nil return resource, nil
} }
finalizers := sets.NewString(resource.Finalizers...) finalizers := sets.New[string](resource.Finalizers...)
if reconcileEvent != nil { if reconcileEvent != nil {
var event *reconciler.ReconcilerEvent var event *reconciler.ReconcilerEvent

View File

@ -270,14 +270,14 @@ func (r *reconcilerImpl) Reconcile(ctx context.Context, key string) error {
// updateFinalizersFiltered will update the Finalizers of the resource. // updateFinalizersFiltered will update the Finalizers of the resource.
// TODO: this method could be generic and sync all finalizers. For now it only // TODO: this method could be generic and sync all finalizers. For now it only
// updates defaultFinalizerName or its override. // updates defaultFinalizerName or its override.
func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource *v1.ServiceAccount, desiredFinalizers sets.String) (*v1.ServiceAccount, error) { func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource *v1.ServiceAccount, desiredFinalizers sets.Set[string]) (*v1.ServiceAccount, error) {
// Don't modify the informers copy. // Don't modify the informers copy.
existing := resource.DeepCopy() existing := resource.DeepCopy()
var finalizers []string var finalizers []string
// If there's nothing to update, just return. // If there's nothing to update, just return.
existingFinalizers := sets.NewString(existing.Finalizers...) existingFinalizers := sets.New[string](existing.Finalizers...)
if desiredFinalizers.Has(r.finalizerName) { if desiredFinalizers.Has(r.finalizerName) {
if existingFinalizers.Has(r.finalizerName) { if existingFinalizers.Has(r.finalizerName) {
@ -293,7 +293,7 @@ func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource
} }
// Remove the finalizer. // Remove the finalizer.
existingFinalizers.Delete(r.finalizerName) existingFinalizers.Delete(r.finalizerName)
finalizers = existingFinalizers.List() finalizers = sets.List(existingFinalizers)
} }
mergePatch := map[string]interface{}{ mergePatch := map[string]interface{}{
@ -327,7 +327,7 @@ func (r *reconcilerImpl) setFinalizerIfFinalizer(ctx context.Context, resource *
return resource, nil return resource, nil
} }
finalizers := sets.NewString(resource.Finalizers...) finalizers := sets.New[string](resource.Finalizers...)
// If this resource is not being deleted, mark the finalizer. // If this resource is not being deleted, mark the finalizer.
if resource.GetDeletionTimestamp().IsZero() { if resource.GetDeletionTimestamp().IsZero() {
@ -346,7 +346,7 @@ func (r *reconcilerImpl) clearFinalizer(ctx context.Context, resource *v1.Servic
return resource, nil return resource, nil
} }
finalizers := sets.NewString(resource.Finalizers...) finalizers := sets.New[string](resource.Finalizers...)
if reconcileEvent != nil { if reconcileEvent != nil {
var event *reconciler.ReconcilerEvent var event *reconciler.ReconcilerEvent

View File

@ -338,14 +338,14 @@ func (r *reconcilerImpl) updateStatus(ctx context.Context, logger *zap.SugaredLo
// updateFinalizersFiltered will update the Finalizers of the resource. // updateFinalizersFiltered will update the Finalizers of the resource.
// TODO: this method could be generic and sync all finalizers. For now it only // TODO: this method could be generic and sync all finalizers. For now it only
// updates defaultFinalizerName or its override. // updates defaultFinalizerName or its override.
func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource *v1beta1.Deployment, desiredFinalizers sets.String) (*v1beta1.Deployment, error) { func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource *v1beta1.Deployment, desiredFinalizers sets.Set[string]) (*v1beta1.Deployment, error) {
// Don't modify the informers copy. // Don't modify the informers copy.
existing := resource.DeepCopy() existing := resource.DeepCopy()
var finalizers []string var finalizers []string
// If there's nothing to update, just return. // If there's nothing to update, just return.
existingFinalizers := sets.NewString(existing.Finalizers...) existingFinalizers := sets.New[string](existing.Finalizers...)
if desiredFinalizers.Has(r.finalizerName) { if desiredFinalizers.Has(r.finalizerName) {
if existingFinalizers.Has(r.finalizerName) { if existingFinalizers.Has(r.finalizerName) {
@ -361,7 +361,7 @@ func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource
} }
// Remove the finalizer. // Remove the finalizer.
existingFinalizers.Delete(r.finalizerName) existingFinalizers.Delete(r.finalizerName)
finalizers = existingFinalizers.List() finalizers = sets.List(existingFinalizers)
} }
mergePatch := map[string]interface{}{ mergePatch := map[string]interface{}{
@ -395,7 +395,7 @@ func (r *reconcilerImpl) setFinalizerIfFinalizer(ctx context.Context, resource *
return resource, nil return resource, nil
} }
finalizers := sets.NewString(resource.Finalizers...) finalizers := sets.New[string](resource.Finalizers...)
// If this resource is not being deleted, mark the finalizer. // If this resource is not being deleted, mark the finalizer.
if resource.GetDeletionTimestamp().IsZero() { if resource.GetDeletionTimestamp().IsZero() {
@ -414,7 +414,7 @@ func (r *reconcilerImpl) clearFinalizer(ctx context.Context, resource *v1beta1.D
return resource, nil return resource, nil
} }
finalizers := sets.NewString(resource.Finalizers...) finalizers := sets.New[string](resource.Finalizers...)
if reconcileEvent != nil { if reconcileEvent != nil {
var event *reconciler.ReconcilerEvent var event *reconciler.ReconcilerEvent

View File

@ -338,14 +338,14 @@ func (r *reconcilerImpl) updateStatus(ctx context.Context, logger *zap.SugaredLo
// updateFinalizersFiltered will update the Finalizers of the resource. // updateFinalizersFiltered will update the Finalizers of the resource.
// TODO: this method could be generic and sync all finalizers. For now it only // TODO: this method could be generic and sync all finalizers. For now it only
// updates defaultFinalizerName or its override. // updates defaultFinalizerName or its override.
func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource *v1beta1.NetworkPolicy, desiredFinalizers sets.String) (*v1beta1.NetworkPolicy, error) { func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource *v1beta1.NetworkPolicy, desiredFinalizers sets.Set[string]) (*v1beta1.NetworkPolicy, error) {
// Don't modify the informers copy. // Don't modify the informers copy.
existing := resource.DeepCopy() existing := resource.DeepCopy()
var finalizers []string var finalizers []string
// If there's nothing to update, just return. // If there's nothing to update, just return.
existingFinalizers := sets.NewString(existing.Finalizers...) existingFinalizers := sets.New[string](existing.Finalizers...)
if desiredFinalizers.Has(r.finalizerName) { if desiredFinalizers.Has(r.finalizerName) {
if existingFinalizers.Has(r.finalizerName) { if existingFinalizers.Has(r.finalizerName) {
@ -361,7 +361,7 @@ func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource
} }
// Remove the finalizer. // Remove the finalizer.
existingFinalizers.Delete(r.finalizerName) existingFinalizers.Delete(r.finalizerName)
finalizers = existingFinalizers.List() finalizers = sets.List(existingFinalizers)
} }
mergePatch := map[string]interface{}{ mergePatch := map[string]interface{}{
@ -395,7 +395,7 @@ func (r *reconcilerImpl) setFinalizerIfFinalizer(ctx context.Context, resource *
return resource, nil return resource, nil
} }
finalizers := sets.NewString(resource.Finalizers...) finalizers := sets.New[string](resource.Finalizers...)
// If this resource is not being deleted, mark the finalizer. // If this resource is not being deleted, mark the finalizer.
if resource.GetDeletionTimestamp().IsZero() { if resource.GetDeletionTimestamp().IsZero() {
@ -414,7 +414,7 @@ func (r *reconcilerImpl) clearFinalizer(ctx context.Context, resource *v1beta1.N
return resource, nil return resource, nil
} }
finalizers := sets.NewString(resource.Finalizers...) finalizers := sets.New[string](resource.Finalizers...)
if reconcileEvent != nil { if reconcileEvent != nil {
var event *reconciler.ReconcilerEvent var event *reconciler.ReconcilerEvent

View File

@ -338,14 +338,14 @@ func (r *reconcilerImpl) updateStatus(ctx context.Context, logger *zap.SugaredLo
// updateFinalizersFiltered will update the Finalizers of the resource. // updateFinalizersFiltered will update the Finalizers of the resource.
// TODO: this method could be generic and sync all finalizers. For now it only // TODO: this method could be generic and sync all finalizers. For now it only
// updates defaultFinalizerName or its override. // updates defaultFinalizerName or its override.
func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource *v1.NetworkPolicy, desiredFinalizers sets.String) (*v1.NetworkPolicy, error) { func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource *v1.NetworkPolicy, desiredFinalizers sets.Set[string]) (*v1.NetworkPolicy, error) {
// Don't modify the informers copy. // Don't modify the informers copy.
existing := resource.DeepCopy() existing := resource.DeepCopy()
var finalizers []string var finalizers []string
// If there's nothing to update, just return. // If there's nothing to update, just return.
existingFinalizers := sets.NewString(existing.Finalizers...) existingFinalizers := sets.New[string](existing.Finalizers...)
if desiredFinalizers.Has(r.finalizerName) { if desiredFinalizers.Has(r.finalizerName) {
if existingFinalizers.Has(r.finalizerName) { if existingFinalizers.Has(r.finalizerName) {
@ -361,7 +361,7 @@ func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource
} }
// Remove the finalizer. // Remove the finalizer.
existingFinalizers.Delete(r.finalizerName) existingFinalizers.Delete(r.finalizerName)
finalizers = existingFinalizers.List() finalizers = sets.List(existingFinalizers)
} }
mergePatch := map[string]interface{}{ mergePatch := map[string]interface{}{
@ -395,7 +395,7 @@ func (r *reconcilerImpl) setFinalizerIfFinalizer(ctx context.Context, resource *
return resource, nil return resource, nil
} }
finalizers := sets.NewString(resource.Finalizers...) finalizers := sets.New[string](resource.Finalizers...)
// If this resource is not being deleted, mark the finalizer. // If this resource is not being deleted, mark the finalizer.
if resource.GetDeletionTimestamp().IsZero() { if resource.GetDeletionTimestamp().IsZero() {
@ -414,7 +414,7 @@ func (r *reconcilerImpl) clearFinalizer(ctx context.Context, resource *v1.Networ
return resource, nil return resource, nil
} }
finalizers := sets.NewString(resource.Finalizers...) finalizers := sets.New[string](resource.Finalizers...)
if reconcileEvent != nil { if reconcileEvent != nil {
var event *reconciler.ReconcilerEvent var event *reconciler.ReconcilerEvent

View File

@ -156,11 +156,11 @@ func (g *reconcilerReconcilerGenerator) GenerateType(c *generator.Context, t *ty
}), }),
"setsNewString": c.Universe.Function(types.Name{ "setsNewString": c.Universe.Function(types.Name{
Package: "k8s.io/apimachinery/pkg/util/sets", Package: "k8s.io/apimachinery/pkg/util/sets",
Name: "NewString", Name: "New[string]",
}), }),
"setsString": c.Universe.Type(types.Name{ "setsString": c.Universe.Type(types.Name{
Package: "k8s.io/apimachinery/pkg/util/sets", Package: "k8s.io/apimachinery/pkg/util/sets",
Name: "String", Name: "Set[string]",
}), }),
"controllerOptions": c.Universe.Type(types.Name{ "controllerOptions": c.Universe.Type(types.Name{
Package: "knative.dev/pkg/controller", Package: "knative.dev/pkg/controller",
@ -630,7 +630,7 @@ func (r *reconcilerImpl) updateFinalizersFiltered(ctx {{.contextContext|raw}}, r
} }
// Remove the finalizer. // Remove the finalizer.
existingFinalizers.Delete(r.finalizerName) existingFinalizers.Delete(r.finalizerName)
finalizers = existingFinalizers.List() finalizers = sets.List(existingFinalizers)
} }
mergePatch := map[string]interface{}{ mergePatch := map[string]interface{}{

View File

@ -26,14 +26,14 @@ import (
// namedWaitGroup is used to increment and decrement a WaitGroup by name // namedWaitGroup is used to increment and decrement a WaitGroup by name
type namedWaitGroup struct { type namedWaitGroup struct {
waitGroup sync.WaitGroup waitGroup sync.WaitGroup
keys sets.String keys sets.Set[string]
mu sync.Mutex mu sync.Mutex
} }
// newNamedWaitGroup returns an instantiated namedWaitGroup. // newNamedWaitGroup returns an instantiated namedWaitGroup.
func newNamedWaitGroup() *namedWaitGroup { func newNamedWaitGroup() *namedWaitGroup {
return &namedWaitGroup{ return &namedWaitGroup{
keys: sets.NewString(), keys: sets.New[string](),
} }
} }

View File

@ -165,15 +165,15 @@ func AsDuration(key string, target *time.Duration) ParseFunc {
} }
} }
// AsStringSet parses the value at key as a sets.String (split by ',') into the target, if it exists. // AsStringSet parses the value at key as a sets.Set[string] (split by ',') into the target, if it exists.
func AsStringSet(key string, target *sets.String) ParseFunc { func AsStringSet(key string, target *sets.Set[string]) ParseFunc {
return func(data map[string]string) error { return func(data map[string]string) error {
if raw, ok := data[key]; ok { if raw, ok := data[key]; ok {
splitted := strings.Split(raw, ",") splitted := strings.Split(raw, ",")
for i, v := range splitted { for i, v := range splitted {
splitted[i] = strings.TrimSpace(v) splitted[i] = strings.TrimSpace(v)
} }
*target = sets.NewString(splitted...) *target = sets.New[string](splitted...)
} }
return nil return nil
} }

View File

@ -37,7 +37,7 @@ type testConfig struct {
i int i int
f64 float64 f64 float64
dur time.Duration dur time.Duration
set sets.String set sets.Set[string]
qua *resource.Quantity qua *resource.Quantity
nsn types.NamespacedName nsn types.NamespacedName
@ -87,7 +87,7 @@ func TestParse(t *testing.T) {
f64: 1.0, f64: 1.0,
i: 4, i: 4,
dur: time.Minute, dur: time.Minute,
set: sets.NewString("a", "b", "c", "d"), set: sets.New[string]("a", "b", "c", "d"),
qua: &fiveHundredM, qua: &fiveHundredM,
nsn: types.NamespacedName{ nsn: types.NamespacedName{
Name: "some-name", Name: "some-name",

View File

@ -38,7 +38,7 @@ type BucketSet struct {
// mu guards buckets. // mu guards buckets.
mu sync.RWMutex mu sync.RWMutex
// All the bucket names. Needed for building hash universe. // All the bucket names. Needed for building hash universe.
buckets sets.String buckets sets.Set[string]
} }
// Bucket implements reconciler.Bucket and wraps around BuketSet // Bucket implements reconciler.Bucket and wraps around BuketSet
@ -59,7 +59,7 @@ func newCache() *lru.Cache {
// NewBucketSet creates a new bucket set with the given universe // NewBucketSet creates a new bucket set with the given universe
// of bucket names. // of bucket names.
func NewBucketSet(bucketList sets.String) *BucketSet { func NewBucketSet(bucketList sets.Set[string]) *BucketSet {
return &BucketSet{ return &BucketSet{
cache: newCache(), cache: newCache(),
buckets: bucketList, buckets: bucketList,
@ -106,7 +106,7 @@ func (bs *BucketSet) Owner(key string) string {
} }
// Returns a single element from the set. // Returns a single element from the set.
func GetAny(s sets.String) (string, bool) { func GetAny(s sets.Set[string]) (string, bool) {
for key := range s { for key := range s {
return key, true return key, true
} }
@ -124,11 +124,11 @@ func (bs *BucketSet) BucketList() []string {
bs.mu.RLock() bs.mu.RLock()
defer bs.mu.RUnlock() defer bs.mu.RUnlock()
return bs.buckets.List() return sets.List(bs.buckets)
} }
// Update updates the universe of buckets. // Update updates the universe of buckets.
func (bs *BucketSet) Update(newB sets.String) { func (bs *BucketSet) Update(newB sets.Set[string]) {
bs.mu.Lock() bs.mu.Lock()
defer bs.mu.Unlock() defer bs.mu.Unlock()
// In theory we can iterate over the map and // In theory we can iterate over the map and

View File

@ -32,7 +32,7 @@ const (
unknownKey = "snow" // snow maps to "chubasco", originally. unknownKey = "snow" // snow maps to "chubasco", originally.
) )
var buckets = sets.NewString(thisBucket, otherBucket, "aguacero", "chaparrón") var buckets = sets.New[string](thisBucket, otherBucket, "aguacero", "chaparrón")
func TestBucketSetOwner(t *testing.T) { func TestBucketSetOwner(t *testing.T) {
b := NewBucketSet(buckets) b := NewBucketSet(buckets)
@ -68,7 +68,7 @@ func TestBucketSetList(t *testing.T) {
bs := NewBucketSet(buckets) bs := NewBucketSet(buckets)
got := bs.BucketList() got := bs.BucketList()
if want := buckets.List(); !reflect.DeepEqual(got, want) { if want := sets.List(buckets); !reflect.DeepEqual(got, want) {
t.Errorf("Name = %q, want: %q, diff(-want,+got):\n%s", got, want, cmp.Diff(want, got)) t.Errorf("Name = %q, want: %q, diff(-want,+got):\n%s", got, want, cmp.Diff(want, got))
} }
} }
@ -78,7 +78,7 @@ func TestBucketSetUpdate(t *testing.T) {
b.Owner(knownKey) b.Owner(knownKey)
// Need a clone. // Need a clone.
newNames := buckets.Difference(sets.NewString(otherBucket)) newNames := buckets.Difference(sets.New[string](otherBucket))
b.Update(newNames) b.Update(newNames)
if b.cache.Len() != 0 { if b.cache.Len() != 0 {
t.Error("cache was not emptied") t.Error("cache was not emptied")
@ -117,7 +117,7 @@ func TestBucketSetBuckets(t *testing.T) {
} }
func TestBucketSetHasBucket(t *testing.T) { func TestBucketSetHasBucket(t *testing.T) {
bs := NewBucketSet(sets.NewString(thisBucket, "aguacero", "chaparrón")) bs := NewBucketSet(sets.New[string](thisBucket, "aguacero", "chaparrón"))
if !bs.HasBucket(thisBucket) { if !bs.HasBucket(thisBucket) {
t.Errorf("HasBucket(%v) = false", thisBucket) t.Errorf("HasBucket(%v) = false", thisBucket)
} }

View File

@ -60,8 +60,8 @@ type hashData struct {
step int step int
} }
func (hd *hashData) fromIndexSet(s sets.Int) sets.String { func (hd *hashData) fromIndexSet(s sets.Set[int]) sets.Set[string] {
ret := make(sets.String, len(s)) ret := make(sets.Set[string], len(s))
for v := range s { for v := range s {
ret.Insert(hd.nameForHIndex(v)) ret.Insert(hd.nameForHIndex(v))
} }
@ -72,14 +72,14 @@ func (hd *hashData) nameForHIndex(hi int) string {
return hd.nameLookup[hd.hashPool[hi]] return hd.nameLookup[hd.hashPool[hi]]
} }
func buildHashes(in sets.String, target string) *hashData { func buildHashes(in sets.Set[string], target string) *hashData {
// Any one changing this function must execute // Any one changing this function must execute
// `go test -run=TestOverlay -count=200`. // `go test -run=TestOverlay -count=200`.
// This is to ensure there is no regression in the selection // This is to ensure there is no regression in the selection
// algorithm. // algorithm.
// Sorted list to ensure consistent results every time. // Sorted list to ensure consistent results every time.
from := in.List() from := sets.List(in)
// Write in two pieces, so we don't allocate temp string which is sum of both. // Write in two pieces, so we don't allocate temp string which is sum of both.
buf := bytes.NewBufferString(target) buf := bytes.NewBufferString(target)
buf.WriteString(startSalt) buf.WriteString(startSalt)
@ -126,7 +126,7 @@ func buildHashes(in sets.String, target string) *hashData {
// ChooseSubset is an internal function and presumes sanitized inputs. // ChooseSubset is an internal function and presumes sanitized inputs.
// TODO(vagababov): once initial impl is ready, think about how to cache // TODO(vagababov): once initial impl is ready, think about how to cache
// the prepared data. // the prepared data.
func ChooseSubset(from sets.String, n int, target string) sets.String { func ChooseSubset(from sets.Set[string], n int, target string) sets.Set[string] {
if n >= len(from) { if n >= len(from) {
return from return from
} }
@ -140,7 +140,7 @@ func ChooseSubset(from sets.String, n int, target string) sets.String {
// 2.1. While that index is already selected pick next index // 2.1. While that index is already selected pick next index
// 3. Advance angle by `step` // 3. Advance angle by `step`
// 4. Goto 1. // 4. Goto 1.
selection := sets.NewInt() selection := sets.New[int]()
angle := hashData.start angle := hashData.start
hpl := len(hashData.hashPool) hpl := len(hashData.hashPool)
for len(selection) < n { for len(selection) < n {

View File

@ -33,7 +33,7 @@ func ExampleChooseSubset_selectOne() {
// This example shows how to do consistent bucket // This example shows how to do consistent bucket
// assignment using ChooseSubset. // assignment using ChooseSubset.
tasks := sets.NewString("task1", "task2", "task3") tasks := sets.New[string]("task1", "task2", "task3")
ret := ChooseSubset(tasks, 1, "my-key1") ret := ChooseSubset(tasks, 1, "my-key1")
fmt.Println(ret.UnsortedList()[0]) fmt.Println(ret.UnsortedList()[0])
@ -48,16 +48,16 @@ func ExampleChooseSubset_selectMany() {
// This example shows how to do consistent bucket // This example shows how to do consistent bucket
// assignment using ChooseSubset. // assignment using ChooseSubset.
tasks := sets.NewString("task1", "task2", "task3", "task4", "task5") tasks := sets.New[string]("task1", "task2", "task3", "task4", "task5")
ret := ChooseSubset(tasks, 2, "my-key1") ret := ChooseSubset(tasks, 2, "my-key1")
fmt.Println(ret.List()) fmt.Println(sets.List(ret))
// Output: [task3 task4] // Output: [task3 task4]
} }
func TestBuildHashes(t *testing.T) { func TestBuildHashes(t *testing.T) {
const target = "a target to remember" const target = "a target to remember"
set := sets.NewString("a", "b", "c", "e", "f") set := sets.New[string]("a", "b", "c", "e", "f")
hd1 := buildHashes(set, target) hd1 := buildHashes(set, target)
hd2 := buildHashes(set, target) hd2 := buildHashes(set, target)
@ -77,34 +77,34 @@ func TestBuildHashes(t *testing.T) {
func TestChooseSubset(t *testing.T) { func TestChooseSubset(t *testing.T) {
tests := []struct { tests := []struct {
name string name string
from sets.String from sets.Set[string]
target string target string
wantNum int wantNum int
want sets.String want sets.Set[string]
}{{ }{{
name: "return all", name: "return all",
from: sets.NewString("sun", "moon", "mars", "mercury"), from: sets.New[string]("sun", "moon", "mars", "mercury"),
target: "a target!", target: "a target!",
wantNum: 4, wantNum: 4,
want: sets.NewString("sun", "moon", "mars", "mercury"), want: sets.New[string]("sun", "moon", "mars", "mercury"),
}, { }, {
name: "subset 1", name: "subset 1",
from: sets.NewString("sun", "moon", "mars", "mercury"), from: sets.New[string]("sun", "moon", "mars", "mercury"),
target: "a target!", target: "a target!",
wantNum: 2, wantNum: 2,
want: sets.NewString("mercury", "moon"), want: sets.New[string]("mercury", "moon"),
}, { }, {
name: "subset 2", name: "subset 2",
from: sets.NewString("sun", "moon", "mars", "mercury"), from: sets.New[string]("sun", "moon", "mars", "mercury"),
target: "something else entirely", target: "something else entirely",
wantNum: 2, wantNum: 2,
want: sets.NewString("mercury", "mars"), want: sets.New[string]("mercury", "mars"),
}, { }, {
name: "select 3", name: "select 3",
from: sets.NewString("sun", "moon", "mars", "mercury"), from: sets.New[string]("sun", "moon", "mars", "mercury"),
target: "something else entirely", target: "something else entirely",
wantNum: 3, wantNum: 3,
want: sets.NewString("mars", "mercury", "sun"), want: sets.New[string]("mars", "mercury", "sun"),
}} }}
for _, tc := range tests { for _, tc := range tests {
@ -131,7 +131,7 @@ func TestCollisionHandling(t *testing.T) {
if h1 != h2 { if h1 != h2 {
t.Fatalf("Baseline incorrect keys don't collide %d != %d", h1, h2) t.Fatalf("Baseline incorrect keys don't collide %d != %d", h1, h2)
} }
hd := buildHashes(sets.NewString(key1, key2), target) hd := buildHashes(sets.New[string](key1, key2), target)
if got, want := len(hd.nameLookup), 2; got != want { if got, want := len(hd.nameLookup), 2; got != want {
t.Error("Did not resolve collision, only 1 key in the map") t.Error("Did not resolve collision, only 1 key in the map")
} }
@ -148,7 +148,7 @@ func TestOverlay(t *testing.T) {
want = samples * selection / sources want = samples * selection / sources
threshold = want / 5 // 20% threshold = want / 5 // 20%
) )
from := sets.NewString() from := sets.New[string]()
for i := 0; i < sources; i++ { for i := 0; i < sources; i++ {
from.Insert(uuid.NewString()) from.Insert(uuid.NewString())
} }
@ -184,7 +184,7 @@ func BenchmarkSelection(b *testing.B) {
for _, ss := range []int{1, 5, 10, 15, 20, 25} { for _, ss := range []int{1, 5, 10, 15, 20, 25} {
b.Run(fmt.Sprintf("pool-%d-subset-%d", v, ss), func(b *testing.B) { b.Run(fmt.Sprintf("pool-%d-subset-%d", v, ss), func(b *testing.B) {
target := uuid.NewString() target := uuid.NewString()
in := sets.NewString(from[:v]...) in := sets.New[string](from[:v]...)
for i := 0; i < b.N; i++ { for i := 0; i < b.N; i++ {
ChooseSubset(in, 10, target) ChooseSubset(in, 10, target)
} }

View File

@ -24,7 +24,7 @@ import (
) )
type StringSet struct { type StringSet struct {
Value sets.String Value sets.Set[string]
} }
var _ flag.Value = (*StringSet)(nil) var _ flag.Value = (*StringSet)(nil)
@ -35,7 +35,7 @@ func (i *StringSet) String() string {
func (i *StringSet) Set(value string) error { func (i *StringSet) Set(value string) error {
if i.Value == nil { if i.Value == nil {
i.Value = make(sets.String, 1) i.Value = make(sets.Set[string], 1)
} }
i.Value.Insert(value) i.Value.Insert(value)
return nil return nil

View File

@ -42,7 +42,7 @@ import (
) )
// components is a mapping from component name to the collection of leader pod names. // components is a mapping from component name to the collection of leader pod names.
type components map[string]sets.String type components map[string]sets.Set[string]
var ( var (
disabledComponents kflag.StringSet disabledComponents kflag.StringSet
@ -100,7 +100,7 @@ func buildComponents(ctx context.Context, kc kubernetes.Interface) (components,
set, ok := cs[deploymentName] set, ok := cs[deploymentName]
if !ok { if !ok {
set = make(sets.String, 1) set = make(sets.Set[string], 1)
cs[deploymentName] = set cs[deploymentName] = set
} }
set.Insert(pod) set.Insert(pod)
@ -109,7 +109,7 @@ func buildComponents(ctx context.Context, kc kubernetes.Interface) (components,
} }
// quack will kill one of the components leader pods. // quack will kill one of the components leader pods.
func quack(ctx context.Context, kc kubernetes.Interface, component string, leaders sets.String) error { func quack(ctx context.Context, kc kubernetes.Interface, component string, leaders sets.Set[string]) error {
tribute, ok := leaders.PopAny() tribute, ok := leaders.PopAny()
if !ok { if !ok {
return errors.New("this should not be possible, since components are only created when they have components") return errors.New("this should not be possible, since components are only created when they have components")

View File

@ -190,7 +190,7 @@ func newStandardBuckets(queueName string, cc ComponentConfig) []reconciler.Bucke
return standardBucketName(i, queueName, cc) return standardBucketName(i, queueName, cc)
} }
} }
names := make(sets.String, cc.Buckets) names := make(sets.Set[string], cc.Buckets)
for i := uint32(0); i < cc.Buckets; i++ { for i := uint32(0); i < cc.Buckets; i++ {
names.Insert(ln(i)) names.Insert(ln(i))
} }
@ -237,7 +237,7 @@ func NewStatefulSetBucketAndSet(buckets int) (reconciler.Bucket, *hash.BucketSet
ssc.StatefulSetID.ordinal, buckets) ssc.StatefulSetID.ordinal, buckets)
} }
names := make(sets.String, buckets) names := make(sets.Set[string], buckets)
for i := 0; i < buckets; i++ { for i := 0; i < buckets; i++ {
names.Insert(statefulSetPodDNS(i, ssc)) names.Insert(statefulSetPodDNS(i, ssc))
} }

View File

@ -45,7 +45,7 @@ func TestWithBuilder(t *testing.T) {
kc := fakekube.NewSimpleClientset() kc := fakekube.NewSimpleClientset()
ctx := context.Background() ctx := context.Background()
gotNames := make(sets.String, buckets) gotNames := make(sets.Set[string], buckets)
promoted := make(chan string) promoted := make(chan string)
demoted := make(chan struct{}) demoted := make(chan struct{})
laf := &reconciler.LeaderAwareFuncs{ laf := &reconciler.LeaderAwareFuncs{
@ -153,7 +153,7 @@ func TestWithBuilder(t *testing.T) {
} }
} }
want := sets.NewString( want := sets.New[string](
"the-component.name.00-of-03", "the-component.name.00-of-03",
"the-component.name.01-of-03", "the-component.name.01-of-03",
"the-component.name.02-of-03", "the-component.name.02-of-03",
@ -178,7 +178,7 @@ func TestBuilderWithCustomizedLeaseName(t *testing.T) {
kc := fakekube.NewSimpleClientset() kc := fakekube.NewSimpleClientset()
ctx := context.Background() ctx := context.Background()
gotNames := make(sets.String, buckets) gotNames := make(sets.Set[string], buckets)
promoted := make(chan string) promoted := make(chan string)
laf := &reconciler.LeaderAwareFuncs{ laf := &reconciler.LeaderAwareFuncs{
PromoteFunc: func(bkt reconciler.Bucket, enq func(reconciler.Bucket, types.NamespacedName)) error { PromoteFunc: func(bkt reconciler.Bucket, enq func(reconciler.Bucket, types.NamespacedName)) error {
@ -207,7 +207,7 @@ func TestBuilderWithCustomizedLeaseName(t *testing.T) {
} }
} }
want := sets.NewString( want := sets.New[string](
"bucket-00", "bucket-00",
"bucket-01", "bucket-01",
"bucket-02", "bucket-02",

View File

@ -37,7 +37,7 @@ import (
// //
// logger.Info("Revision State", zap.Object("healthy", logging.StringSet(healthySet)), // logger.Info("Revision State", zap.Object("healthy", logging.StringSet(healthySet)),
// zap.Object("unhealthy", logging.StringSet(unhealthySet))) // zap.Object("unhealthy", logging.StringSet(unhealthySet)))
func StringSet(s sets.String) zapcore.ObjectMarshalerFunc { func StringSet(s sets.Set[string]) zapcore.ObjectMarshalerFunc {
return func(enc zapcore.ObjectEncoder) error { return func(enc zapcore.ObjectEncoder) error {
enc.AddString("keys", strings.Join(s.UnsortedList(), ",")) enc.AddString("keys", strings.Join(s.UnsortedList(), ","))
return nil return nil

View File

@ -289,7 +289,7 @@ func (r *TableRow) Test(t *testing.T, factory Factory) {
// Build a set of unique strings that represent type-name{-namespace}. // Build a set of unique strings that represent type-name{-namespace}.
// Adding type will help catch the bugs where several similarly named // Adding type will help catch the bugs where several similarly named
// resources are deleted (and some should or should not). // resources are deleted (and some should or should not).
gotDeletes := make(sets.String, len(actions.Deletes)) gotDeletes := make(sets.Set[string], len(actions.Deletes))
for _, w := range actions.Deletes { for _, w := range actions.Deletes {
n := w.GetResource().Resource + "~~" + w.GetName() n := w.GetResource().Resource + "~~" + w.GetName()
if !r.SkipNamespaceValidation { if !r.SkipNamespaceValidation {
@ -297,7 +297,7 @@ func (r *TableRow) Test(t *testing.T, factory Factory) {
} }
gotDeletes.Insert(n) gotDeletes.Insert(n)
} }
wantDeletes := make(sets.String, len(actions.Deletes)) wantDeletes := make(sets.Set[string], len(actions.Deletes))
for _, w := range r.WantDeletes { for _, w := range r.WantDeletes {
n := w.GetResource().Resource + "~~" + w.GetName() n := w.GetResource().Resource + "~~" + w.GetName()
if !r.SkipNamespaceValidation { if !r.SkipNamespaceValidation {

View File

@ -73,11 +73,11 @@ func GetLeaders(ctx context.Context, t *testing.T, client kubernetes.Interface,
// WaitForNewLeaders waits until the collection of current leaders consists of "n" leaders // WaitForNewLeaders waits until the collection of current leaders consists of "n" leaders
// which do not include the specified prior leaders. // which do not include the specified prior leaders.
func WaitForNewLeaders(ctx context.Context, t *testing.T, client kubernetes.Interface, deploymentName, namespace string, previousLeaders sets.String, n int) (sets.String, error) { func WaitForNewLeaders(ctx context.Context, t *testing.T, client kubernetes.Interface, deploymentName, namespace string, previousLeaders sets.Set[string], n int) (sets.Set[string], error) {
span := logging.GetEmitableSpan(ctx, "WaitForNewLeaders/"+deploymentName) span := logging.GetEmitableSpan(ctx, "WaitForNewLeaders/"+deploymentName)
defer span.End() defer span.End()
var leaders sets.String var leaders sets.Set[string]
err := wait.PollImmediate(time.Second, time.Minute, func() (bool, error) { err := wait.PollImmediate(time.Second, time.Minute, func() (bool, error) {
currLeaders, err := GetLeaders(ctx, t, client, deploymentName, namespace) currLeaders, err := GetLeaders(ctx, t, client, deploymentName, namespace)
if err != nil { if err != nil {
@ -87,7 +87,7 @@ func WaitForNewLeaders(ctx context.Context, t *testing.T, client kubernetes.Inte
t.Logf("WaitForNewLeaders[%s] not enough leaders, got: %d, want: %d", deploymentName, len(currLeaders), n) t.Logf("WaitForNewLeaders[%s] not enough leaders, got: %d, want: %d", deploymentName, len(currLeaders), n)
return false, nil return false, nil
} }
l := sets.NewString(currLeaders...) l := sets.New[string](currLeaders...)
if previousLeaders.HasAny(currLeaders...) { if previousLeaders.HasAny(currLeaders...) {
t.Logf("WaitForNewLeaders[%s] still see intersection: %v", deploymentName, previousLeaders.Intersection(l)) t.Logf("WaitForNewLeaders[%s] still see intersection: %v", deploymentName, previousLeaders.Intersection(l))
return false, nil return false, nil

View File

@ -62,8 +62,8 @@ func MatchesAllBodies(all ...string) ResponseChecker {
// This helps with two things: // This helps with two things:
// 1. we can use Equal on sets // 1. we can use Equal on sets
// 2. it will collapse the duplicates // 2. it will collapse the duplicates
want := sets.NewString(all...) want := sets.New[string](all...)
seen := make(sets.String, len(all)) seen := make(sets.Set[string], len(all))
return func(resp *Response) (bool, error) { return func(resp *Response) (bool, error) {
bs := string(resp.Body) bs := string(resp.Body)

View File

@ -237,7 +237,7 @@ func (ac *Reconciler) Admit(ctx context.Context, request *admissionv1.AdmissionR
func (ac *Reconciler) reconcileMutatingWebhook(ctx context.Context, caCert []byte) error { func (ac *Reconciler) reconcileMutatingWebhook(ctx context.Context, caCert []byte) error {
// Build a deduplicated list of all of the GVKs we see. // Build a deduplicated list of all of the GVKs we see.
gks := map[schema.GroupKind]sets.String{} gks := map[schema.GroupKind]sets.Set[string]{}
// When reconciling the webhook, enumerate all of the bindings, so that // When reconciling the webhook, enumerate all of the bindings, so that
// we can index them to efficiently respond to webhook requests. // we can index them to efficiently respond to webhook requests.
@ -259,7 +259,7 @@ func (ac *Reconciler) reconcileMutatingWebhook(ctx context.Context, caCert []byt
} }
set := gks[gk] set := gks[gk]
if set == nil { if set == nil {
set = make(sets.String, 1) set = make(sets.Set[string], 1)
} }
set.Insert(gv.Version) set.Insert(gv.Version)
gks[gk] = set gks[gk] = set
@ -307,7 +307,7 @@ func (ac *Reconciler) reconcileMutatingWebhook(ctx context.Context, caCert []byt
}, },
Rule: admissionregistrationv1.Rule{ Rule: admissionregistrationv1.Rule{
APIGroups: []string{gk.Group}, APIGroups: []string{gk.Group},
APIVersions: versions.List(), APIVersions: sets.List(versions),
Resources: []string{plural + "/*"}, Resources: []string{plural + "/*"},
}, },
}) })

View File

@ -229,7 +229,7 @@ func (r *BaseReconciler) IsFinalizing(ctx context.Context, fb kmeta.Accessor) bo
// form of this BaseReconciler's GVR's stringified GroupResource. // form of this BaseReconciler's GVR's stringified GroupResource.
func (r *BaseReconciler) EnsureFinalizer(ctx context.Context, fb kmeta.Accessor) error { func (r *BaseReconciler) EnsureFinalizer(ctx context.Context, fb kmeta.Accessor) error {
// If it has the finalizer, then we're done. // If it has the finalizer, then we're done.
finalizers := sets.NewString(fb.GetFinalizers()...) finalizers := sets.New[string](fb.GetFinalizers()...)
if finalizers.Has(r.GVR.GroupResource().String()) { if finalizers.Has(r.GVR.GroupResource().String()) {
return nil return nil
} }