Updated the flag names

Author: ahg-g

cmd/epp/main.go

@@ -64,13 +64,13 @@ var (
 		"The port used for gRPC liveness and readiness probes")
 	metricsPort = flag.Int(
 		"metricsPort", 9090, "The metrics port")
-	targetEndpointKey = flag.String(
-		"targetEndpointKey",
-		runserver.DefaultTargetEndpointKey,
+	destinationEndpointHintKey = flag.String(
+		"destinationEndpointHintKey",
+		runserver.DefaultDestinationEndpointHintKey,
 		"Header and response metadata key used by Envoy to route to the appropriate pod. This must match Envoy configuration.")
-	targetEndpointOuterMetadataKey = flag.String(
-		"TargetEndpointOuterMetadataKey",
-		runserver.DefaultTargetEndpointOuterMetadataKey,
+	destinationEndpointHintMetadataNamespace = flag.String(
+		"DestinationEndpointHintMetadataNamespace",
+		runserver.DefaultDestinationEndpointHintMetadataNamespace,
 		"The key for the outer namespace struct in the metadata field of the extproc response that is used to wrap the"+
 			"target endpoint. If not set, then an outer namespace struct should not be created.")
 	poolName = flag.String(
@@ -150,17 +150,17 @@ func run() error {
 	datastore := datastore.NewDatastore()
 	provider := backend.NewProvider(&vllm.PodMetricsClientImpl{}, datastore)
 	serverRunner := &runserver.ExtProcServerRunner{
-		GrpcPort:                         *grpcPort,
-		TargetEndpointOuterMetadataKey:   *targetEndpointOuterMetadataKey,
-		TargetEndpointKey:                *targetEndpointKey,
-		PoolName:                         *poolName,
-		PoolNamespace:                    *poolNamespace,
-		RefreshMetricsInterval:           *refreshMetricsInterval,
-		RefreshPrometheusMetricsInterval: *refreshPrometheusMetricsInterval,
-		Datastore:                        datastore,
-		SecureServing:                    *secureServing,
-		CertPath:                         *certPath,
-		Provider:                         provider,
+		GrpcPort:                                 *grpcPort,
+		DestinationEndpointHintMetadataNamespace: *destinationEndpointHintMetadataNamespace,
+		DestinationEndpointHintKey:               *destinationEndpointHintKey,
+		PoolName:                                 *poolName,
+		PoolNamespace:                            *poolNamespace,
+		RefreshMetricsInterval:                   *refreshMetricsInterval,
+		RefreshPrometheusMetricsInterval:         *refreshPrometheusMetricsInterval,
+		Datastore:                                datastore,
+		SecureServing:                            *secureServing,
+		CertPath:                                 *certPath,
+		Provider:                                 provider,
 	}
 	if err := serverRunner.SetupWithManager(mgr); err != nil {
 		setupLog.Error(err, "Failed to setup ext-proc server")

docs/proposals/003-endpoint-picker-protocol/README.md

@@ -24,7 +24,7 @@ dynamicMetadata: {
     "x-gateway-destination-endpoint": <ip:port>"  
   }
 }
-
+```
 
 Note:
 - If the EPP did not communicate the server endpoint via these two methods, it MUST return an error.

pkg/epp/handlers/request.go

@@ -119,7 +119,7 @@ func (s *Server) HandleRequestBody(
 	headers := []*configPb.HeaderValueOption{
 		{
 			Header: &configPb.HeaderValue{
-				Key:      s.targetEndpointKey,
+				Key:      s.destinationEndpointHintKey,
 				RawValue: []byte(endpoint),
 			},
 		},
@@ -139,19 +139,19 @@ func (s *Server) HandleRequestBody(
 
 	targetEndpointValue := &structpb.Struct{
 		Fields: map[string]*structpb.Value{
-			s.targetEndpointKey: {
+			s.destinationEndpointHintKey: {
 				Kind: &structpb.Value_StringValue{
 					StringValue: endpoint,
 				},
 			},
 		},
 	}
 	dynamicMetadata := targetEndpointValue
-	if s.targetEndpointOuterMetadataKey != "" {
+	if s.destinationEndpointHintMetadataNamespace != "" {
 		// If a namespace is defined, wrap the selected endpoint with that.
 		dynamicMetadata = &structpb.Struct{
 			Fields: map[string]*structpb.Value{
-				s.targetEndpointOuterMetadataKey: {
+				s.destinationEndpointHintMetadataNamespace: {
 					Kind: &structpb.Value_StructValue{
 						StructValue: targetEndpointValue,
 					},

pkg/epp/handlers/server.go

@@ -34,12 +34,12 @@ import (
 	logutil "sigs.k8s.io/gateway-api-inference-extension/pkg/epp/util/logging"
 )
 
-func NewServer(scheduler Scheduler, targetEndpointOuterMetadataKey, targetEndpointKey string, datastore datastore.Datastore) *Server {
+func NewServer(scheduler Scheduler, destinationEndpointHintMetadataNamespace, destinationEndpointHintKey string, datastore datastore.Datastore) *Server {
 	return &Server{
-		scheduler:                      scheduler,
-		targetEndpointOuterMetadataKey: targetEndpointOuterMetadataKey,
-		targetEndpointKey:              targetEndpointKey,
-		datastore:                      datastore,
+		scheduler:                                scheduler,
+		destinationEndpointHintMetadataNamespace: destinationEndpointHintMetadataNamespace,
+		destinationEndpointHintKey:               destinationEndpointHintKey,
+		datastore:                                datastore,
 	}
 }
 
@@ -49,11 +49,11 @@ type Server struct {
 	scheduler Scheduler
 	// The key of the header to specify the target pod address. This value needs to match Envoy
 	// configuration.
-	targetEndpointKey string
+	destinationEndpointHintKey string
 	// The key acting as the outer namespace struct in the metadata extproc response to communicate
 	// back the picked endpoints.
-	targetEndpointOuterMetadataKey string
-	datastore                      datastore.Datastore
+	destinationEndpointHintMetadataNamespace string
+	datastore                                datastore.Datastore
 }
 
 type Scheduler interface {

pkg/epp/server/runserver.go

@@ -45,41 +45,41 @@ import (
 
 // ExtProcServerRunner provides methods to manage an external process server.
 type ExtProcServerRunner struct {
-	GrpcPort                         int
-	TargetEndpointOuterMetadataKey   string
-	TargetEndpointKey                string
-	PoolName                         string
-	PoolNamespace                    string
-	RefreshMetricsInterval           time.Duration
-	RefreshPrometheusMetricsInterval time.Duration
-	Datastore                        datastore.Datastore
-	Provider                         *backend.Provider
-	SecureServing                    bool
-	CertPath                         string
+	GrpcPort                                 int
+	DestinationEndpointHintMetadataNamespace string
+	DestinationEndpointHintKey               string
+	PoolName                                 string
+	PoolNamespace                            string
+	RefreshMetricsInterval                   time.Duration
+	RefreshPrometheusMetricsInterval         time.Duration
+	Datastore                                datastore.Datastore
+	Provider                                 *backend.Provider
+	SecureServing                            bool
+	CertPath                                 string
 }
 
 // Default values for CLI flags in main
 const (
-	DefaultGrpcPort                         = 9002                                                                 // default for --grpcPort
-	DefaultTargetEndpointOuterMetadataKey   = "gateway-destination-endpoint.dynamic_forwarding.selected_endpoints" // default for --targetEndpointOuterMetadataKey
-	DefaultTargetEndpointKey                = "x-gateway-destination-endpoint"                                     // default for --targetEndpointKey
-	DefaultPoolName                         = ""                                                                   // required but no default
-	DefaultPoolNamespace                    = "default"                                                            // default for --poolNamespace
-	DefaultRefreshMetricsInterval           = 50 * time.Millisecond                                                // default for --refreshMetricsInterval
-	DefaultRefreshPrometheusMetricsInterval = 5 * time.Second                                                      // default for --refreshPrometheusMetricsInterval
-	DefaultSecureServing                    = true                                                                 // default for --secureServing
+	DefaultGrpcPort                                 = 9002                                                                 // default for --grpcPort
+	DefaultDestinationEndpointHintMetadataNamespace = "gateway-destination-endpoint.dynamic_forwarding.selected_endpoints" // default for --destinationEndpointHintMetadataNamespace
+	DefaultDestinationEndpointHintKey               = "x-gateway-destination-endpoint"                                     // default for --destinationEndpointHintKey
+	DefaultPoolName                                 = ""                                                                   // required but no default
+	DefaultPoolNamespace                            = "default"                                                            // default for --poolNamespace
+	DefaultRefreshMetricsInterval                   = 50 * time.Millisecond                                                // default for --refreshMetricsInterval
+	DefaultRefreshPrometheusMetricsInterval         = 5 * time.Second                                                      // default for --refreshPrometheusMetricsInterval
+	DefaultSecureServing                            = true                                                                 // default for --secureServing
 )
 
 func NewDefaultExtProcServerRunner() *ExtProcServerRunner {
 	return &ExtProcServerRunner{
-		GrpcPort:                         DefaultGrpcPort,
-		TargetEndpointKey:                DefaultTargetEndpointKey,
-		TargetEndpointOuterMetadataKey:   DefaultTargetEndpointOuterMetadataKey,
-		PoolName:                         DefaultPoolName,
-		PoolNamespace:                    DefaultPoolNamespace,
-		RefreshMetricsInterval:           DefaultRefreshMetricsInterval,
-		RefreshPrometheusMetricsInterval: DefaultRefreshPrometheusMetricsInterval,
-		SecureServing:                    DefaultSecureServing,
+		GrpcPort:                                 DefaultGrpcPort,
+		DestinationEndpointHintKey:               DefaultDestinationEndpointHintKey,
+		DestinationEndpointHintMetadataNamespace: DefaultDestinationEndpointHintMetadataNamespace,
+		PoolName:                                 DefaultPoolName,
+		PoolNamespace:                            DefaultPoolNamespace,
+		RefreshMetricsInterval:                   DefaultRefreshMetricsInterval,
+		RefreshPrometheusMetricsInterval:         DefaultRefreshPrometheusMetricsInterval,
+		SecureServing:                            DefaultSecureServing,
 		// Datastore can be assigned later.
 	}
 }
@@ -159,7 +159,7 @@ func (r *ExtProcServerRunner) AsRunnable(logger logr.Logger) manager.Runnable {
 		}
 		extProcPb.RegisterExternalProcessorServer(
 			srv,
-			handlers.NewServer(scheduling.NewScheduler(r.Datastore), r.TargetEndpointOuterMetadataKey, r.TargetEndpointKey, r.Datastore),
+			handlers.NewServer(scheduling.NewScheduler(r.Datastore), r.DestinationEndpointHintMetadataNamespace, r.DestinationEndpointHintKey, r.Datastore),
 		)
 
 		// Forward to the gRPC runnable.

test/integration/hermetic_test.go

@@ -100,7 +100,7 @@ func TestKubeInferenceModelRequest(t *testing.T) {
 			wantHeaders: []*configPb.HeaderValueOption{
 				{
 					Header: &configPb.HeaderValue{
-						Key:      runserver.DefaultTargetEndpointKey,
+						Key:      serverRunner.DestinationEndpointHintKey,
 						RawValue: []byte("address-1:8000"),
 					},
 				},
@@ -148,7 +148,7 @@ func TestKubeInferenceModelRequest(t *testing.T) {
 			wantHeaders: []*configPb.HeaderValueOption{
 				{
 					Header: &configPb.HeaderValue{
-						Key:      runserver.DefaultTargetEndpointKey,
+						Key:      serverRunner.DestinationEndpointHintKey,
 						RawValue: []byte("address-1:8000"),
 					},
 				},
@@ -197,7 +197,7 @@ func TestKubeInferenceModelRequest(t *testing.T) {
 			wantHeaders: []*configPb.HeaderValueOption{
 				{
 					Header: &configPb.HeaderValue{
-						Key:      runserver.DefaultTargetEndpointKey,
+						Key:      serverRunner.DestinationEndpointHintKey,
 						RawValue: []byte("address-2:8000"),
 					},
 				},
@@ -288,7 +288,7 @@ func TestKubeInferenceModelRequest(t *testing.T) {
 			wantHeaders: []*configPb.HeaderValueOption{
 				{
 					Header: &configPb.HeaderValue{
-						Key:      runserver.DefaultTargetEndpointKey,
+						Key:      serverRunner.DestinationEndpointHintKey,
 						RawValue: []byte("address-0:8000"),
 					},
 				},
@@ -527,11 +527,11 @@ func readDocuments(fp string) ([][]byte, error) {
 func makeMetadata(endpoint string) *structpb.Struct {
 	return &structpb.Struct{
 		Fields: map[string]*structpb.Value{
-			runserver.DefaultTargetEndpointOuterMetadataKey: {
+			serveRunner.DestinationEndpointHintMetadataNamespace: {
 				Kind: &structpb.Value_StructValue{
 					StructValue: &structpb.Struct{
 						Fields: map[string]*structpb.Value{
-							runserver.DefaultTargetEndpointKey: {
+							serveRunner.DestinationEndpointHintKey: {
 								Kind: &structpb.Value_StringValue{
 									StringValue: endpoint,
 								},