Skip to content
This repository was archived by the owner on May 15, 2025. It is now read-only.

Commit e5e7db9

Browse files
committed
reused envutils (review comment)
Signed-off-by: Maroon Ayoub <[email protected]>
1 parent 8eb5045 commit e5e7db9

File tree

1 file changed

+8
-30
lines changed

1 file changed

+8
-30
lines changed

pkg/epp/scheduling/local_config.go

Lines changed: 8 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -18,12 +18,10 @@ package scheduling
1818

1919
import (
2020
"context"
21-
"os"
22-
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/scheduling/plugins/picker"
23-
"strconv"
24-
2521
"sigs.k8s.io/controller-runtime/pkg/log"
22+
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/scheduling/plugins/picker"
2623
"sigs.k8s.io/gateway-api-inference-extension/pkg/epp/scheduling/plugins/scorer"
24+
envutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/env"
2725
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging"
2826
)
2927

@@ -48,31 +46,21 @@ func setLoadAwareScorer() {
4846
ctx := context.Background()
4947
loggerDebug := log.FromContext(ctx).WithName("scheduler_config").V(logutil.DEBUG)
5048

51-
if os.Getenv(loadAwareScorerEnablementEnvVar) != "true" {
49+
if envutil.GetEnvString(loadAwareScorerEnablementEnvVar, "false", loggerDebug) != "true" {
5250
loggerDebug.Info("Skipping LoadAwareScorer creation as it is not enabled")
5351
return
5452
}
5553

56-
loadBasedScorerWeight := 1
57-
if weightStr := os.Getenv(loadAwareScorerWeightEnvVar); weightStr != "" {
58-
var err error
59-
loadBasedScorerWeightInt64, err := strconv.ParseInt(weightStr, 10, 32)
60-
if err != nil {
61-
loggerDebug.Error(err, "Failed to parse LOAD_BASED_SCORER_WEIGHT")
62-
}
63-
64-
loadBasedScorerWeight = int(loadBasedScorerWeightInt64)
65-
}
66-
67-
loggerDebug.Info("Initialized LoadAwareScorer", "weight", loadBasedScorerWeight)
54+
loadBasedScorerWeight := envutil.GetEnvInt(loadAwareScorerWeightEnvVar, 1, loggerDebug)
6855
defaultConfig.scorers[&scorer.LoadAwareScorer{}] = loadBasedScorerWeight
56+
loggerDebug.Info("Initialized LoadAwareScorer", "weight", loadBasedScorerWeight)
6957
}
7058

7159
func setKVCacheAwareScorer() {
7260
ctx := context.Background()
7361
loggerDebug := log.FromContext(ctx).WithName("scheduler_config").V(logutil.DEBUG)
7462

75-
if os.Getenv(kvCacheScorerEnablementEnvVar) != "true" {
63+
if envutil.GetEnvString(kvCacheScorerEnablementEnvVar, "false", loggerDebug) != "true" {
7664
loggerDebug.Info("Skipping KVCacheAwareScorer creation as it is not enabled")
7765
return
7866
}
@@ -83,17 +71,7 @@ func setKVCacheAwareScorer() {
8371
return
8472
}
8573

86-
kvCacheScorerWeight := 1
87-
if weightStr := os.Getenv(kvCacheScorerWeightEnvVar); weightStr != "" {
88-
var err error
89-
kvCacheScorerWeightInt64, err := strconv.ParseInt(weightStr, 10, 32)
90-
if err != nil {
91-
loggerDebug.Error(err, "Failed to parse KVCACHE_SCORER_WEIGHT")
92-
}
93-
94-
kvCacheScorerWeight = int(kvCacheScorerWeightInt64)
95-
}
96-
97-
loggerDebug.Info("Initialized KVCacheAwareScorer", "weight", kvCacheScorerWeight)
74+
kvCacheScorerWeight := envutil.GetEnvInt(kvCacheScorerWeightEnvVar, 1, loggerDebug)
9875
defaultConfig.scorers[kvCacheScorer] = kvCacheScorerWeight
76+
loggerDebug.Info("Initialized KVCacheAwareScorer", "weight", kvCacheScorerWeight)
9977
}

0 commit comments

Comments
 (0)