Use k8s.io/apimachinery/pkg/util/sets and drop copied packages

shafeeqes · Jan 30, 2023 · 1cfad68 · 1cfad68
1 parent 690d8a8
commit 1cfad68
Show file tree

Hide file tree

Showing 6 changed files with 6 additions and 297 deletions.
diff --git a/pkg/resourcemanager/webhook/systemcomponentsconfig/handler.go b/pkg/resourcemanager/webhook/systemcomponentsconfig/handler.go
@@ -19,15 +19,14 @@ import (
 	"fmt"
 	"strings"
 
+	"github.com/gardener/gardener/pkg/utils"
+	kubernetesutils "github.com/gardener/gardener/pkg/utils/kubernetes"
 	"github.com/go-logr/logr"
 	corev1 "k8s.io/api/core/v1"
 	"k8s.io/apimachinery/pkg/runtime"
+	utilsets "k8s.io/apimachinery/pkg/util/sets"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/webhook/admission"
-
-	"github.com/gardener/gardener/pkg/utils"
-	kubernetesutils "github.com/gardener/gardener/pkg/utils/kubernetes"
-	setsutils "github.com/gardener/gardener/pkg/utils/sets"
 )
 
 // Handler contains required nodeSelector and tolerations information.
@@ -82,7 +81,7 @@ func (h *Handler) handleTolerations(ctx context.Context, log logr.Logger, pod *c
 	}
 
 	var (
-		tolerations = setsutils.New[corev1.Toleration]()
+		tolerations = utilsets.New[corev1.Toleration]()
 
 		// We need to use semantically equal tolerations, i.e. equality of underlying values of pointers,
 		// before they are added to the tolerations set.

diff --git a/pkg/utils/gardener/shoot.go b/pkg/utils/gardener/shoot.go
@@ -29,6 +29,7 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
+	utilsets "k8s.io/apimachinery/pkg/util/sets"
 	clientcmdlatest "k8s.io/client-go/tools/clientcmd/api/latest"
 	clientcmdv1 "k8s.io/client-go/tools/clientcmd/api/v1"
 	"k8s.io/component-base/version"
@@ -45,7 +46,6 @@ import (
 	"github.com/gardener/gardener/pkg/utils"
 	kubernetesutils "github.com/gardener/gardener/pkg/utils/kubernetes"
 	"github.com/gardener/gardener/pkg/utils/secrets"
-	setsutils "github.com/gardener/gardener/pkg/utils/sets"
 	"github.com/gardener/gardener/pkg/utils/timewindow"
 )
 
@@ -496,7 +496,7 @@ func GetShootSeedNames(obj client.Object) (*string, *string) {
 // on the given workers. Tolerations are only considered for workers which have `SystemComponents.Allow: true`.
 func ExtractSystemComponentsTolerations(workers []gardencorev1beta1.Worker) []corev1.Toleration {
 	var (
-		tolerations = setsutils.New[corev1.Toleration]()
+		tolerations = utilsets.New[corev1.Toleration]()
 
 		// We need to use semantically equal tolerations, i.e. equality of underlying values of pointers,
 		// before they are added to the tolerations set.

diff --git a/pkg/utils/sets/ordered.go b/pkg/utils/sets/ordered.go
diff --git a/pkg/utils/sets/set.go b/pkg/utils/sets/set.go
diff --git a/skaffold-operator.yaml b/skaffold-operator.yaml
@@ -114,7 +114,6 @@ build:
         - pkg/utils/managedresources/builder
         - pkg/utils/retry
         - pkg/utils/secrets
-        - pkg/utils/sets
         - pkg/utils/secrets/manager
         - pkg/utils/timewindow
         - pkg/utils/validation/admissionplugins
@@ -214,7 +213,6 @@ build:
         - pkg/utils/kubernetes/unstructured
         - pkg/utils/retry
         - pkg/utils/secrets
-        - pkg/utils/sets
         - pkg/utils/timewindow
         - pkg/utils/validation/admissionplugins
         - pkg/utils/validation/cidr