From 1e7d48846a59041f97d2e895b5ca0a991580cf33 Mon Sep 17 00:00:00 2001
From: holmesb <5072156+holmesb@users.noreply.github.com>
Date: Tue, 20 Apr 2021 23:37:42 +0100
Subject: [PATCH] Fixes issue #7528 - allow configuring CALICO_STARTUP_LOGLEVEL
 via a new variable: calico_node_startup_loglevel (#7530)

Signed-off-by: Brendan Holmes <5072156+holmesb@users.noreply.github.com>
---
 roles/network_plugin/calico/defaults/main.yml            | 1 +
 roles/network_plugin/calico/templates/calico-node.yml.j2 | 3 +++
 2 files changed, 4 insertions(+)

diff --git a/roles/network_plugin/calico/defaults/main.yml b/roles/network_plugin/calico/defaults/main.yml
index acca4c074..24b28bb7c 100644
--- a/roles/network_plugin/calico/defaults/main.yml
+++ b/roles/network_plugin/calico/defaults/main.yml
@@ -50,6 +50,7 @@ calico_felix_prometheusprocessmetricsenabled: true
 
 # Set the agent log level. Can be debug, warning, info or fatal
 calico_loglevel: info
+calico_node_startup_loglevel: error
 
 # Enable or disable usage report to 'usage.projectcalico.org'
 calico_usage_reporting: false
diff --git a/roles/network_plugin/calico/templates/calico-node.yml.j2 b/roles/network_plugin/calico/templates/calico-node.yml.j2
index 7c6c7900c..46367deb3 100644
--- a/roles/network_plugin/calico/templates/calico-node.yml.j2
+++ b/roles/network_plugin/calico/templates/calico-node.yml.j2
@@ -205,6 +205,9 @@ spec:
             # Set Felix logging to "info"
             - name: FELIX_LOGSEVERITYSCREEN
               value: "{{ calico_loglevel }}"
+            # Set Calico startup logging to "error"
+            - name: CALICO_STARTUP_LOGLEVEL
+              value: "{{ calico_node_startup_loglevel }}"
             # Enable or disable usage report
             - name: FELIX_USAGEREPORTINGENABLED
               value: "{{ calico_usage_reporting }}"