Skip to content

Commit

Permalink
added management port configuration (open-feature#867)
Browse files Browse the repository at this point in the history
Signed-off-by: Saurabhkr952 <saurabhkr952@gmail.com>
  • Loading branch information
Saurabhkr952 committed Sep 16, 2023
1 parent e57e206 commit ea9dc74
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 10 deletions.
2 changes: 1 addition & 1 deletion core/pkg/runtime/from_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ type SourceConfig struct {
// Config is the configuration structure derived from startup arguments.
type Config struct {
MetricExporter string
MetricsPort uint16
ManagementPort uint16
OtelCollectorURI string
ServiceCertPath string
ServiceKeyPath string
Expand Down
19 changes: 10 additions & 9 deletions flagd/cmd/start.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ const (
evaluatorFlagName = "evaluator"
logFormatFlagName = "log-format"
metricsExporter = "metrics-exporter"
metricsPortFlagName = "metrics-port"
managementPortFlagName = "management-port"
otelCollectorURI = "otel-collector-uri"
portFlagName = "port"
providerArgsFlagName = "sync-provider-args"
Expand All @@ -30,8 +30,9 @@ const (
syncProviderFlagName = "sync-provider"
uriFlagName = "uri"

defaultServicePort = 8013
defaultMetricsPort = 8014
defaultServicePort = 8013
defaultMetricsPort = 8014
defaultManagementPort = 8015
)

func init() {
Expand All @@ -40,7 +41,7 @@ func init() {
// allows environment variables to use _ instead of -
viper.SetEnvKeyReplacer(strings.NewReplacer("-", "_")) // sync-provider-args becomes SYNC_PROVIDER_ARGS
viper.SetEnvPrefix("FLAGD") // port becomes FLAGD_PORT
flags.Int32P(metricsPortFlagName, "m", defaultMetricsPort, "Port to serve metrics on")
flags.Int32P(managementPortFlagName, "M", defaultManagementPort, "Port for management operations")
flags.Int32P(portFlagName, "p", defaultServicePort, "Port to listen on")
flags.StringP(socketPathFlagName, "d", "", "Flagd socket path. "+
"With grpc the service will become available on this address. "+
Expand Down Expand Up @@ -81,7 +82,7 @@ func init() {
_ = viper.BindPFlag(evaluatorFlagName, flags.Lookup(evaluatorFlagName))
_ = viper.BindPFlag(logFormatFlagName, flags.Lookup(logFormatFlagName))
_ = viper.BindPFlag(metricsExporter, flags.Lookup(metricsExporter))
_ = viper.BindPFlag(metricsPortFlagName, flags.Lookup(metricsPortFlagName))
_ = viper.BindPFlag(managementPortFlagName, flags.Lookup(managementPortFlagName))
_ = viper.BindPFlag(otelCollectorURI, flags.Lookup(otelCollectorURI))
_ = viper.BindPFlag(portFlagName, flags.Lookup(portFlagName))
_ = viper.BindPFlag(providerArgsFlagName, flags.Lookup(providerArgsFlagName))
Expand Down Expand Up @@ -154,10 +155,10 @@ var startCmd = &cobra.Command{
rt, err := runtime.FromConfig(logger, Version, runtime.Config{
CORS: viper.GetStringSlice(corsFlagName),
MetricExporter: viper.GetString(metricsExporter),
MetricsPort: getPortValueOrDefault(
metricsPortFlagName,
viper.GetUint16(metricsPortFlagName),
defaultMetricsPort,
ManagementPort: getPortValueOrDefault(
managementPortFlagName,
viper.GetUint16(managementPortFlagName),
defaultMetricsPort, // If managementPort is unspecified, it defaults use metricsPort
rtLogger,
),
OtelCollectorURI: viper.GetString(otelCollectorURI),
Expand Down

0 comments on commit ea9dc74

Please sign in to comment.