Set log level 2 by default

We are eating meaningful errors at 0, and we can't change the public signature of the image at this point. Like many processes, we should default to a higher log level here. We also broke --help on the main binary, fix that.
matthyx · Apr 6, 2020 · aee2b3d · aee2b3d
1 parent a94e05b
commit aee2b3d
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 6 deletions.
diff --git a/cmd/openshift-router/main.go b/cmd/openshift-router/main.go
@@ -31,10 +31,6 @@ func main() {
 	logFlags := flag.FlagSet{}
 	klog.InitFlags(&logFlags)
 	cmd.PersistentFlags().AddGoFlagSet(&logFlags)
-	if err := cmd.ParseFlags(os.Args); err != nil {
-		fmt.Fprintf(os.Stderr, "error: %v\n", err)
-		os.Exit(1)
-	}
 
 	if err := cmd.Execute(); err != nil {
 		fmt.Fprintf(os.Stderr, "error: %v\n", err)

diff --git a/images/router/haproxy/Dockerfile b/images/router/haproxy/Dockerfile
@@ -18,4 +18,4 @@ EXPOSE 80 443
 WORKDIR /var/lib/haproxy/conf
 ENV TEMPLATE_FILE=/var/lib/haproxy/conf/haproxy-config.template \
     RELOAD_SCRIPT=/var/lib/haproxy/reload-haproxy
-ENTRYPOINT ["/usr/bin/openshift-router"]
+ENTRYPOINT ["/usr/bin/openshift-router", "--v=2"]
diff --git a/images/router/haproxy/Dockerfile.rhel b/images/router/haproxy/Dockerfile.rhel
@@ -18,4 +18,4 @@ EXPOSE 80 443
 WORKDIR /var/lib/haproxy/conf
 ENV TEMPLATE_FILE=/var/lib/haproxy/conf/haproxy-config.template \
     RELOAD_SCRIPT=/var/lib/haproxy/reload-haproxy
-ENTRYPOINT ["/usr/bin/openshift-router"]
+ENTRYPOINT ["/usr/bin/openshift-router", "--v=2"]