Merge "[Calico] Logging fixes/updates"

calico/templates/bin/_calico-settings.sh.tpl

@@ -24,9 +24,9 @@ kind: BGPConfiguration
 metadata:
   name: default
 spec:
-  logSeverityScreen: Info
-  nodeToNodeMeshEnabled: {{ .Values.networking.settings.mesh }}
   asNumber: {{ .Values.networking.bgp.asnumber }}
+  logSeverityScreen: {{ .Values.conf.node.FELIX_LOGSEVERITYSCREEN }}
+  nodeToNodeMeshEnabled: {{ .Values.networking.settings.mesh }}
 EOF
 
 # FelixConfiguration: ipipEnabled
@@ -37,7 +37,7 @@ metadata:
   name: default
 spec:
   ipipEnabled: {{ .Values.networking.settings.ippool.ipip.enabled }}
-  logSeverityScreen: Info
+  logSeverityScreen: {{ .Values.conf.node.FELIX_LOGSEVERITYSCREEN }}
 EOF
 
 # ipPool - https://docs.projectcalico.org/v3.2/reference/calicoctl/resources/ippool

calico/values.yaml

@@ -464,6 +464,9 @@ conf:
     # Disable file logging so `kubectl logs` works.
     CALICO_DISABLE_FILE_LOGGING: "true"
     # Set Felix endpoint to host default action to ACCEPT.
+    # early/startup log level for calico-node on startup.  Titlecase
+    # not lowercase.
+    CALICO_STARTUP_LOGLEVEL: "Info"
     FELIX_DEFAULTENDPOINTTOHOSTACTION: "ACCEPT"
     # Configure the IP Pool from which Pod IPs will be chosen.
     CALICO_IPV4POOL_CIDR: null
@@ -474,8 +477,8 @@ conf:
     FELIX_IPV6SUPPORT: "false"
     # Set MTU for tunnel device used if ipip is enabled
     FELIX_IPINIPMTU: null
-    # Set Felix logging to "info"
-    FELIX_LOGSEVERITYSCREEN: "info"
+    # Set Felix logging, Titlecase not lowercase.
+    FELIX_LOGSEVERITYSCREEN: "Info"
     FELIX_HEALTHENABLED: "true"
     # Set Felix experimental Prometheus metrics server
     FELIX_PROMETHEUSMETRICSENABLED: "true"