From 3325c7031deb6509c0b49db7972d7e5425aec076 Mon Sep 17 00:00:00 2001
From: Lars Ekman <lars.g.ekman@est.tech>
Date: Sun, 19 Feb 2023 17:48:13 +0100
Subject: [PATCH] Generic sets in ipset.go

---
 pkg/proxy/ipvs/ipset.go   | 12 ++++++------
 pkg/proxy/ipvs/proxier.go |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/pkg/proxy/ipvs/ipset.go b/pkg/proxy/ipvs/ipset.go
index 6cb4736f7a8..f77280d6bcf 100644
--- a/pkg/proxy/ipvs/ipset.go
+++ b/pkg/proxy/ipvs/ipset.go
@@ -93,7 +93,7 @@ type IPSetVersioner interface {
 type IPSet struct {
 	utilipset.IPSet
 	// activeEntries is the current active entries of the ipset.
-	activeEntries sets.String
+	activeEntries sets.Set[string]
 	// handle is the util ipset interface handle.
 	handle utilipset.Interface
 }
@@ -125,7 +125,7 @@ func NewIPSet(handle utilipset.Interface, name string, setType utilipset.Type, i
 			HashFamily: hashFamily,
 			Comment:    comment,
 		},
-		activeEntries: sets.NewString(),
+		activeEntries: sets.New[string](),
 		handle:        handle,
 	}
 	return set
@@ -144,7 +144,7 @@ func (set *IPSet) getComment() string {
 }
 
 func (set *IPSet) resetEntries() {
-	set.activeEntries = sets.NewString()
+	set.activeEntries = sets.New[string]()
 }
 
 func (set *IPSet) syncIPSetEntries() {
@@ -155,14 +155,14 @@ func (set *IPSet) syncIPSetEntries() {
 	}
 
 	// currentIPSetEntries represents Endpoints watched from API Server.
-	currentIPSetEntries := sets.NewString()
+	currentIPSetEntries := sets.New[string]()
 	for _, appliedEntry := range appliedEntries {
 		currentIPSetEntries.Insert(appliedEntry)
 	}
 
 	if !set.activeEntries.Equal(currentIPSetEntries) {
 		// Clean legacy entries
-		for _, entry := range currentIPSetEntries.Difference(set.activeEntries).List() {
+		for _, entry := range currentIPSetEntries.Difference(set.activeEntries).UnsortedList() {
 			if err := set.handle.DelEntry(entry, set.Name); err != nil {
 				if !utilipset.IsNotFoundError(err) {
 					klog.ErrorS(err, "Failed to delete ip set entry from ip set", "ipSetEntry", entry, "ipSet", set.Name)
@@ -172,7 +172,7 @@ func (set *IPSet) syncIPSetEntries() {
 			}
 		}
 		// Create active entries
-		for _, entry := range set.activeEntries.Difference(currentIPSetEntries).List() {
+		for _, entry := range set.activeEntries.Difference(currentIPSetEntries).UnsortedList() {
 			if err := set.handle.AddEntry(entry, &set.IPSet, true); err != nil {
 				klog.ErrorS(err, "Failed to add ip set entry to ip set", "ipSetEntry", entry, "ipSet", set.Name)
 			} else {
diff --git a/pkg/proxy/ipvs/proxier.go b/pkg/proxy/ipvs/proxier.go
index 257a5512a79..e9d073d09f8 100644
--- a/pkg/proxy/ipvs/proxier.go
+++ b/pkg/proxy/ipvs/proxier.go
@@ -1501,7 +1501,7 @@ func (proxier *Proxier) syncProxyRules() {
 	}
 
 	// Set the KUBE-IPVS-IPS set to the "activeBindAddrs"
-	proxier.ipsetList[kubeIPVSSet].activeEntries = sets.StringKeySet(activeBindAddrs)
+	proxier.ipsetList[kubeIPVSSet].activeEntries = activeBindAddrs
 
 	// sync ipset entries
 	for _, set := range proxier.ipsetList {