fix: check for distinct gRPC services in epp health check

Signed-off-by: Shane Utt <[email protected]>

Author: shaneutt

cmd/epp/health.go

@@ -19,6 +19,7 @@ package main
 import (
 	"context"
 
+	extProcPb "github.com/envoyproxy/go-control-plane/envoy/service/ext_proc/v3"
 	"github.com/go-logr/logr"
 	"google.golang.org/grpc/codes"
 	healthPb "google.golang.org/grpc/health/grpc_health_v1"
@@ -33,11 +34,17 @@ type healthServer struct {
 }
 
 func (s *healthServer) Check(ctx context.Context, in *healthPb.HealthCheckRequest) (*healthPb.HealthCheckResponse, error) {
+	if in.Service != extProcPb.ExternalProcessor_ServiceDesc.ServiceName {
+		s.logger.V(logutil.DEFAULT).Info("gRPC health check requested unknown service", "available-services", []string{extProcPb.ExternalProcessor_ServiceDesc.ServiceName}, "requested-service", in.Service)
+		return &healthPb.HealthCheckResponse{Status: healthPb.HealthCheckResponse_SERVICE_UNKNOWN}, nil
+	}
+
 	if !s.datastore.PoolHasSynced() {
-		s.logger.V(logutil.DEFAULT).Info("gRPC health check not serving", "service", in.Service)
+		s.logger.V(logutil.DEFAULT).Info("gRPC health check not serving", "service", extProcPb.ExternalProcessor_ServiceDesc.ServiceName)
 		return &healthPb.HealthCheckResponse{Status: healthPb.HealthCheckResponse_NOT_SERVING}, nil
 	}
-	s.logger.V(logutil.TRACE).Info("gRPC health check serving", "service", in.Service)
+
+	s.logger.V(logutil.TRACE).Info("gRPC health check serving", "service", extProcPb.ExternalProcessor_ServiceDesc.ServiceName)
 	return &healthPb.HealthCheckResponse{Status: healthPb.HealthCheckResponse_SERVING}, nil
 }
 

config/charts/inferencepool/templates/epp-deployment.yaml

@@ -53,12 +53,12 @@ spec:
         livenessProbe:
           grpc:
             port: 9003
-            service: inference-extension
+            service: envoy.service.ext_proc.v3.ExternalProcessor
           initialDelaySeconds: 5
           periodSeconds: 10
         readinessProbe:
           grpc:
             port: 9003
-            service: inference-extension
+            service: envoy.service.ext_proc.v3.ExternalProcessor
           initialDelaySeconds: 5
           periodSeconds: 10

config/manifests/inferencepool-resources.yaml

@@ -71,13 +71,13 @@ spec:
         livenessProbe:
           grpc:
             port: 9003
-            service: inference-extension
+            service: envoy.service.ext_proc.v3.ExternalProcessor
           initialDelaySeconds: 5
           periodSeconds: 10
         readinessProbe:
           grpc:
             port: 9003
-            service: inference-extension
+            service: envoy.service.ext_proc.v3.ExternalProcessor
           initialDelaySeconds: 5
           periodSeconds: 10
 ---

test/testdata/inferencepool-e2e.yaml

@@ -73,13 +73,13 @@ spec:
         livenessProbe:
           grpc:
             port: 9003
-            service: inference-extension
+            service: envoy.service.ext_proc.v3.ExternalProcessor
           initialDelaySeconds: 5
           periodSeconds: 10
         readinessProbe:
           grpc:
             port: 9003
-            service: inference-extension
+            service: envoy.service.ext_proc.v3.ExternalProcessor
           initialDelaySeconds: 5
           periodSeconds: 10
 ---