diff --git a/Dockerfile b/Dockerfile
index e89f319d0299..bca982033017 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -13,7 +13,7 @@
 # limitations under the License.
 
 # Build the manager binary
-FROM golang:1.11.6 as builder
+FROM golang:1.12.3 as builder
 
 # Copy in the go src
 WORKDIR $GOPATH/src/sigs.k8s.io/cluster-api
diff --git a/WORKSPACE b/WORKSPACE
index 710510fb0e80..c442a2afb10c 100644
--- a/WORKSPACE
+++ b/WORKSPACE
@@ -3,8 +3,8 @@ load("@bazel_tools//tools/build_defs/repo:git.bzl", "git_repository")
 
 http_archive(
     name = "io_bazel_rules_go",
-    sha256 = "77dfd303492f2634de7a660445ee2d3de2960cbd52f97d8c0dffa9362d3ddef9",
-    url = "https://github.com/bazelbuild/rules_go/releases/download/0.18.1/rules_go-0.18.1.tar.gz",
+    sha256 = "86ae934bd4c43b99893fc64be9d9fc684b81461581df7ea8fc291c816f5ee8c5",
+    url = "https://github.com/bazelbuild/rules_go/releases/download/0.18.3/rules_go-0.18.3.tar.gz",
 )
 
 http_archive(
@@ -18,7 +18,7 @@ load("@io_bazel_rules_go//go:deps.bzl", "go_register_toolchains", "go_rules_depe
 go_rules_dependencies()
 
 go_register_toolchains(
-    go_version = "1.11.6",
+    go_version = "1.12.3",
 )
 
 load("@bazel_gazelle//:deps.bzl", "gazelle_dependencies", "go_repository")
@@ -27,13 +27,13 @@ gazelle_dependencies()
 
 go_repository(
     name = "io_k8s_sigs_kustomize",
-    commit = "58492e2d83c59ed63881311f46ad6251f77dabc3",
     importpath = "sigs.k8s.io/kustomize",
+    tag = "v1.0.11",
 )
 
 go_repository(
     name = "com_github_golangci_golangci-lint",
     build_file_generation = "on",
     importpath = "github.com/golangci/golangci-lint",
-    tag = "v1.15.0",
+    tag = "v1.16.0",
 )
diff --git a/cmd/clusterctl/main_integration_test.go b/cmd/clusterctl/main_integration_test.go
index 22f52267f852..65fca8b395a5 100644
--- a/cmd/clusterctl/main_integration_test.go
+++ b/cmd/clusterctl/main_integration_test.go
@@ -41,7 +41,7 @@ const (
 
 // run these tests with the flag "-update" to update the values stored in all of the golden files
 var (
-	update = flag.Bool("update", true, "update .golden files")
+	update = flag.Bool("update", false, "update .golden files")
 	dmp    = diffmatchpatch.New()
 )
 
diff --git a/cmd/clusterctl/testdata/create-cluster-no-args-invalid-flag.golden b/cmd/clusterctl/testdata/create-cluster-no-args-invalid-flag.golden
index de09fe191db0..4e89d69d1b59 100644
--- a/cmd/clusterctl/testdata/create-cluster-no-args-invalid-flag.golden
+++ b/cmd/clusterctl/testdata/create-cluster-no-args-invalid-flag.golden
@@ -19,14 +19,15 @@ Flags:
 Global Flags:
       --alsologtostderr                  log to standard error as well as files
       --kubeconfig string                Paths to a kubeconfig. Only required if out-of-cluster.
+      --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
+      --log-file-max-size uint           Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800)
       --log-flush-frequency duration     Maximum number of seconds between log flushes (default 5s)
-      --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 (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
-      --skip_log_headers                 If true, avoid headers when openning log files
+      --skip-headers                     If true, avoid header prefixes in the log messages
+      --skip-log-headers                 If true, avoid headers when openning log files
       --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
   -v, --v Level                          number for the log level verbosity
       --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
diff --git a/cmd/clusterctl/testdata/create-cluster-no-args.golden b/cmd/clusterctl/testdata/create-cluster-no-args.golden
index 1cba49800478..c3b2f2d266bd 100644
--- a/cmd/clusterctl/testdata/create-cluster-no-args.golden
+++ b/cmd/clusterctl/testdata/create-cluster-no-args.golden
@@ -19,14 +19,15 @@ Flags:
 Global Flags:
       --alsologtostderr                  log to standard error as well as files
       --kubeconfig string                Paths to a kubeconfig. Only required if out-of-cluster.
+      --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
+      --log-file-max-size uint           Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800)
       --log-flush-frequency duration     Maximum number of seconds between log flushes (default 5s)
-      --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 (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
-      --skip_log_headers                 If true, avoid headers when openning log files
+      --skip-headers                     If true, avoid header prefixes in the log messages
+      --skip-log-headers                 If true, avoid headers when openning log files
       --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
   -v, --v Level                          number for the log level verbosity
       --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
diff --git a/cmd/clusterctl/testdata/create-no-args-invalid-flag.golden b/cmd/clusterctl/testdata/create-no-args-invalid-flag.golden
index f198a3a91c13..b6ca97cd1b0d 100644
--- a/cmd/clusterctl/testdata/create-no-args-invalid-flag.golden
+++ b/cmd/clusterctl/testdata/create-no-args-invalid-flag.golden
@@ -11,14 +11,15 @@ Flags:
 Global Flags:
       --alsologtostderr                  log to standard error as well as files
       --kubeconfig string                Paths to a kubeconfig. Only required if out-of-cluster.
+      --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
+      --log-file-max-size uint           Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800)
       --log-flush-frequency duration     Maximum number of seconds between log flushes (default 5s)
-      --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 (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
-      --skip_log_headers                 If true, avoid headers when openning log files
+      --skip-headers                     If true, avoid header prefixes in the log messages
+      --skip-log-headers                 If true, avoid headers when openning log files
       --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
   -v, --v Level                          number for the log level verbosity
       --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
diff --git a/cmd/clusterctl/testdata/create-no-args.golden b/cmd/clusterctl/testdata/create-no-args.golden
index ff38b63aa248..5369b32f3122 100644
--- a/cmd/clusterctl/testdata/create-no-args.golden
+++ b/cmd/clusterctl/testdata/create-no-args.golden
@@ -12,14 +12,15 @@ Flags:
 Global Flags:
       --alsologtostderr                  log to standard error as well as files
       --kubeconfig string                Paths to a kubeconfig. Only required if out-of-cluster.
+      --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
+      --log-file-max-size uint           Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800)
       --log-flush-frequency duration     Maximum number of seconds between log flushes (default 5s)
-      --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 (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
-      --skip_log_headers                 If true, avoid headers when openning log files
+      --skip-headers                     If true, avoid header prefixes in the log messages
+      --skip-log-headers                 If true, avoid headers when openning log files
       --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
   -v, --v Level                          number for the log level verbosity
       --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
diff --git a/cmd/clusterctl/testdata/delete-cluster-no-args-invalid-flag.golden b/cmd/clusterctl/testdata/delete-cluster-no-args-invalid-flag.golden
index 8534d1a70d18..4c2c40b13d9a 100644
--- a/cmd/clusterctl/testdata/delete-cluster-no-args-invalid-flag.golden
+++ b/cmd/clusterctl/testdata/delete-cluster-no-args-invalid-flag.golden
@@ -16,14 +16,15 @@ Flags:
 Global Flags:
       --alsologtostderr                  log to standard error as well as files
       --kubeconfig string                Paths to a kubeconfig. Only required if out-of-cluster.
+      --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
+      --log-file-max-size uint           Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800)
       --log-flush-frequency duration     Maximum number of seconds between log flushes (default 5s)
-      --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 (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
-      --skip_log_headers                 If true, avoid headers when openning log files
+      --skip-headers                     If true, avoid header prefixes in the log messages
+      --skip-log-headers                 If true, avoid headers when openning log files
       --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
   -v, --v Level                          number for the log level verbosity
       --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
diff --git a/cmd/clusterctl/testdata/delete-cluster-no-args.golden b/cmd/clusterctl/testdata/delete-cluster-no-args.golden
index 3458fcd0ebe0..82e0add99b9f 100644
--- a/cmd/clusterctl/testdata/delete-cluster-no-args.golden
+++ b/cmd/clusterctl/testdata/delete-cluster-no-args.golden
@@ -18,14 +18,15 @@ Flags:
 Global Flags:
       --alsologtostderr                  log to standard error as well as files
       --kubeconfig string                Paths to a kubeconfig. Only required if out-of-cluster.
+      --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
+      --log-file-max-size uint           Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800)
       --log-flush-frequency duration     Maximum number of seconds between log flushes (default 5s)
-      --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 (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
-      --skip_log_headers                 If true, avoid headers when openning log files
+      --skip-headers                     If true, avoid header prefixes in the log messages
+      --skip-log-headers                 If true, avoid headers when openning log files
       --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
   -v, --v Level                          number for the log level verbosity
       --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
diff --git a/cmd/clusterctl/testdata/delete-no-args-invalid-flag.golden b/cmd/clusterctl/testdata/delete-no-args-invalid-flag.golden
index 3f108a34cfc9..54ed0e0ebcc8 100644
--- a/cmd/clusterctl/testdata/delete-no-args-invalid-flag.golden
+++ b/cmd/clusterctl/testdata/delete-no-args-invalid-flag.golden
@@ -11,14 +11,15 @@ Flags:
 Global Flags:
       --alsologtostderr                  log to standard error as well as files
       --kubeconfig string                Paths to a kubeconfig. Only required if out-of-cluster.
+      --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
+      --log-file-max-size uint           Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800)
       --log-flush-frequency duration     Maximum number of seconds between log flushes (default 5s)
-      --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 (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
-      --skip_log_headers                 If true, avoid headers when openning log files
+      --skip-headers                     If true, avoid header prefixes in the log messages
+      --skip-log-headers                 If true, avoid headers when openning log files
       --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
   -v, --v Level                          number for the log level verbosity
       --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
diff --git a/cmd/clusterctl/testdata/delete-no-args.golden b/cmd/clusterctl/testdata/delete-no-args.golden
index bdbf3b0e6fd1..86cc1d355e84 100644
--- a/cmd/clusterctl/testdata/delete-no-args.golden
+++ b/cmd/clusterctl/testdata/delete-no-args.golden
@@ -12,14 +12,15 @@ Flags:
 Global Flags:
       --alsologtostderr                  log to standard error as well as files
       --kubeconfig string                Paths to a kubeconfig. Only required if out-of-cluster.
+      --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
+      --log-file-max-size uint           Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800)
       --log-flush-frequency duration     Maximum number of seconds between log flushes (default 5s)
-      --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 (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
-      --skip_log_headers                 If true, avoid headers when openning log files
+      --skip-headers                     If true, avoid header prefixes in the log messages
+      --skip-log-headers                 If true, avoid headers when openning log files
       --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
   -v, --v Level                          number for the log level verbosity
       --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
diff --git a/cmd/clusterctl/testdata/no-args-invalid-flag.golden b/cmd/clusterctl/testdata/no-args-invalid-flag.golden
index db8c79cc5cf9..cbe4f8e4efd6 100644
--- a/cmd/clusterctl/testdata/no-args-invalid-flag.golden
+++ b/cmd/clusterctl/testdata/no-args-invalid-flag.golden
@@ -14,14 +14,15 @@ Flags:
       --alsologtostderr                  log to standard error as well as files
   -h, --help                             help for clusterctl
       --kubeconfig string                Paths to a kubeconfig. Only required if out-of-cluster.
+      --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
+      --log-file-max-size uint           Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800)
       --log-flush-frequency duration     Maximum number of seconds between log flushes (default 5s)
-      --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 (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
-      --skip_log_headers                 If true, avoid headers when openning log files
+      --skip-headers                     If true, avoid header prefixes in the log messages
+      --skip-log-headers                 If true, avoid headers when openning log files
       --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
   -v, --v Level                          number for the log level verbosity
       --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
diff --git a/cmd/clusterctl/testdata/no-args.golden b/cmd/clusterctl/testdata/no-args.golden
index 909994af08f6..005a7c359f89 100644
--- a/cmd/clusterctl/testdata/no-args.golden
+++ b/cmd/clusterctl/testdata/no-args.golden
@@ -15,14 +15,15 @@ Flags:
       --alsologtostderr                  log to standard error as well as files
   -h, --help                             help for clusterctl
       --kubeconfig string                Paths to a kubeconfig. Only required if out-of-cluster.
+      --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
+      --log-file-max-size uint           Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800)
       --log-flush-frequency duration     Maximum number of seconds between log flushes (default 5s)
-      --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 (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
-      --skip_log_headers                 If true, avoid headers when openning log files
+      --skip-headers                     If true, avoid header prefixes in the log messages
+      --skip-log-headers                 If true, avoid headers when openning log files
       --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
   -v, --v Level                          number for the log level verbosity
       --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
diff --git a/cmd/clusterctl/testdata/validate-cluster-no-args-invalid-flag.golden b/cmd/clusterctl/testdata/validate-cluster-no-args-invalid-flag.golden
index 0bcd6d36ecdb..9ca44dee7cab 100644
--- a/cmd/clusterctl/testdata/validate-cluster-no-args-invalid-flag.golden
+++ b/cmd/clusterctl/testdata/validate-cluster-no-args-invalid-flag.golden
@@ -11,14 +11,15 @@ Flags:
 Global Flags:
       --alsologtostderr                  log to standard error as well as files
       --kubeconfig string                Paths to a kubeconfig. Only required if out-of-cluster.
+      --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
+      --log-file-max-size uint           Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800)
       --log-flush-frequency duration     Maximum number of seconds between log flushes (default 5s)
-      --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 (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
-      --skip_log_headers                 If true, avoid headers when openning log files
+      --skip-headers                     If true, avoid header prefixes in the log messages
+      --skip-log-headers                 If true, avoid headers when openning log files
       --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
   -v, --v Level                          number for the log level verbosity
       --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
diff --git a/cmd/clusterctl/testdata/validate-no-args-invalid-flag.golden b/cmd/clusterctl/testdata/validate-no-args-invalid-flag.golden
index 4e7a2fbc7dd9..943573942336 100644
--- a/cmd/clusterctl/testdata/validate-no-args-invalid-flag.golden
+++ b/cmd/clusterctl/testdata/validate-no-args-invalid-flag.golden
@@ -11,14 +11,15 @@ Flags:
 Global Flags:
       --alsologtostderr                  log to standard error as well as files
       --kubeconfig string                Paths to a kubeconfig. Only required if out-of-cluster.
+      --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
+      --log-file-max-size uint           Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800)
       --log-flush-frequency duration     Maximum number of seconds between log flushes (default 5s)
-      --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 (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
-      --skip_log_headers                 If true, avoid headers when openning log files
+      --skip-headers                     If true, avoid header prefixes in the log messages
+      --skip-log-headers                 If true, avoid headers when openning log files
       --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
   -v, --v Level                          number for the log level verbosity
       --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
diff --git a/cmd/clusterctl/testdata/validate-no-args.golden b/cmd/clusterctl/testdata/validate-no-args.golden
index e11d68ba58c4..e88396b0321c 100644
--- a/cmd/clusterctl/testdata/validate-no-args.golden
+++ b/cmd/clusterctl/testdata/validate-no-args.golden
@@ -12,14 +12,15 @@ Flags:
 Global Flags:
       --alsologtostderr                  log to standard error as well as files
       --kubeconfig string                Paths to a kubeconfig. Only required if out-of-cluster.
+      --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
+      --log-file-max-size uint           Defines the maximum size a log file can grow to. Unit is megabytes. If the value is 0, the maximum file size is unlimited. (default 1800)
       --log-flush-frequency duration     Maximum number of seconds between log flushes (default 5s)
-      --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 (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
-      --skip_log_headers                 If true, avoid headers when openning log files
+      --skip-headers                     If true, avoid header prefixes in the log messages
+      --skip-log-headers                 If true, avoid headers when openning log files
       --stderrthreshold severity         logs at or above this threshold go to stderr (default 2)
   -v, --v Level                          number for the log level verbosity
       --vmodule moduleSpec               comma-separated list of pattern=N settings for file-filtered logging
diff --git a/pkg/controller/noderefutil/util.go b/pkg/controller/noderefutil/util.go
index a5bf0b84228e..d7dd79b8db87 100644
--- a/pkg/controller/noderefutil/util.go
+++ b/pkg/controller/noderefutil/util.go
@@ -60,7 +60,7 @@ func GetReadyCondition(status *corev1.NodeStatus) *corev1.NodeCondition {
 
 // IsNodeReady returns true if a node is ready; false otherwise.
 func IsNodeReady(node *corev1.Node) bool {
-	if node == nil || &node.Status == nil {
+	if node == nil {
 		return false
 	}
 	for _, c := range node.Status.Conditions {