knative
/
pkg
mirror of https://github.com/knative/pkg.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
client/injection/apiextensions/reconciler/apiextensions/v1/customresourcedefinition/reconciler.go generated
View File

@ -338,14 +338,14 @@ func (r *reconcilerImpl) updateStatus(ctx context.Context, logger *zap.SugaredLo
// updateFinalizersFiltered will update the Finalizers of the resource.
// TODO: this method could be generic and sync all finalizers. For now it only
// 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.
existing := resource.DeepCopy()
var finalizers []string
// 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 existingFinalizers.Has(r.finalizerName) {
@ -361,7 +361,7 @@ func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource
}
// Remove the finalizer.
existingFinalizers.Delete(r.finalizerName)
finalizers = existingFinalizers.List()
finalizers = sets.List(existingFinalizers)
}
mergePatch := map[string]interface{}{
@ -395,7 +395,7 @@ func (r *reconcilerImpl) setFinalizerIfFinalizer(ctx context.Context, resource *
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 resource.GetDeletionTimestamp().IsZero() {
@ -414,7 +414,7 @@ func (r *reconcilerImpl) clearFinalizer(ctx context.Context, resource *v1.Custom
return resource, nil
}
finalizers := sets.NewString(resource.Finalizers...)
finalizers := sets.New[string](resource.Finalizers...)
if reconcileEvent != nil {
var event *reconciler.ReconcilerEvent

10
client/injection/apiextensions/reconciler/apiextensions/v1beta1/customresourcedefinition/reconciler.go generated
View File

@ -338,14 +338,14 @@ func (r *reconcilerImpl) updateStatus(ctx context.Context, logger *zap.SugaredLo
// updateFinalizersFiltered will update the Finalizers of the resource.
// TODO: this method could be generic and sync all finalizers. For now it only
// 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.
existing := resource.DeepCopy()
var finalizers []string
// 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 existingFinalizers.Has(r.finalizerName) {
@ -361,7 +361,7 @@ func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource
}
// Remove the finalizer.
existingFinalizers.Delete(r.finalizerName)
finalizers = existingFinalizers.List()
finalizers = sets.List(existingFinalizers)
}
mergePatch := map[string]interface{}{
@ -395,7 +395,7 @@ func (r *reconcilerImpl) setFinalizerIfFinalizer(ctx context.Context, resource *
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 resource.GetDeletionTimestamp().IsZero() {
@ -414,7 +414,7 @@ func (r *reconcilerImpl) clearFinalizer(ctx context.Context, resource *v1beta1.C
return resource, nil
}
finalizers := sets.NewString(resource.Finalizers...)
finalizers := sets.New[string](resource.Finalizers...)
if reconcileEvent != nil {
var event *reconciler.ReconcilerEvent

10
client/injection/kube/reconciler/admissionregistration/v1/mutatingwebhookconfiguration/reconciler.go generated
View File

@ -271,14 +271,14 @@ func (r *reconcilerImpl) Reconcile(ctx context.Context, key string) error {
// updateFinalizersFiltered will update the Finalizers of the resource.
// TODO: this method could be generic and sync all finalizers. For now it only
// 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.
existing := resource.DeepCopy()
var finalizers []string
// 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 existingFinalizers.Has(r.finalizerName) {
@ -294,7 +294,7 @@ func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource
}
// Remove the finalizer.
existingFinalizers.Delete(r.finalizerName)
finalizers = existingFinalizers.List()
finalizers = sets.List(existingFinalizers)
}
mergePatch := map[string]interface{}{
@ -328,7 +328,7 @@ func (r *reconcilerImpl) setFinalizerIfFinalizer(ctx context.Context, resource *
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 resource.GetDeletionTimestamp().IsZero() {
@ -347,7 +347,7 @@ func (r *reconcilerImpl) clearFinalizer(ctx context.Context, resource *v1.Mutati
return resource, nil
}
finalizers := sets.NewString(resource.Finalizers...)
finalizers := sets.New[string](resource.Finalizers...)
if reconcileEvent != nil {
var event *reconciler.ReconcilerEvent

10
client/injection/kube/reconciler/admissionregistration/v1/validatingwebhookconfiguration/reconciler.go generated
View File

@ -271,14 +271,14 @@ func (r *reconcilerImpl) Reconcile(ctx context.Context, key string) error {
// updateFinalizersFiltered will update the Finalizers of the resource.
// TODO: this method could be generic and sync all finalizers. For now it only
// 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.
existing := resource.DeepCopy()
var finalizers []string
// 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 existingFinalizers.Has(r.finalizerName) {
@ -294,7 +294,7 @@ func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource
}
// Remove the finalizer.
existingFinalizers.Delete(r.finalizerName)
finalizers = existingFinalizers.List()
finalizers = sets.List(existingFinalizers)
}
mergePatch := map[string]interface{}{
@ -328,7 +328,7 @@ func (r *reconcilerImpl) setFinalizerIfFinalizer(ctx context.Context, resource *
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 resource.GetDeletionTimestamp().IsZero() {
@ -347,7 +347,7 @@ func (r *reconcilerImpl) clearFinalizer(ctx context.Context, resource *v1.Valida
return resource, nil
}
finalizers := sets.NewString(resource.Finalizers...)
finalizers := sets.New[string](resource.Finalizers...)
if reconcileEvent != nil {
var event *reconciler.ReconcilerEvent

10
client/injection/kube/reconciler/admissionregistration/v1beta1/mutatingwebhookconfiguration/reconciler.go generated
View File

@ -271,14 +271,14 @@ func (r *reconcilerImpl) Reconcile(ctx context.Context, key string) error {
// updateFinalizersFiltered will update the Finalizers of the resource.
// TODO: this method could be generic and sync all finalizers. For now it only
// 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.
existing := resource.DeepCopy()
var finalizers []string
// 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 existingFinalizers.Has(r.finalizerName) {
@ -294,7 +294,7 @@ func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource
}
// Remove the finalizer.
existingFinalizers.Delete(r.finalizerName)
finalizers = existingFinalizers.List()
finalizers = sets.List(existingFinalizers)
}
mergePatch := map[string]interface{}{
@ -328,7 +328,7 @@ func (r *reconcilerImpl) setFinalizerIfFinalizer(ctx context.Context, resource *
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 resource.GetDeletionTimestamp().IsZero() {
@ -347,7 +347,7 @@ func (r *reconcilerImpl) clearFinalizer(ctx context.Context, resource *v1beta1.M
return resource, nil
}
finalizers := sets.NewString(resource.Finalizers...)
finalizers := sets.New[string](resource.Finalizers...)
if reconcileEvent != nil {
var event *reconciler.ReconcilerEvent

10
client/injection/kube/reconciler/admissionregistration/v1beta1/validatingwebhookconfiguration/reconciler.go generated
View File

@ -271,14 +271,14 @@ func (r *reconcilerImpl) Reconcile(ctx context.Context, key string) error {
// updateFinalizersFiltered will update the Finalizers of the resource.
// TODO: this method could be generic and sync all finalizers. For now it only
// 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.
existing := resource.DeepCopy()
var finalizers []string
// 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 existingFinalizers.Has(r.finalizerName) {
@ -294,7 +294,7 @@ func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource
}
// Remove the finalizer.
existingFinalizers.Delete(r.finalizerName)
finalizers = existingFinalizers.List()
finalizers = sets.List(existingFinalizers)
}
mergePatch := map[string]interface{}{
@ -328,7 +328,7 @@ func (r *reconcilerImpl) setFinalizerIfFinalizer(ctx context.Context, resource *
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 resource.GetDeletionTimestamp().IsZero() {
@ -347,7 +347,7 @@ func (r *reconcilerImpl) clearFinalizer(ctx context.Context, resource *v1beta1.V
return resource, nil
}
finalizers := sets.NewString(resource.Finalizers...)
finalizers := sets.New[string](resource.Finalizers...)
if reconcileEvent != nil {
var event *reconciler.ReconcilerEvent

10
client/injection/kube/reconciler/apps/v1/deployment/reconciler.go generated
View File

@ -338,14 +338,14 @@ func (r *reconcilerImpl) updateStatus(ctx context.Context, logger *zap.SugaredLo
// updateFinalizersFiltered will update the Finalizers of the resource.
// TODO: this method could be generic and sync all finalizers. For now it only
// 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.
existing := resource.DeepCopy()
var finalizers []string
// 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 existingFinalizers.Has(r.finalizerName) {
@ -361,7 +361,7 @@ func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource
}
// Remove the finalizer.
existingFinalizers.Delete(r.finalizerName)
finalizers = existingFinalizers.List()
finalizers = sets.List(existingFinalizers)
}
mergePatch := map[string]interface{}{
@ -395,7 +395,7 @@ func (r *reconcilerImpl) setFinalizerIfFinalizer(ctx context.Context, resource *
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 resource.GetDeletionTimestamp().IsZero() {
@ -414,7 +414,7 @@ func (r *reconcilerImpl) clearFinalizer(ctx context.Context, resource *v1.Deploy
return resource, nil
}
finalizers := sets.NewString(resource.Finalizers...)
finalizers := sets.New[string](resource.Finalizers...)
if reconcileEvent != nil {
var event *reconciler.ReconcilerEvent

10
client/injection/kube/reconciler/apps/v1beta1/deployment/reconciler.go generated
View File

@ -338,14 +338,14 @@ func (r *reconcilerImpl) updateStatus(ctx context.Context, logger *zap.SugaredLo
// updateFinalizersFiltered will update the Finalizers of the resource.
// TODO: this method could be generic and sync all finalizers. For now it only
// 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.
existing := resource.DeepCopy()
var finalizers []string
// 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 existingFinalizers.Has(r.finalizerName) {
@ -361,7 +361,7 @@ func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource
}
// Remove the finalizer.
existingFinalizers.Delete(r.finalizerName)
finalizers = existingFinalizers.List()
finalizers = sets.List(existingFinalizers)
}
mergePatch := map[string]interface{}{
@ -395,7 +395,7 @@ func (r *reconcilerImpl) setFinalizerIfFinalizer(ctx context.Context, resource *
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 resource.GetDeletionTimestamp().IsZero() {
@ -414,7 +414,7 @@ func (r *reconcilerImpl) clearFinalizer(ctx context.Context, resource *v1beta1.D
return resource, nil
}
finalizers := sets.NewString(resource.Finalizers...)
finalizers := sets.New[string](resource.Finalizers...)
if reconcileEvent != nil {
var event *reconciler.ReconcilerEvent

10
client/injection/kube/reconciler/apps/v1beta2/deployment/reconciler.go generated
View File

@ -338,14 +338,14 @@ func (r *reconcilerImpl) updateStatus(ctx context.Context, logger *zap.SugaredLo
// updateFinalizersFiltered will update the Finalizers of the resource.
// TODO: this method could be generic and sync all finalizers. For now it only
// 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.
existing := resource.DeepCopy()
var finalizers []string
// 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 existingFinalizers.Has(r.finalizerName) {
@ -361,7 +361,7 @@ func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource
}
// Remove the finalizer.
existingFinalizers.Delete(r.finalizerName)
finalizers = existingFinalizers.List()
finalizers = sets.List(existingFinalizers)
}
mergePatch := map[string]interface{}{
@ -395,7 +395,7 @@ func (r *reconcilerImpl) setFinalizerIfFinalizer(ctx context.Context, resource *
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 resource.GetDeletionTimestamp().IsZero() {
@ -414,7 +414,7 @@ func (r *reconcilerImpl) clearFinalizer(ctx context.Context, resource *v1beta2.D
return resource, nil
}
finalizers := sets.NewString(resource.Finalizers...)
finalizers := sets.New[string](resource.Finalizers...)
if reconcileEvent != nil {
var event *reconciler.ReconcilerEvent

10
client/injection/kube/reconciler/batch/v1/cronjob/reconciler.go generated
View File

@ -338,14 +338,14 @@ func (r *reconcilerImpl) updateStatus(ctx context.Context, logger *zap.SugaredLo
// updateFinalizersFiltered will update the Finalizers of the resource.
// TODO: this method could be generic and sync all finalizers. For now it only
// 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.
existing := resource.DeepCopy()
var finalizers []string
// 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 existingFinalizers.Has(r.finalizerName) {
@ -361,7 +361,7 @@ func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource
}
// Remove the finalizer.
existingFinalizers.Delete(r.finalizerName)
finalizers = existingFinalizers.List()
finalizers = sets.List(existingFinalizers)
}
mergePatch := map[string]interface{}{
@ -395,7 +395,7 @@ func (r *reconcilerImpl) setFinalizerIfFinalizer(ctx context.Context, resource *
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 resource.GetDeletionTimestamp().IsZero() {
@ -414,7 +414,7 @@ func (r *reconcilerImpl) clearFinalizer(ctx context.Context, resource *v1.CronJo
return resource, nil
}
finalizers := sets.NewString(resource.Finalizers...)
finalizers := sets.New[string](resource.Finalizers...)
if reconcileEvent != nil {
var event *reconciler.ReconcilerEvent

10
client/injection/kube/reconciler/batch/v1beta1/cronjob/reconciler.go generated
View File

@ -338,14 +338,14 @@ func (r *reconcilerImpl) updateStatus(ctx context.Context, logger *zap.SugaredLo
// updateFinalizersFiltered will update the Finalizers of the resource.
// TODO: this method could be generic and sync all finalizers. For now it only
// 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.
existing := resource.DeepCopy()
var finalizers []string
// 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 existingFinalizers.Has(r.finalizerName) {
@ -361,7 +361,7 @@ func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource
}
// Remove the finalizer.
existingFinalizers.Delete(r.finalizerName)
finalizers = existingFinalizers.List()
finalizers = sets.List(existingFinalizers)
}
mergePatch := map[string]interface{}{
@ -395,7 +395,7 @@ func (r *reconcilerImpl) setFinalizerIfFinalizer(ctx context.Context, resource *
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 resource.GetDeletionTimestamp().IsZero() {
@ -414,7 +414,7 @@ func (r *reconcilerImpl) clearFinalizer(ctx context.Context, resource *v1beta1.C
return resource, nil
}
finalizers := sets.NewString(resource.Finalizers...)
finalizers := sets.New[string](resource.Finalizers...)
if reconcileEvent != nil {
var event *reconciler.ReconcilerEvent

10
client/injection/kube/reconciler/core/v1/configmap/reconciler.go generated
View File

@ -270,14 +270,14 @@ func (r *reconcilerImpl) Reconcile(ctx context.Context, key string) error {
// updateFinalizersFiltered will update the Finalizers of the resource.
// TODO: this method could be generic and sync all finalizers. For now it only
// 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.
existing := resource.DeepCopy()
var finalizers []string
// 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 existingFinalizers.Has(r.finalizerName) {
@ -293,7 +293,7 @@ func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource
}
// Remove the finalizer.
existingFinalizers.Delete(r.finalizerName)
finalizers = existingFinalizers.List()
finalizers = sets.List(existingFinalizers)
}
mergePatch := map[string]interface{}{
@ -327,7 +327,7 @@ func (r *reconcilerImpl) setFinalizerIfFinalizer(ctx context.Context, resource *
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 resource.GetDeletionTimestamp().IsZero() {
@ -346,7 +346,7 @@ func (r *reconcilerImpl) clearFinalizer(ctx context.Context, resource *v1.Config
return resource, nil
}
finalizers := sets.NewString(resource.Finalizers...)
finalizers := sets.New[string](resource.Finalizers...)
if reconcileEvent != nil {
var event *reconciler.ReconcilerEvent

10
client/injection/kube/reconciler/core/v1/namespace/reconciler.go generated
View File

@ -337,14 +337,14 @@ func (r *reconcilerImpl) updateStatus(ctx context.Context, logger *zap.SugaredLo
// updateFinalizersFiltered will update the Finalizers of the resource.
// TODO: this method could be generic and sync all finalizers. For now it only
// 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.
existing := resource.DeepCopy()
var finalizers []string
// 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 existingFinalizers.Has(r.finalizerName) {
@ -360,7 +360,7 @@ func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource
}
// Remove the finalizer.
existingFinalizers.Delete(r.finalizerName)
finalizers = existingFinalizers.List()
finalizers = sets.List(existingFinalizers)
}
mergePatch := map[string]interface{}{
@ -394,7 +394,7 @@ func (r *reconcilerImpl) setFinalizerIfFinalizer(ctx context.Context, resource *
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 resource.GetDeletionTimestamp().IsZero() {
@ -413,7 +413,7 @@ func (r *reconcilerImpl) clearFinalizer(ctx context.Context, resource *v1.Namesp
return resource, nil
}
finalizers := sets.NewString(resource.Finalizers...)
finalizers := sets.New[string](resource.Finalizers...)
if reconcileEvent != nil {
var event *reconciler.ReconcilerEvent

10
client/injection/kube/reconciler/core/v1/node/reconciler.go generated
View File

@ -337,14 +337,14 @@ func (r *reconcilerImpl) updateStatus(ctx context.Context, logger *zap.SugaredLo
// updateFinalizersFiltered will update the Finalizers of the resource.
// TODO: this method could be generic and sync all finalizers. For now it only
// 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.
existing := resource.DeepCopy()
var finalizers []string
// 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 existingFinalizers.Has(r.finalizerName) {
@ -360,7 +360,7 @@ func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource
}
// Remove the finalizer.
existingFinalizers.Delete(r.finalizerName)
finalizers = existingFinalizers.List()
finalizers = sets.List(existingFinalizers)
}
mergePatch := map[string]interface{}{
@ -394,7 +394,7 @@ func (r *reconcilerImpl) setFinalizerIfFinalizer(ctx context.Context, resource *
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 resource.GetDeletionTimestamp().IsZero() {
@ -413,7 +413,7 @@ func (r *reconcilerImpl) clearFinalizer(ctx context.Context, resource *v1.Node,
return resource, nil
}
finalizers := sets.NewString(resource.Finalizers...)
finalizers := sets.New[string](resource.Finalizers...)
if reconcileEvent != nil {
var event *reconciler.ReconcilerEvent

10
client/injection/kube/reconciler/core/v1/pod/reconciler.go generated
View File

@ -337,14 +337,14 @@ func (r *reconcilerImpl) updateStatus(ctx context.Context, logger *zap.SugaredLo
// updateFinalizersFiltered will update the Finalizers of the resource.
// TODO: this method could be generic and sync all finalizers. For now it only
// 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.
existing := resource.DeepCopy()
var finalizers []string
// 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 existingFinalizers.Has(r.finalizerName) {
@ -360,7 +360,7 @@ func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource
}
// Remove the finalizer.
existingFinalizers.Delete(r.finalizerName)
finalizers = existingFinalizers.List()
finalizers = sets.List(existingFinalizers)
}
mergePatch := map[string]interface{}{
@ -394,7 +394,7 @@ func (r *reconcilerImpl) setFinalizerIfFinalizer(ctx context.Context, resource *
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 resource.GetDeletionTimestamp().IsZero() {
@ -413,7 +413,7 @@ func (r *reconcilerImpl) clearFinalizer(ctx context.Context, resource *v1.Pod, r
return resource, nil
}
finalizers := sets.NewString(resource.Finalizers...)
finalizers := sets.New[string](resource.Finalizers...)
if reconcileEvent != nil {
var event *reconciler.ReconcilerEvent

10
client/injection/kube/reconciler/core/v1/secret/reconciler.go generated
View File

@ -270,14 +270,14 @@ func (r *reconcilerImpl) Reconcile(ctx context.Context, key string) error {
// updateFinalizersFiltered will update the Finalizers of the resource.
// TODO: this method could be generic and sync all finalizers. For now it only
// 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.
existing := resource.DeepCopy()
var finalizers []string
// 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 existingFinalizers.Has(r.finalizerName) {
@ -293,7 +293,7 @@ func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource
}
// Remove the finalizer.
existingFinalizers.Delete(r.finalizerName)
finalizers = existingFinalizers.List()
finalizers = sets.List(existingFinalizers)
}
mergePatch := map[string]interface{}{
@ -327,7 +327,7 @@ func (r *reconcilerImpl) setFinalizerIfFinalizer(ctx context.Context, resource *
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 resource.GetDeletionTimestamp().IsZero() {
@ -346,7 +346,7 @@ func (r *reconcilerImpl) clearFinalizer(ctx context.Context, resource *v1.Secret
return resource, nil
}
finalizers := sets.NewString(resource.Finalizers...)
finalizers := sets.New[string](resource.Finalizers...)
if reconcileEvent != nil {
var event *reconciler.ReconcilerEvent

10
client/injection/kube/reconciler/core/v1/service/reconciler.go generated
View File

@ -337,14 +337,14 @@ func (r *reconcilerImpl) updateStatus(ctx context.Context, logger *zap.SugaredLo
// updateFinalizersFiltered will update the Finalizers of the resource.
// TODO: this method could be generic and sync all finalizers. For now it only
// 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.
existing := resource.DeepCopy()
var finalizers []string
// 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 existingFinalizers.Has(r.finalizerName) {
@ -360,7 +360,7 @@ func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource
}
// Remove the finalizer.
existingFinalizers.Delete(r.finalizerName)
finalizers = existingFinalizers.List()
finalizers = sets.List(existingFinalizers)
}
mergePatch := map[string]interface{}{
@ -394,7 +394,7 @@ func (r *reconcilerImpl) setFinalizerIfFinalizer(ctx context.Context, resource *
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 resource.GetDeletionTimestamp().IsZero() {
@ -413,7 +413,7 @@ func (r *reconcilerImpl) clearFinalizer(ctx context.Context, resource *v1.Servic
return resource, nil
}
finalizers := sets.NewString(resource.Finalizers...)
finalizers := sets.New[string](resource.Finalizers...)
if reconcileEvent != nil {
var event *reconciler.ReconcilerEvent

10
client/injection/kube/reconciler/core/v1/serviceaccount/reconciler.go generated
View File

@ -270,14 +270,14 @@ func (r *reconcilerImpl) Reconcile(ctx context.Context, key string) error {
// updateFinalizersFiltered will update the Finalizers of the resource.
// TODO: this method could be generic and sync all finalizers. For now it only
// 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.
existing := resource.DeepCopy()
var finalizers []string
// 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 existingFinalizers.Has(r.finalizerName) {
@ -293,7 +293,7 @@ func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource
}
// Remove the finalizer.
existingFinalizers.Delete(r.finalizerName)
finalizers = existingFinalizers.List()
finalizers = sets.List(existingFinalizers)
}
mergePatch := map[string]interface{}{
@ -327,7 +327,7 @@ func (r *reconcilerImpl) setFinalizerIfFinalizer(ctx context.Context, resource *
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 resource.GetDeletionTimestamp().IsZero() {
@ -346,7 +346,7 @@ func (r *reconcilerImpl) clearFinalizer(ctx context.Context, resource *v1.Servic
return resource, nil
}
finalizers := sets.NewString(resource.Finalizers...)
finalizers := sets.New[string](resource.Finalizers...)
if reconcileEvent != nil {
var event *reconciler.ReconcilerEvent

10
client/injection/kube/reconciler/extensions/v1beta1/deployment/reconciler.go generated
View File

@ -338,14 +338,14 @@ func (r *reconcilerImpl) updateStatus(ctx context.Context, logger *zap.SugaredLo
// updateFinalizersFiltered will update the Finalizers of the resource.
// TODO: this method could be generic and sync all finalizers. For now it only
// 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.
existing := resource.DeepCopy()
var finalizers []string
// 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 existingFinalizers.Has(r.finalizerName) {
@ -361,7 +361,7 @@ func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource
}
// Remove the finalizer.
existingFinalizers.Delete(r.finalizerName)
finalizers = existingFinalizers.List()
finalizers = sets.List(existingFinalizers)
}
mergePatch := map[string]interface{}{
@ -395,7 +395,7 @@ func (r *reconcilerImpl) setFinalizerIfFinalizer(ctx context.Context, resource *
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 resource.GetDeletionTimestamp().IsZero() {
@ -414,7 +414,7 @@ func (r *reconcilerImpl) clearFinalizer(ctx context.Context, resource *v1beta1.D
return resource, nil
}
finalizers := sets.NewString(resource.Finalizers...)
finalizers := sets.New[string](resource.Finalizers...)
if reconcileEvent != nil {
var event *reconciler.ReconcilerEvent

10
client/injection/kube/reconciler/extensions/v1beta1/networkpolicy/reconciler.go generated
View File

@ -338,14 +338,14 @@ func (r *reconcilerImpl) updateStatus(ctx context.Context, logger *zap.SugaredLo
// updateFinalizersFiltered will update the Finalizers of the resource.
// TODO: this method could be generic and sync all finalizers. For now it only
// 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.
existing := resource.DeepCopy()
var finalizers []string
// 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 existingFinalizers.Has(r.finalizerName) {
@ -361,7 +361,7 @@ func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource
}
// Remove the finalizer.
existingFinalizers.Delete(r.finalizerName)
finalizers = existingFinalizers.List()
finalizers = sets.List(existingFinalizers)
}
mergePatch := map[string]interface{}{
@ -395,7 +395,7 @@ func (r *reconcilerImpl) setFinalizerIfFinalizer(ctx context.Context, resource *
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 resource.GetDeletionTimestamp().IsZero() {
@ -414,7 +414,7 @@ func (r *reconcilerImpl) clearFinalizer(ctx context.Context, resource *v1beta1.N
return resource, nil
}
finalizers := sets.NewString(resource.Finalizers...)
finalizers := sets.New[string](resource.Finalizers...)
if reconcileEvent != nil {
var event *reconciler.ReconcilerEvent

10
client/injection/kube/reconciler/networking/v1/networkpolicy/reconciler.go generated
View File

@ -338,14 +338,14 @@ func (r *reconcilerImpl) updateStatus(ctx context.Context, logger *zap.SugaredLo
// updateFinalizersFiltered will update the Finalizers of the resource.
// TODO: this method could be generic and sync all finalizers. For now it only
// 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.
existing := resource.DeepCopy()
var finalizers []string
// 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 existingFinalizers.Has(r.finalizerName) {
@ -361,7 +361,7 @@ func (r *reconcilerImpl) updateFinalizersFiltered(ctx context.Context, resource
}
// Remove the finalizer.
existingFinalizers.Delete(r.finalizerName)
finalizers = existingFinalizers.List()
finalizers = sets.List(existingFinalizers)
}
mergePatch := map[string]interface{}{
@ -395,7 +395,7 @@ func (r *reconcilerImpl) setFinalizerIfFinalizer(ctx context.Context, resource *
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 resource.GetDeletionTimestamp().IsZero() {
@ -414,7 +414,7 @@ func (r *reconcilerImpl) clearFinalizer(ctx context.Context, resource *v1.Networ
return resource, nil
}
finalizers := sets.NewString(resource.Finalizers...)
finalizers := sets.New[string](resource.Finalizers...)
if reconcileEvent != nil {
var event *reconciler.ReconcilerEvent

6
codegen/cmd/injection-gen/generators/reconciler_reconciler.go
View File

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

4
configmap/informer/synced_callback.go
View File

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

6
configmap/parse.go
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.
func AsStringSet(key string, target *sets.String) ParseFunc {
// 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.Set[string]) ParseFunc {
return func(data map[string]string) error {
if raw, ok := data[key]; ok {
splitted := strings.Split(raw, ",")
for i, v := range splitted {
splitted[i] = strings.TrimSpace(v)
}
*target = sets.NewString(splitted...)
*target = sets.New[string](splitted...)
}
return nil
}

4
configmap/parse_test.go
View File

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

10
hash/bucketer.go
View File

@ -38,7 +38,7 @@ type BucketSet struct {
// mu guards buckets.
mu sync.RWMutex
// All the bucket names. Needed for building hash universe.
buckets sets.String
buckets sets.Set[string]
}
// 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
// of bucket names.
func NewBucketSet(bucketList sets.String) *BucketSet {
func NewBucketSet(bucketList sets.Set[string]) *BucketSet {
return &BucketSet{
cache: newCache(),
buckets: bucketList,
@ -106,7 +106,7 @@ func (bs *BucketSet) Owner(key string) string {
}
// 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 {
return key, true
}
@ -124,11 +124,11 @@ func (bs *BucketSet) BucketList() []string {
bs.mu.RLock()
defer bs.mu.RUnlock()
return bs.buckets.List()
return sets.List(bs.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()
defer bs.mu.Unlock()
// In theory we can iterate over the map and

8
hash/bucketer_test.go
View File

@ -32,7 +32,7 @@ const (
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) {
b := NewBucketSet(buckets)
@ -68,7 +68,7 @@ func TestBucketSetList(t *testing.T) {
bs := NewBucketSet(buckets)
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))
}
}
@ -78,7 +78,7 @@ func TestBucketSetUpdate(t *testing.T) {
b.Owner(knownKey)
// Need a clone.
newNames := buckets.Difference(sets.NewString(otherBucket))
newNames := buckets.Difference(sets.New[string](otherBucket))
b.Update(newNames)
if b.cache.Len() != 0 {
t.Error("cache was not emptied")
@ -117,7 +117,7 @@ func TestBucketSetBuckets(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) {
t.Errorf("HasBucket(%v) = false", thisBucket)
}

12
hash/hash.go
View File

@ -60,8 +60,8 @@ type hashData struct {
step int
}
func (hd *hashData) fromIndexSet(s sets.Int) sets.String {
ret := make(sets.String, len(s))
func (hd *hashData) fromIndexSet(s sets.Set[int]) sets.Set[string] {
ret := make(sets.Set[string], len(s))
for v := range s {
ret.Insert(hd.nameForHIndex(v))
}
@ -72,14 +72,14 @@ func (hd *hashData) nameForHIndex(hi int) string {
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
// `go test -run=TestOverlay -count=200`.
// This is to ensure there is no regression in the selection
// algorithm.
// 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.
buf := bytes.NewBufferString(target)
buf.WriteString(startSalt)
@ -126,7 +126,7 @@ func buildHashes(in sets.String, target string) *hashData {
// ChooseSubset is an internal function and presumes sanitized inputs.
// TODO(vagababov): once initial impl is ready, think about how to cache
// 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) {
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
// 3. Advance angle by `step`
// 4. Goto 1.
selection := sets.NewInt()
selection := sets.New[int]()
angle := hashData.start
hpl := len(hashData.hashPool)
for len(selection) < n {

34
hash/hash_test.go
View File

@ -33,7 +33,7 @@ func ExampleChooseSubset_selectOne() {
// This example shows how to do consistent bucket
// assignment using ChooseSubset.
tasks := sets.NewString("task1", "task2", "task3")
tasks := sets.New[string]("task1", "task2", "task3")
ret := ChooseSubset(tasks, 1, "my-key1")
fmt.Println(ret.UnsortedList()[0])
@ -48,16 +48,16 @@ func ExampleChooseSubset_selectMany() {
// This example shows how to do consistent bucket
// 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")
fmt.Println(ret.List())
fmt.Println(sets.List(ret))
// Output: [task3 task4]
}
func TestBuildHashes(t *testing.T) {
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)
hd2 := buildHashes(set, target)
@ -77,34 +77,34 @@ func TestBuildHashes(t *testing.T) {
func TestChooseSubset(t *testing.T) {
tests := []struct {
name string
from sets.String
from sets.Set[string]
target string
wantNum int
want sets.String
want sets.Set[string]
}{{
name: "return all",
from: sets.NewString("sun", "moon", "mars", "mercury"),
from: sets.New[string]("sun", "moon", "mars", "mercury"),
target: "a target!",
wantNum: 4,
want: sets.NewString("sun", "moon", "mars", "mercury"),
want: sets.New[string]("sun", "moon", "mars", "mercury"),
}, {
name: "subset 1",
from: sets.NewString("sun", "moon", "mars", "mercury"),
from: sets.New[string]("sun", "moon", "mars", "mercury"),
target: "a target!",
wantNum: 2,
want: sets.NewString("mercury", "moon"),
want: sets.New[string]("mercury", "moon"),
}, {
name: "subset 2",
from: sets.NewString("sun", "moon", "mars", "mercury"),
from: sets.New[string]("sun", "moon", "mars", "mercury"),
target: "something else entirely",
wantNum: 2,
want: sets.NewString("mercury", "mars"),
want: sets.New[string]("mercury", "mars"),
}, {
name: "select 3",
from: sets.NewString("sun", "moon", "mars", "mercury"),
from: sets.New[string]("sun", "moon", "mars", "mercury"),
target: "something else entirely",
wantNum: 3,
want: sets.NewString("mars", "mercury", "sun"),
want: sets.New[string]("mars", "mercury", "sun"),
}}
for _, tc := range tests {
@ -131,7 +131,7 @@ func TestCollisionHandling(t *testing.T) {
if 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 {
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
threshold = want / 5 // 20%
)
from := sets.NewString()
from := sets.New[string]()
for i := 0; i < sources; i++ {
from.Insert(uuid.NewString())
}
@ -184,7 +184,7 @@ func BenchmarkSelection(b *testing.B) {
for _, ss := range []int{1, 5, 10, 15, 20, 25} {
b.Run(fmt.Sprintf("pool-%d-subset-%d", v, ss), func(b *testing.B) {
target := uuid.NewString()
in := sets.NewString(from[:v]...)
in := sets.New[string](from[:v]...)
for i := 0; i < b.N; i++ {
ChooseSubset(in, 10, target)
}

4
kflag/set.go
View File

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

6
leaderelection/chaosduck/main.go
View File

@ -42,7 +42,7 @@ import (
)
// 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 (
disabledComponents kflag.StringSet
@ -100,7 +100,7 @@ func buildComponents(ctx context.Context, kc kubernetes.Interface) (components,
set, ok := cs[deploymentName]
if !ok {
set = make(sets.String, 1)
set = make(sets.Set[string], 1)
cs[deploymentName] = set
}
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.
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()
if !ok {
return errors.New("this should not be possible, since components are only created when they have components")

4
leaderelection/context.go
View File

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

8
leaderelection/context_test.go
View File

@ -45,7 +45,7 @@ func TestWithBuilder(t *testing.T) {
kc := fakekube.NewSimpleClientset()
ctx := context.Background()
gotNames := make(sets.String, buckets)
gotNames := make(sets.Set[string], buckets)
promoted := make(chan string)
demoted := make(chan struct{})
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.01-of-03",
"the-component.name.02-of-03",
@ -178,7 +178,7 @@ func TestBuilderWithCustomizedLeaseName(t *testing.T) {
kc := fakekube.NewSimpleClientset()
ctx := context.Background()
gotNames := make(sets.String, buckets)
gotNames := make(sets.Set[string], buckets)
promoted := make(chan string)
laf := &reconciler.LeaderAwareFuncs{
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-01",
"bucket-02",

2
logging/object_encoders.go
View File

@ -37,7 +37,7 @@ import (
//
// logger.Info("Revision State", zap.Object("healthy", logging.StringSet(healthySet)),
// 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 {
enc.AddString("keys", strings.Join(s.UnsortedList(), ","))
return nil

4
reconciler/testing/table.go
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}.
// Adding type will help catch the bugs where several similarly named
// 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 {
n := w.GetResource().Resource + "~~" + w.GetName()
if !r.SkipNamespaceValidation {
@ -297,7 +297,7 @@ func (r *TableRow) Test(t *testing.T, factory Factory) {
}
gotDeletes.Insert(n)
}
wantDeletes := make(sets.String, len(actions.Deletes))
wantDeletes := make(sets.Set[string], len(actions.Deletes))
for _, w := range r.WantDeletes {
n := w.GetResource().Resource + "~~" + w.GetName()
if !r.SkipNamespaceValidation {

6
test/ha/ha.go
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
// 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)
defer span.End()
var leaders sets.String
var leaders sets.Set[string]
err := wait.PollImmediate(time.Second, time.Minute, func() (bool, error) {
currLeaders, err := GetLeaders(ctx, t, client, deploymentName, namespace)
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)
return false, nil
}
l := sets.NewString(currLeaders...)
l := sets.New[string](currLeaders...)
if previousLeaders.HasAny(currLeaders...) {
t.Logf("WaitForNewLeaders[%s] still see intersection: %v", deploymentName, previousLeaders.Intersection(l))
return false, nil

4
test/spoof/response_checks.go
View File

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

6
webhook/psbinding/psbinding.go
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 {
// 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
// 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]
if set == nil {
set = make(sets.String, 1)
set = make(sets.Set[string], 1)
}
set.Insert(gv.Version)
gks[gk] = set
@ -307,7 +307,7 @@ func (ac *Reconciler) reconcileMutatingWebhook(ctx context.Context, caCert []byt
},
Rule: admissionregistrationv1.Rule{
APIGroups: []string{gk.Group},
APIVersions: versions.List(),
APIVersions: sets.List(versions),
Resources: []string{plural + "/*"},
},
})

2
webhook/psbinding/reconciler.go
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.
func (r *BaseReconciler) EnsureFinalizer(ctx context.Context, fb kmeta.Accessor) error {
// 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()) {
return nil
}