From 4347b0b95dca6daa086692a15192eec186a10e49 Mon Sep 17 00:00:00 2001
From: Hector Fernandez <hfernandez@mesosphere.io>
Date: Wed, 28 Jul 2021 19:28:10 +0200
Subject: [PATCH] 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 | 2 +-
cmd/rekor-server/app/serve.go | 2 +-
cmd/rekor-server/app/watch.go | 2 +-
config/watcher.yaml | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/cmd/rekor-server/app/root.go b/cmd/rekor-server/app/root.go
index 33022ae..8d9d0a6 100644
--- a/cmd/rekor-server/app/root.go
+++ b/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")
diff --git a/cmd/rekor-server/app/serve.go b/cmd/rekor-server/app/serve.go
index 143dee7..209605f 100644
--- a/cmd/rekor-server/app/serve.go
+++ b/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()
diff --git a/cmd/rekor-server/app/watch.go b/cmd/rekor-server/app/watch.go
index a1a7e2c..c4711d0 100644
--- a/cmd/rekor-server/app/watch.go
+++ b/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)
diff --git a/config/watcher.yaml b/config/watcher.yaml
index bacdadf..0dd78cb 100644
--- a/config/watcher.yaml
+++ b/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:
--
GitLab