Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 13 additions & 2 deletions cmd/epp/runner/runner.go
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,9 @@ var (
configFile = flag.String("config-file", runserver.DefaultConfigFile, "The path to the configuration file")
configText = flag.String("config-text", runserver.DefaultConfigText, "The configuration specified as text, in lieu of a file")

modelServerMetricsPort = flag.Int("model-server-metrics-port", 0, "Port to scrape metrics from pods. "+
"Default value will be set to the InferencePool.Spec.TargetPorts[0].Number if not set.")
modelServerMetricsPort = flag.Int("model-server-metrics-port", 0, "[DEPRECATED] Port to scrape metrics from pods. "+
"Default value will be set to the InferencePool.Spec.TargetPorts[0].Number if not set."+
"This option will be removed in the next release.")
modelServerMetricsPath = flag.String("model-server-metrics-path", "/metrics", "Path to scrape metrics from pods")
modelServerMetricsScheme = flag.String("model-server-metrics-scheme", "http", "Scheme to scrape metrics from pods")
modelServerMetricsHttpsInsecureSkipVerify = flag.Bool("model-server-metrics-https-insecure-skip-verify", true, "When using 'https' scheme for 'model-server-metrics-scheme', configure 'InsecureSkipVerify' (default to true)")
Expand Down Expand Up @@ -198,6 +199,8 @@ func (r *Runner) Run(ctx context.Context) error {
flag.Parse()
initLogging(&opts)

r.deprecatedFlagsHandler(setupLog)

if *tracing {
err := common.InitTracing(ctx, setupLog)
if err != nil {
Expand Down Expand Up @@ -486,6 +489,14 @@ func (r *Runner) parseConfigurationPhaseTwo(ctx context.Context, rawConfig *conf
return cfg, nil
}

func (r *Runner) deprecatedFlagsHandler(logger logr.Logger) {
flag.Visit(func(f *flag.Flag) {
if f.Name == "model-server-metrics-port" { // future: use map/set to store deprecated flags (and replacements?)
logger.Info("deprecated option will be removed in the next release.", "option", f.Name)
}
})
}

func (r *Runner) deprecatedConfigurationHelper(cfg *config.Config, logger logr.Logger) {
// Handle deprecated environment variable based feature flags

Expand Down
4 changes: 3 additions & 1 deletion pkg/epp/datastore/datastore.go
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ type Datastore interface {
Clear()
}

// NewDatastore creates a new data store.
// TODO: modelServerMetricsPort is being deprecated
func NewDatastore(parentCtx context.Context, epFactory datalayer.EndpointFactory, modelServerMetricsPort int32, opts ...DatastoreOption) Datastore {
// Initialize with defaults
store := &datastore{
Expand Down Expand Up @@ -100,7 +102,7 @@ type datastore struct {
pods *sync.Map
// modelServerMetricsPort metrics port from EPP command line argument
// used only if there is only one inference engine per pod
modelServerMetricsPort int32
modelServerMetricsPort int32 // TODO: deprecating
epf datalayer.EndpointFactory
}

Expand Down