Refactor Redis configuration handling in KV cache scorer

go.mod

@@ -10,8 +10,9 @@ require (
 	github.com/go-logr/logr v1.4.2
 	github.com/google/go-cmp v0.7.0
 	github.com/hashicorp/golang-lru/v2 v2.0.7
-	github.com/llm-d/llm-d-kv-cache-manager v0.1.0
+	github.com/llm-d/llm-d-kv-cache-manager v0.1.1
 	github.com/prometheus/client_golang v1.22.0
+	github.com/redis/go-redis/v9 v9.7.3
 	github.com/stretchr/testify v1.10.0
 	go.uber.org/zap v1.27.0
 	google.golang.org/grpc v1.72.0
@@ -65,7 +66,6 @@ require (
 	github.com/prometheus/client_model v0.6.2 // indirect
 	github.com/prometheus/common v0.64.0 // indirect
 	github.com/prometheus/procfs v0.15.1 // indirect
-	github.com/redis/go-redis/v9 v9.7.3 // indirect
 	github.com/spf13/cobra v1.9.1 // indirect
 	github.com/spf13/pflag v1.0.6 // indirect
 	github.com/stoewer/go-strcase v1.3.0 // indirect

go.sum

@@ -98,8 +98,8 @@ github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
 github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
 github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
-github.com/llm-d/llm-d-kv-cache-manager v0.1.0 h1:TabMsVni2AqxsfQtcT3jVjSPvExlbTieJejSVNwlkZ0=
-github.com/llm-d/llm-d-kv-cache-manager v0.1.0/go.mod h1:Hu7RvpUg5sP1xnQFfO2dbt96AjGPWKuUvWBWiHj/FUU=
+github.com/llm-d/llm-d-kv-cache-manager v0.1.1 h1:k3dpbnXdQ8JBz6tYtaUba58/YVuxiJ6O3Um4bJEjR3I=
+github.com/llm-d/llm-d-kv-cache-manager v0.1.1/go.mod h1:Hu7RvpUg5sP1xnQFfO2dbt96AjGPWKuUvWBWiHj/FUU=
 github.com/mailru/easyjson v0.7.7 h1:UGYAvKxe3sBsEDzO8ZeWOSlIQfWFlxbzLZe7hwFURr0=
 github.com/mailru/easyjson v0.7.7/go.mod h1:xzfreul335JAWq5oZzymOObrkdz5UnU4kGfJJLY9Nlc=
 github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=

pkg/config/config_test.go

@@ -0,0 +1,25 @@
+package config
+
+import (
+	"github.com/redis/go-redis/v9"
+	"strings"
+
+	//"github.com/redis/go-redis/v9"
+	"github.com/stretchr/testify/assert"
+	"testing"
+)
+
+func TestURLParse(t *testing.T) {
+	urlInst := "bd73f810-0eea-46a9-b330-84c9bc36d00d.blrrvkdw0thh68l98t20.private.databases.appdomain.cloud:31394"
+	if !(strings.HasPrefix(urlInst, "redis://") || strings.HasPrefix(urlInst, "rediss://") || strings.HasPrefix(urlInst, "unix://")) {
+		urlInst = "redis://" + urlInst
+	}
+	t.Log(urlInst)
+	opr, err := redis.ParseURL(urlInst)
+	assert.NoError(t, err)
+	t.Log(opr.Addr)
+	t.Log(opr.Username)
+	t.Log(opr.Password)
+	t.Log(opr.DB)
+	t.Log(opr.TLSConfig)
+}

pkg/scheduling/plugins/scorer/kvcache-aware.go

@@ -4,6 +4,9 @@ import (
 	"context"
 	"fmt"
 	"os"
+	"strings"
+
+	"github.com/redis/go-redis/v9"
 
 	kvcache "github.com/llm-d/llm-d-kv-cache-manager/pkg/kv-cache"
 
@@ -37,7 +40,16 @@ func NewKVCacheAwareScorer(ctx context.Context) (plugins.Scorer, error) {
 
 	redisAddr := os.Getenv(kvCacheRedisEnvVar)
 	if redisAddr != "" {
-		config.KVBlockIndexerConfig.RedisAddr = redisAddr
+		// to keep compatibility with deployments only specifying hostname:port: need to add protocol to front to enable parsing
+		if !strings.HasPrefix(redisAddr, "redis://") && !strings.HasPrefix(redisAddr, "rediss://") && !strings.HasPrefix(redisAddr, "unix://") {
+			redisAddr = "redis://" + redisAddr
+		}
+		redisOpt, err := redis.ParseURL(redisAddr)
+		if err != nil {
+			return nil, fmt.Errorf("failed to parse redisURL: %w", err)
+		}
+
+		config.KVBlockIndexerConfig.RedisOpt = redisOpt
 	} else {
 		return nil, fmt.Errorf("environment variable %s is not set", kvCacheRedisEnvVar)
 	}