Config options fix (#2321)

* Added check that one of confi-text or config-file is specified

Signed-off-by: Shmuel Kallner <kallner@il.ibm.com>

* Added dummy config-file argument to get tests to pass

Signed-off-by: Shmuel Kallner <kallner@il.ibm.com>

* Add a very basic logger to log startup messages in case of errors

Signed-off-by: Shmuel Kallner <kallner@il.ibm.com>

---------

Signed-off-by: Shmuel Kallner <kallner@il.ibm.com>

Author: shmuelk

cmd/epp/runner/runner.go

@@ -142,6 +142,9 @@ func (r *Runner) WithCustomCollectors(collectors ...prometheus.Collector) *Runne
 }
 
 func (r *Runner) Run(ctx context.Context) error {
+	// Setup a very basic logger in case command line argument parsing fails
+	logutil.InitSetupLogging()
+
 	setupLog.Info(r.eppExecutableName+" build", "commit-sha", version.CommitSHA, "build-ref", version.BuildRef)
 
 	opts := runserver.NewOptions()

pkg/common/observability/logging/logger.go

@@ -27,6 +27,11 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 )
 
+func InitSetupLogging() {
+	logger := zap.New(zap.RawZapOpts(uberzap.AddCaller()))
+	ctrl.SetLogger(logger)
+}
+
 func InitLogging(opts *zap.Options) {
 	logger := zap.New(zap.UseFlagOptions(opts), zap.RawZapOpts(uberzap.AddCaller()))
 	ctrl.SetLogger(logger)

pkg/epp/server/options.go

@@ -228,6 +228,9 @@ func (opts *Options) Validate() error {
 		}
 	}
 
+	if opts.ConfigText == "" && opts.ConfigFile == "" {
+		return fmt.Errorf("one of the %q and %q flags must be set", "configText", "configFile")
+	}
 	if opts.ConfigText != "" && opts.ConfigFile != "" {
 		return fmt.Errorf("both the %q and %q flags can not be set at the same time", "configText", "configFile")
 	}

pkg/epp/server/options_test.go

@@ -87,7 +87,8 @@ func TestEndpointTargetPorts(t *testing.T) {
 			opts := NewOptions()
 			opts.AddFlags(tt.fs)
 
-			argv := []string{"--endpoint-selector", "app=vllm"}
+			argv := []string{"--endpoint-selector", "app=vllm",
+				"--config-file", "fake-config.yaml"} // Needed to avoid an options validation error
 			argv = append(argv, tt.args...)
 
 			if err := tt.fs.Parse(argv); err != nil {