@@ -18,12 +18,10 @@ package scheduling
18
18
19
19
import (
20
20
"context"
21
- "os"
22
- "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/scheduling/plugins/picker"
23
- "strconv"
24
-
25
21
"sigs.k8s.io/controller-runtime/pkg/log"
22
+ "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/scheduling/plugins/picker"
26
23
"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"
27
25
logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging"
28
26
)
29
27
@@ -48,31 +46,21 @@ func setLoadAwareScorer() {
48
46
ctx := context .Background ()
49
47
loggerDebug := log .FromContext (ctx ).WithName ("scheduler_config" ).V (logutil .DEBUG )
50
48
51
- if os . Getenv (loadAwareScorerEnablementEnvVar ) != "true" {
49
+ if envutil . GetEnvString (loadAwareScorerEnablementEnvVar , "false" , loggerDebug ) != "true" {
52
50
loggerDebug .Info ("Skipping LoadAwareScorer creation as it is not enabled" )
53
51
return
54
52
}
55
53
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 )
68
55
defaultConfig .scorers [& scorer.LoadAwareScorer {}] = loadBasedScorerWeight
56
+ loggerDebug .Info ("Initialized LoadAwareScorer" , "weight" , loadBasedScorerWeight )
69
57
}
70
58
71
59
func setKVCacheAwareScorer () {
72
60
ctx := context .Background ()
73
61
loggerDebug := log .FromContext (ctx ).WithName ("scheduler_config" ).V (logutil .DEBUG )
74
62
75
- if os . Getenv (kvCacheScorerEnablementEnvVar ) != "true" {
63
+ if envutil . GetEnvString (kvCacheScorerEnablementEnvVar , "false" , loggerDebug ) != "true" {
76
64
loggerDebug .Info ("Skipping KVCacheAwareScorer creation as it is not enabled" )
77
65
return
78
66
}
@@ -83,17 +71,7 @@ func setKVCacheAwareScorer() {
83
71
return
84
72
}
85
73
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 )
98
75
defaultConfig .scorers [kvCacheScorer ] = kvCacheScorerWeight
76
+ loggerDebug .Info ("Initialized KVCacheAwareScorer" , "weight" , kvCacheScorerWeight )
99
77
}
0 commit comments