Tune the verbosity as per pre 0.12.0

This retains the verbose print of configuration at start-up, but
puts it behind a flag.

Signed-off-by: Alex Ellis (OpenFaaS Ltd) <[email protected]>

Author: alexellis

main.go

@@ -38,10 +38,14 @@ import (
 func main() {
 	var kubeconfig string
 	var masterURL string
-	var operator bool
+	var (
+		operator,
+		verbose bool
+	)
 
 	flag.StringVar(&kubeconfig, "kubeconfig", "",
 		"Path to a kubeconfig. Only required if out-of-cluster.")
+	flag.BoolVar(&verbose, "verbose", false, "Print verbose config information")
 	flag.StringVar(&masterURL, "master", "",
 		"The address of the Kubernetes API server. Overrides any value in kubeconfig. Only required if out-of-cluster.")
 
@@ -74,7 +78,7 @@ func main() {
 		log.Fatalf("Error reading config: %s", err.Error())
 	}
 
-	config.Fprint()
+	config.Fprint(verbose)
 
 	deployConfig := k8s.DeploymentConfig{
 		RuntimeHTTPPort: 8080,

types/read_config.go

@@ -106,21 +106,26 @@ type BootstrapConfig struct {
 	FaaSConfig ftypes.FaaSConfig
 }
 
-// Fprint pretty-prints the config with the std logger. One line per config value.
-func (c BootstrapConfig) Fprint() {
+// Fprint pretty-prints the config with the stdlib logger. One line per config value.
+// When the verbose flag is set to false, it prints the same output as prior to
+// the 0.12.0 release.
+func (c BootstrapConfig) Fprint(verbose bool) {
 	log.Printf("HTTP Read Timeout: %s\n", c.FaaSConfig.GetReadTimeout())
 	log.Printf("HTTP Write Timeout: %s\n", c.FaaSConfig.WriteTimeout)
-	log.Printf("MaxIdleConns: %d\n", c.FaaSConfig.MaxIdleConns)
-	log.Printf("MaxIdleConnsPerHost: %d\n", c.FaaSConfig.MaxIdleConnsPerHost)
-	log.Printf("HTTPProbe: %v\n", c.HTTPProbe)
-	log.Printf("DefaultFunctionNamespace: %s\n", c.DefaultFunctionNamespace)
-	log.Printf("ProfilesNamespace: %s\n", c.ProfilesNamespace)
 	log.Printf("ImagePullPolicy: %s\n", c.ImagePullPolicy)
-	log.Printf("SetNonRootUser: %v\n", c.SetNonRootUser)
-	log.Printf("ReadinessProbeInitialDelaySeconds: %d\n", c.ReadinessProbeInitialDelaySeconds)
-	log.Printf("ReadinessProbeTimeoutSeconds: %d\n", c.ReadinessProbeTimeoutSeconds)
-	log.Printf("ReadinessProbePeriodSeconds: %d\n", c.ReadinessProbePeriodSeconds)
-	log.Printf("LivenessProbeInitialDelaySeconds: %d\n", c.LivenessProbeInitialDelaySeconds)
-	log.Printf("LivenessProbeTimeoutSeconds: %d\n", c.LivenessProbeTimeoutSeconds)
-	log.Printf("LivenessProbePeriodSeconds: %d\n", c.LivenessProbePeriodSeconds)
+	log.Printf("DefaultFunctionNamespace: %s\n", c.DefaultFunctionNamespace)
+
+	if verbose {
+		log.Printf("MaxIdleConns: %d\n", c.FaaSConfig.MaxIdleConns)
+		log.Printf("MaxIdleConnsPerHost: %d\n", c.FaaSConfig.MaxIdleConnsPerHost)
+		log.Printf("HTTPProbe: %v\n", c.HTTPProbe)
+		log.Printf("ProfilesNamespace: %s\n", c.ProfilesNamespace)
+		log.Printf("SetNonRootUser: %v\n", c.SetNonRootUser)
+		log.Printf("ReadinessProbeInitialDelaySeconds: %d\n", c.ReadinessProbeInitialDelaySeconds)
+		log.Printf("ReadinessProbeTimeoutSeconds: %d\n", c.ReadinessProbeTimeoutSeconds)
+		log.Printf("ReadinessProbePeriodSeconds: %d\n", c.ReadinessProbePeriodSeconds)
+		log.Printf("LivenessProbeInitialDelaySeconds: %d\n", c.LivenessProbeInitialDelaySeconds)
+		log.Printf("LivenessProbeTimeoutSeconds: %d\n", c.LivenessProbeTimeoutSeconds)
+		log.Printf("LivenessProbePeriodSeconds: %d\n", c.LivenessProbePeriodSeconds)
+	}
 }