Fix port flag override (#396)

* fix: port flag override

Signed-off-by: Hector Fernandez <hectorj@gmail.com>

* chore: update rekor_server.port old references

Signed-off-by: Hector Fernandez <hectorj@gmail.com>

cmd/rekor-server/app/root.go

@@ -64,7 +64,7 @@ func init() {
 	rootCmd.PersistentFlags().String("rekor_server.signer", "memory", "Rekor signer to use. Current valid options include: [gcpkms, memory]")
 	rootCmd.PersistentFlags().String("rekor_server.timestamp_chain", "", "PEM encoded cert chain to use for timestamping")
 
-	rootCmd.PersistentFlags().Uint16("rekor_server.port", 3000, "Port to bind to")
+	rootCmd.PersistentFlags().Uint16("port", 3000, "Port to bind to")
 
 	rootCmd.PersistentFlags().Bool("enable_retrieve_api", true, "enables Redis-based index API endpoint")
 	rootCmd.PersistentFlags().String("redis_server.address", "127.0.0.1", "Redis server address")

cmd/rekor-server/app/serve.go

@@ -93,7 +93,7 @@ var serveCmd = &cobra.Command{
 		}
 
 		server.Host = viper.GetString("rekor_server.address")
-		server.Port = int(viper.GetUint("rekor_server.port"))
+		server.Port = int(viper.GetUint("port"))
 		server.EnabledListeners = []string{"http"}
 
 		api.ConfigureAPI()

cmd/rekor-server/app/watch.go

@@ -64,7 +64,7 @@ var watchCmd = &cobra.Command{
 		_ = flag.CommandLine.Parse([]string{})
 
 		host := viper.GetString("rekor_server.address")
-		port := viper.GetUint("rekor_server.port")
+		port := viper.GetUint("port")
 		interval := viper.GetDuration("interval")
 		url := fmt.Sprintf("http://%s:%d", host, port)
 		c, err := client.GetRekorClient(url)

config/watcher.yaml

@@ -43,7 +43,7 @@ spec:
         args: [
           "watch",
           "--rekor_server.address=rekor-server",
-          "--rekor_server.port=80",
+          "--port=80",
           "--log_type=prod",
         ]
         env: