Correctly initialize klog in clusterctl (kubernetes-sigs#715)

Signed-off-by: Vince Prignano <[email protected]>
jichenjc · Jan 27, 2019 · 6205b2f · 6205b2f
1 parent ad8c7f3
commit 6205b2f
Show file tree

Hide file tree

Showing 18 changed files with 18 additions and 28 deletions.
diff --git a/cmd/clusterctl/cmd/root.go b/cmd/clusterctl/cmd/root.go
@@ -29,6 +29,9 @@ var RootCmd = &cobra.Command{
 	Use:   "clusterctl",
 	Short: "cluster management",
 	Long:  `Simple kubernetes cluster management`,
+	PersistentPreRun: func(cmd *cobra.Command, args []string) {
+		cmd.Flags().Set("logtostderr", "true")
+	},
 	Run: func(cmd *cobra.Command, args []string) {
 		// Do Stuff Here
 		cmd.Help()
@@ -50,6 +53,7 @@ func exitWithHelp(cmd *cobra.Command, err string) {
 
 func init() {
 	klog.InitFlags(flag.CommandLine)
+	flag.CommandLine.Set("logtostderr", "true")
 	RootCmd.PersistentFlags().AddGoFlagSet(flag.CommandLine)
 	InitLogs()
 }
diff --git a/cmd/clusterctl/testdata/create-cluster-no-args-invalid-flag.golden b/cmd/clusterctl/testdata/create-cluster-no-args-invalid-flag.golden
@@ -22,7 +22,7 @@ Global Flags:
       --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
       --log_dir string                   If non-empty, write log files in this directory
       --log_file string                  If non-empty, use this log file
-      --logtostderr                      log to standard error instead of files
+      --logtostderr                      log to standard error instead of files (default true)
       --master string                    The address of the Kubernetes API server. Overrides any value in kubeconfig. Only required if out-of-cluster.
       --skip_headers                     If true, avoid header prefixes in the log messages
       --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)

diff --git a/cmd/clusterctl/testdata/create-cluster-no-args.golden b/cmd/clusterctl/testdata/create-cluster-no-args.golden
@@ -22,7 +22,7 @@ Global Flags:
       --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
       --log_dir string                   If non-empty, write log files in this directory
       --log_file string                  If non-empty, use this log file
-      --logtostderr                      log to standard error instead of files
+      --logtostderr                      log to standard error instead of files (default true)
       --master string                    The address of the Kubernetes API server. Overrides any value in kubeconfig. Only required if out-of-cluster.
       --skip_headers                     If true, avoid header prefixes in the log messages
       --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)

diff --git a/cmd/clusterctl/testdata/create-no-args-invalid-flag.golden b/cmd/clusterctl/testdata/create-no-args-invalid-flag.golden
@@ -15,7 +15,7 @@ Global Flags:
       --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
       --log_dir string                   If non-empty, write log files in this directory
       --log_file string                  If non-empty, use this log file
-      --logtostderr                      log to standard error instead of files
+      --logtostderr                      log to standard error instead of files (default true)
       --master string                    The address of the Kubernetes API server. Overrides any value in kubeconfig. Only required if out-of-cluster.
       --skip_headers                     If true, avoid header prefixes in the log messages
       --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)

diff --git a/cmd/clusterctl/testdata/create-no-args.golden b/cmd/clusterctl/testdata/create-no-args.golden
@@ -16,7 +16,7 @@ Global Flags:
       --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
       --log_dir string                   If non-empty, write log files in this directory
       --log_file string                  If non-empty, use this log file
-      --logtostderr                      log to standard error instead of files
+      --logtostderr                      log to standard error instead of files (default true)
       --master string                    The address of the Kubernetes API server. Overrides any value in kubeconfig. Only required if out-of-cluster.
       --skip_headers                     If true, avoid header prefixes in the log messages
       --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)

diff --git a/cmd/clusterctl/testdata/delete-cluster-no-args-invalid-flag.golden b/cmd/clusterctl/testdata/delete-cluster-no-args-invalid-flag.golden
@@ -21,7 +21,7 @@ Global Flags:
       --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
       --log_dir string                   If non-empty, write log files in this directory
       --log_file string                  If non-empty, use this log file
-      --logtostderr                      log to standard error instead of files
+      --logtostderr                      log to standard error instead of files (default true)
       --master string                    The address of the Kubernetes API server. Overrides any value in kubeconfig. Only required if out-of-cluster.
       --skip_headers                     If true, avoid header prefixes in the log messages
       --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)

diff --git a/cmd/clusterctl/testdata/delete-cluster-no-args.golden b/cmd/clusterctl/testdata/delete-cluster-no-args.golden
@@ -23,7 +23,7 @@ Global Flags:
       --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
       --log_dir string                   If non-empty, write log files in this directory
       --log_file string                  If non-empty, use this log file
-      --logtostderr                      log to standard error instead of files
+      --logtostderr                      log to standard error instead of files (default true)
       --master string                    The address of the Kubernetes API server. Overrides any value in kubeconfig. Only required if out-of-cluster.
       --skip_headers                     If true, avoid header prefixes in the log messages
       --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)

diff --git a/cmd/clusterctl/testdata/delete-no-args-invalid-flag.golden b/cmd/clusterctl/testdata/delete-no-args-invalid-flag.golden
@@ -15,7 +15,7 @@ Global Flags:
       --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
       --log_dir string                   If non-empty, write log files in this directory
       --log_file string                  If non-empty, use this log file
-      --logtostderr                      log to standard error instead of files
+      --logtostderr                      log to standard error instead of files (default true)
       --master string                    The address of the Kubernetes API server. Overrides any value in kubeconfig. Only required if out-of-cluster.
       --skip_headers                     If true, avoid header prefixes in the log messages
       --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)

diff --git a/cmd/clusterctl/testdata/delete-no-args.golden b/cmd/clusterctl/testdata/delete-no-args.golden
@@ -16,7 +16,7 @@ Global Flags:
       --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
       --log_dir string                   If non-empty, write log files in this directory
       --log_file string                  If non-empty, use this log file
-      --logtostderr                      log to standard error instead of files
+      --logtostderr                      log to standard error instead of files (default true)
       --master string                    The address of the Kubernetes API server. Overrides any value in kubeconfig. Only required if out-of-cluster.
       --skip_headers                     If true, avoid header prefixes in the log messages
       --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)

diff --git a/cmd/clusterctl/testdata/no-args-invalid-flag.golden b/cmd/clusterctl/testdata/no-args-invalid-flag.golden
@@ -18,7 +18,7 @@ Flags:
       --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
       --log_dir string                   If non-empty, write log files in this directory
       --log_file string                  If non-empty, use this log file
-      --logtostderr                      log to standard error instead of files
+      --logtostderr                      log to standard error instead of files (default true)
       --master string                    The address of the Kubernetes API server. Overrides any value in kubeconfig. Only required if out-of-cluster.
       --skip_headers                     If true, avoid header prefixes in the log messages
       --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)

diff --git a/cmd/clusterctl/testdata/no-args.golden b/cmd/clusterctl/testdata/no-args.golden
@@ -19,7 +19,7 @@ Flags:
       --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
       --log_dir string                   If non-empty, write log files in this directory
       --log_file string                  If non-empty, use this log file
-      --logtostderr                      log to standard error instead of files
+      --logtostderr                      log to standard error instead of files (default true)
       --master string                    The address of the Kubernetes API server. Overrides any value in kubeconfig. Only required if out-of-cluster.
       --skip_headers                     If true, avoid header prefixes in the log messages
       --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)

diff --git a/cmd/clusterctl/testdata/validate-cluster-no-args-invalid-flag.golden b/cmd/clusterctl/testdata/validate-cluster-no-args-invalid-flag.golden
@@ -15,7 +15,7 @@ Global Flags:
       --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
       --log_dir string                   If non-empty, write log files in this directory
       --log_file string                  If non-empty, use this log file
-      --logtostderr                      log to standard error instead of files
+      --logtostderr                      log to standard error instead of files (default true)
       --master string                    The address of the Kubernetes API server. Overrides any value in kubeconfig. Only required if out-of-cluster.
       --skip_headers                     If true, avoid header prefixes in the log messages
       --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)

diff --git a/cmd/clusterctl/testdata/validate-no-args-invalid-flag.golden b/cmd/clusterctl/testdata/validate-no-args-invalid-flag.golden
@@ -15,7 +15,7 @@ Global Flags:
       --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
       --log_dir string                   If non-empty, write log files in this directory
       --log_file string                  If non-empty, use this log file
-      --logtostderr                      log to standard error instead of files
+      --logtostderr                      log to standard error instead of files (default true)
       --master string                    The address of the Kubernetes API server. Overrides any value in kubeconfig. Only required if out-of-cluster.
       --skip_headers                     If true, avoid header prefixes in the log messages
       --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)

diff --git a/cmd/clusterctl/testdata/validate-no-args.golden b/cmd/clusterctl/testdata/validate-no-args.golden
@@ -16,7 +16,7 @@ Global Flags:
       --log_backtrace_at traceLocation   when logging hits line file:N, emit a stack trace (default :0)
       --log_dir string                   If non-empty, write log files in this directory
       --log_file string                  If non-empty, use this log file
-      --logtostderr                      log to standard error instead of files
+      --logtostderr                      log to standard error instead of files (default true)
       --master string                    The address of the Kubernetes API server. Overrides any value in kubeconfig. Only required if out-of-cluster.
       --skip_headers                     If true, avoid header prefixes in the log messages
       --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)

diff --git a/cmd/manager/main.go b/cmd/manager/main.go
@@ -30,6 +30,7 @@ import (
 )
 
 func main() {
+	flag.Set("logtostderr", "true")
 	klog.InitFlags(nil)
 	flag.Parse()
 

diff --git a/config/crds/cluster_v1alpha1_machine.yaml b/config/crds/cluster_v1alpha1_machine.yaml
@@ -66,11 +66,6 @@ spec:
                           type: string
                       type: object
                   type: object
-              oneOf:
-              - required:
-                - value
-              - required:
-                - valueFrom
               type: object
             taints:
               description: Taints is the full, authoritative list of taints to apply

diff --git a/config/crds/cluster_v1alpha1_machinedeployment.yaml b/config/crds/cluster_v1alpha1_machinedeployment.yaml
@@ -161,11 +161,6 @@ spec:
                                   type: string
                               type: object
                           type: object
-                      oneOf:
-                      - required:
-                        - value
-                      - required:
-                        - valueFrom
                       type: object
                     taints:
                       description: Taints is the full, authoritative list of taints

diff --git a/config/crds/cluster_v1alpha1_machineset.yaml b/config/crds/cluster_v1alpha1_machineset.yaml
@@ -101,11 +101,6 @@ spec:
                                   type: string
                               type: object
                           type: object
-                      oneOf:
-                      - required:
-                        - value
-                      - required:
-                        - valueFrom
                       type: object
                     taints:
                       description: Taints is the full, authoritative list of taints