replaced cache

Author: mfaizanse

go.mod

@@ -7,7 +7,6 @@ require (
 	github.com/avast/retry-go/v3 v3.1.1
 	github.com/dustin/go-humanize v1.0.1
 	github.com/go-logr/logr v1.4.1
-	github.com/jellydator/ttlcache/v3 v3.2.0
 	github.com/kelseyhightower/envconfig v1.4.0
 	github.com/nats-io/nats-server/v2 v2.10.11
 	github.com/nats-io/nats.go v1.33.1

go.sum

@@ -317,8 +317,6 @@ github.com/imdario/mergo v0.3.16 h1:wwQJbIsHYGMUyLSPrEq1CT16AhnhNJQ51+4fdHUnCl4=
 github.com/imdario/mergo v0.3.16/go.mod h1:WBLT9ZmE3lPoWsEzCh9LPo3TiwVN+ZKEjmz+hD27ysY=
 github.com/inconshreveable/mousetrap v1.1.0 h1:wN+x4NVGpMsO7ErUn/mUI3vEoE6Jt13X2s0bqwp9tc8=
 github.com/inconshreveable/mousetrap v1.1.0/go.mod h1:vpF70FUmC8bwa3OWnCshd2FqLfsEA9PFc4w1p2J65bw=
-github.com/jellydator/ttlcache/v3 v3.2.0 h1:6lqVJ8X3ZaUwvzENqPAobDsXNExfUJd61u++uW8a3LE=
-github.com/jellydator/ttlcache/v3 v3.2.0/go.mod h1:hi7MGFdMAwZna5n2tuvh63DvFLzVKySzCVW6+0gA2n4=
 github.com/jinzhu/copier v0.3.5 h1:GlvfUwHk62RokgqVNvYsku0TATCF7bAHVwEXoBh3iJg=
 github.com/jinzhu/copier v0.3.5/go.mod h1:DfbEm0FYsaqBcKcFuvmOZb218JkPGtvSHsKg8S8hyyg=
 github.com/jmoiron/sqlx v1.3.5 h1:vFFPA71p1o5gAeqtEAwLU4dnX2napprKtHr7PYIcN3g=

pkg/k8s/client.go

@@ -5,9 +5,7 @@ import (
 	"errors"
 	"fmt"
 	"strings"
-	"time"
 
-	"github.com/jellydator/ttlcache/v3"
 	kappsv1 "k8s.io/api/apps/v1"
 	kcorev1 "k8s.io/api/core/v1"
 	kapiextv1 "k8s.io/apiextensions-apiserver/pkg/apis/apiextensions/v1"
@@ -41,7 +39,6 @@ type Client interface {
 }
 
 const (
-	nodesZoneTTL     = 10 * time.Hour
 	nodeZoneLabelKey = "topology.kubernetes.io/zone"
 )
 
@@ -51,21 +48,15 @@ type KubeClient struct {
 	client         client.Client
 	clientset      kapiextclientset.Interface
 	fieldManager   string
-	nodesZoneCache *ttlcache.Cache[string, string]
+	nodesZoneCache map[string]string
 }
 
 func NewKubeClient(client client.Client, clientset kapiextclientset.Interface, fieldManager string) Client {
-	// initialize the cache for the nodes zone information.
-	nodesZoneCache := ttlcache.New[string, string](
-		ttlcache.WithTTL[string, string](nodesZoneTTL),
-		ttlcache.WithDisableTouchOnHit[string, string](),
-	)
-
 	return &KubeClient{
 		client:         client,
 		clientset:      clientset,
 		fieldManager:   fieldManager,
-		nodesZoneCache: nodesZoneCache,
+		nodesZoneCache: make(map[string]string),
 	}
 }
 
@@ -163,15 +154,10 @@ func (c *KubeClient) GetNode(ctx context.Context, name string) (*kcorev1.Node, e
 // GetNodeZone returns the zone information of the node.
 // It caches the zone information of the node for a certain duration.
 func (c *KubeClient) GetNodeZone(ctx context.Context, name string) (string, error) {
-	// delete expired entries from the cache.
-	c.nodesZoneCache.DeleteExpired()
-
 	// check if the zone information is already in the cache.
-	if c.nodesZoneCache.Has(name) {
-		item := c.nodesZoneCache.Get(name)
-		if item.Value() != "" {
-			return item.Value(), nil
-		}
+	cacheValue, ok := c.nodesZoneCache[name]
+	if ok && cacheValue != "" {
+		return cacheValue, nil
 	}
 
 	// get the node from kubernetes.
@@ -187,7 +173,7 @@ func (c *KubeClient) GetNodeZone(ctx context.Context, name string) (string, erro
 	}
 
 	// set the zone information in the cache.
-	c.nodesZoneCache.Set(name, zone, nodesZoneTTL)
+	c.nodesZoneCache[name] = zone
 
 	// return the zone information.
 	return zone, nil

pkg/k8s/client_test.go

@@ -528,7 +528,7 @@ func Test_GetNodeZone(t *testing.T) {
 			if tc.givenExistsInCache {
 				kcStruct, ok := kubeClient.(*KubeClient)
 				require.True(t, ok)
-				kcStruct.nodesZoneCache.Set(tc.givenNode.GetName(), givenLabels[nodeZoneLabelKey], nodesZoneTTL)
+				kcStruct.nodesZoneCache[tc.givenNode.GetName()] = givenLabels[nodeZoneLabelKey]
 			}
 
 			// when
@@ -547,9 +547,9 @@ func Test_GetNodeZone(t *testing.T) {
 			// check cache entry.
 			kcStruct, ok := kubeClient.(*KubeClient)
 			require.True(t, ok)
-			require.True(t, kcStruct.nodesZoneCache.Has(tc.givenNode.GetName()))
-			item := kcStruct.nodesZoneCache.Get(tc.givenNode.GetName())
-			require.Equal(t, tc.wantZone, item.Value())
+			gotValue, ok := kcStruct.nodesZoneCache[tc.givenNode.GetName()]
+			require.True(t, ok)
+			require.Equal(t, tc.wantZone, gotValue)
 		})
 	}
 }