wip: rework dump flag

Kong · Jan 26, 2021 · c742ec1 · c742ec1
1 parent 546a81c
commit c742ec1
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 12 deletions.
diff --git a/cli/ingress-controller/flags.go b/cli/ingress-controller/flags.go
@@ -77,9 +77,9 @@ type cliConfig struct {
 	EnableReverseSync bool
 
 	// Logging
-	LogLevel           string
-	LogFormat          string
-	LogSensitiveConfig bool
+	LogLevel   string
+	LogFormat  string
+	DumpConfig string
 
 	// k8s connection details
 	APIServerHost      string
@@ -199,6 +199,9 @@ trace, debug, info, warn, error, fatal and panic.`)
 	flags.String("log-format", "text",
 		`Format of logs of the controller. Allowed values are 
 text and json.`)
+	flags.String("dump-config", "",
+		`Dump generated configuration to filesystem when set to "enabled".
+When set to "sensitive", dumps will include certificate+key pairs and credentials.`)
 
 	// k8s connection details
 	flags.String("apiserver-host", "",
@@ -311,7 +314,7 @@ func parseFlags() (cliConfig, error) {
 	// Logging
 	config.LogLevel = viper.GetString("log-level")
 	config.LogFormat = viper.GetString("log-format")
-	config.LogSensitiveConfig = viper.GetBool("log-sensitive-config")
+	config.DumpConfig = viper.GetString("dump-config")
 
 	// k8s connection details
 	config.APIServerHost = viper.GetString("apiserver-host")

diff --git a/cli/ingress-controller/main.go b/cli/ingress-controller/main.go
@@ -104,8 +104,8 @@ func controllerConfigFromCLIConfig(cliConfig cliConfig) controller.Configuration
 		UpdateStatusOnShutdown: cliConfig.UpdateStatusOnShutdown,
 		ElectionID:             cliConfig.ElectionID,
 
-		LogSensitiveConfig: cliConfig.LogSensitiveConfig,
-		LogLevel:           cliConfig.LogLevel,
+		DumpConfig: cliConfig.DumpConfig,
+		LogLevel:   cliConfig.LogLevel,
 	}
 }
 

diff --git a/internal/ingress/controller/controller.go b/internal/ingress/controller/controller.go
@@ -91,9 +91,9 @@ type Configuration struct {
 
 	EnableKnativeIngressSupport bool
 
-	Logger             logrus.FieldLogger
-	LogSensitiveConfig bool
-	LogLevel           string
+	Logger     logrus.FieldLogger
+	LogLevel   string
+	DumpConfig string
 }
 
 // sync collects all the pieces required to assemble the configuration file and

diff --git a/internal/ingress/controller/kong.go b/internal/ingress/controller/kong.go
@@ -75,14 +75,14 @@ func (n *KongController) OnUpdate(ctx context.Context, state *kongstate.KongStat
 		err = n.onUpdateDBMode(targetContent)
 	}
 	var target []byte
-	if n.cfg.LogSensitiveConfig {
+	if n.cfg.DumpConfig == "enabled" {
 		target, _ = json.Marshal(targetContent)
-	} else {
+	} else if n.cfg.DumpConfig == "sensitive" {
 		sanitizedState := state.SanitizedCopy()
 		target, _ = json.Marshal(n.toDeckContent(ctx, sanitizedState))
 	}
 	if err != nil {
-		if n.cfg.LogLevel == "debug" {
+		if len(target) > 0 {
 			_ = ioutil.WriteFile(filepath.Join(n.tmpDir, "target.json"), target, 0600)
 			_ = ioutil.WriteFile(filepath.Join(n.tmpDir, "last_good.json"), n.lastConfig, 0600)
 		}