Skip to content

Commit 8cc1b74

Browse files
committed
scrubbing serviceName & zone as they are obsolete
1 parent 92654eb commit 8cc1b74

File tree

5 files changed

+1
-24
lines changed

5 files changed

+1
-24
lines changed

pkg/ext-proc/backend/inferencepool_reconciler.go

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ type InferencePoolReconciler struct {
2121
Record record.EventRecorder
2222
PoolNamespacedName types.NamespacedName
2323
Datastore *K8sDatastore
24-
Zone string
2524
}
2625

2726
func (c *InferencePoolReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {

pkg/ext-proc/backend/pod_reconciler.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ type PodReconciler struct {
2525
func (c *PodReconciler) Reconcile(ctx context.Context, req ctrl.Request) (ctrl.Result, error) {
2626
inferencePool, err := c.Datastore.getInferencePool()
2727
if err != nil {
28-
klog.V(logutil.DEFAULT).Infof("Skipping reconciling EndpointSlice because the InferencePool is not available yet: %v", err)
28+
klog.V(logutil.DEFAULT).Infof("Skipping reconciling Pod because the InferencePool is not available yet: %v", err)
2929
return ctrl.Result{Requeue: true, RequeueAfter: time.Second}, nil
3030
}
3131

pkg/ext-proc/main.go

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -53,14 +53,6 @@ var (
5353
"poolNamespace",
5454
runserver.DefaultPoolNamespace,
5555
"Namespace of the InferencePool this Endpoint Picker is associated with.")
56-
serviceName = flag.String(
57-
"serviceName",
58-
runserver.DefaultServiceName,
59-
"Name of the Service that will be used to read EndpointSlices from")
60-
zone = flag.String(
61-
"zone",
62-
runserver.DefaultZone,
63-
"The zone that this instance is created in. Will be passed to the corresponding endpointSlice. ")
6456
refreshPodsInterval = flag.Duration(
6557
"refreshPodsInterval",
6658
runserver.DefaultRefreshPodsInterval,
@@ -110,8 +102,6 @@ func main() {
110102
TargetEndpointKey: *targetEndpointKey,
111103
PoolName: *poolName,
112104
PoolNamespace: *poolNamespace,
113-
ServiceName: *serviceName,
114-
Zone: *zone,
115105
RefreshPodsInterval: *refreshPodsInterval,
116106
RefreshMetricsInterval: *refreshMetricsInterval,
117107
RefreshPrometheusMetricsInterval: *refreshPrometheusMetricsInterval,
@@ -221,9 +211,5 @@ func validateFlags() error {
221211
return fmt.Errorf("required %q flag not set", "poolName")
222212
}
223213

224-
if *serviceName == "" {
225-
return fmt.Errorf("required %q flag not set", "serviceName")
226-
}
227-
228214
return nil
229215
}

pkg/ext-proc/server/runserver.go

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,6 @@ type ExtProcServerRunner struct {
2323
TargetEndpointKey string
2424
PoolName string
2525
PoolNamespace string
26-
ServiceName string
27-
Zone string
2826
RefreshPodsInterval time.Duration
2927
RefreshMetricsInterval time.Duration
3028
RefreshPrometheusMetricsInterval time.Duration
@@ -40,8 +38,6 @@ const (
4038
DefaultTargetEndpointKey = "x-gateway-destination-endpoint" // default for --targetEndpointKey
4139
DefaultPoolName = "" // required but no default
4240
DefaultPoolNamespace = "default" // default for --poolNamespace
43-
DefaultServiceName = "" // required but no default
44-
DefaultZone = "" // default for --zone
4541
DefaultRefreshPodsInterval = 10 * time.Second // default for --refreshPodsInterval
4642
DefaultRefreshMetricsInterval = 50 * time.Millisecond // default for --refreshMetricsInterval
4743
DefaultRefreshPrometheusMetricsInterval = 5 * time.Second // default for --refreshPrometheusMetricsInterval
@@ -53,8 +49,6 @@ func NewDefaultExtProcServerRunner() *ExtProcServerRunner {
5349
TargetEndpointKey: DefaultTargetEndpointKey,
5450
PoolName: DefaultPoolName,
5551
PoolNamespace: DefaultPoolNamespace,
56-
ServiceName: DefaultServiceName,
57-
Zone: DefaultZone,
5852
RefreshPodsInterval: DefaultRefreshPodsInterval,
5953
RefreshMetricsInterval: DefaultRefreshMetricsInterval,
6054
RefreshPrometheusMetricsInterval: DefaultRefreshPrometheusMetricsInterval,

pkg/manifests/ext_proc.yaml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,6 @@ spec:
7777
- "vllm-llama2-7b-pool"
7878
- -v
7979
- "3"
80-
- -serviceName
81-
- "vllm-llama2-7b-pool"
8280
- -grpcPort
8381
- "9002"
8482
- -grpcHealthPort

0 commit comments

Comments
 (0)