Set logging level in ovn-controller

OVNLogLevel affects ovncontroller logs and OVSLogLevel affects
ovs-vswitchd and ovsdb-server. Both OVNLogLevel and OVSLogLevel can take
values from the vlog range: off, emer, err, warn, info, or dbg See
ovs-appctl(8) for a definition of each log level. The change of the log
level will be modified from the config pod and not on the pod itself to
avoid restarting ovn-controller and ovn-controller-ovs pods.

Resolves: OSPRH-6429
Signed-off-by: Elvira Garcia <[email protected]>

Author: elvgarrui

api/bases/ovn.openstack.org_ovncontrollers.yaml

@@ -147,10 +147,20 @@ spec:
                 description: Image used for the ovn-controller container (will be
                   set to environmental default if empty)
                 type: string
+              ovnLogLevel:
+                default: info
+                description: OVNLogLevel - Set log level off, emer, err, warn, info,
+                  or dbg. Default is info.
+                type: string
               ovsContainerImage:
                 description: Image used for the ovsdb-server and ovs-vswitchd containers
                   (will be set to environmental default if empty)
                 type: string
+              ovsLogLevel:
+                default: info
+                description: OVSLogLevel - Set log level off, emer, err, warn, info,
+                  or dbg. Default is info.
+                type: string
               resources:
                 description: |-
                   Resources - Compute Resources required by this service (Limits/Requests).

api/v1beta1/ovncontroller_types.go

@@ -94,6 +94,16 @@ type OVNControllerSpecCore struct {
 	// If specified the IP address of this network is used as the OVNEncapIP.
 	NetworkAttachment string `json:"networkAttachment"`
 
+	// +kubebuilder:validation:Optional
+	// +kubebuilder:default=info
+	// OVNLogLevel - Set log level off, emer, err, warn, info, or dbg. Default is info.
+	OVNLogLevel string `json:"ovnLogLevel,omitempty"`
+
+	// +kubebuilder:validation:Optional
+	// +kubebuilder:default=info
+	// OVSLogLevel - Set log level off, emer, err, warn, info, or dbg. Default is info.
+	OVSLogLevel string `json:"ovsLogLevel,omitempty"`
+
 	// +kubebuilder:validation:Optional
 	// +operator-sdk:csv:customresourcedefinitions:type=spec
 	// TLS - Parameters related to TLS

config/crd/bases/ovn.openstack.org_ovncontrollers.yaml

@@ -147,10 +147,20 @@ spec:
                 description: Image used for the ovn-controller container (will be
                   set to environmental default if empty)
                 type: string
+              ovnLogLevel:
+                default: info
+                description: OVNLogLevel - Set log level off, emer, err, warn, info,
+                  or dbg. Default is info.
+                type: string
               ovsContainerImage:
                 description: Image used for the ovsdb-server and ovs-vswitchd containers
                   (will be set to environmental default if empty)
                 type: string
+              ovsLogLevel:
+                default: info
+                description: OVSLogLevel - Set log level off, emer, err, warn, info,
+                  or dbg. Default is info.
+                type: string
               resources:
                 description: |-
                   Resources - Compute Resources required by this service (Limits/Requests).

controllers/ovncontroller_controller.go

@@ -943,6 +943,8 @@ func (r *OVNControllerReconciler) generateServiceConfigMaps(
 	// Add additional ConfigMap for extra configuration scripts
 	extraScriptsTemplateParameters := make(map[string]any)
 	extraScriptsTemplateParameters["OVNEncapTos"] = instance.Spec.ExternalIDS.OvnEncapTos
+	extraScriptsTemplateParameters["OVSLogLevel"] = instance.Spec.OVSLogLevel
+	extraScriptsTemplateParameters["OVNLogLevel"] = instance.Spec.OVNLogLevel
 
 	extraCms := []util.Template{
 		{

pkg/ovncontroller/configjob.go

@@ -64,6 +64,8 @@ func ConfigJob(
 	envVars["OVNAvailabilityZones"] = env.SetValue(strings.Join(instance.Spec.ExternalIDS.OvnAvailabilityZones, ":"))
 	envVars["PhysicalNetworks"] = env.SetValue(getPhysicalNetworks(instance))
 	envVars["OVNHostName"] = env.DownwardAPI("spec.nodeName")
+	envVars["OVNLogLevel"] = env.SetValue(instance.Spec.OVNLogLevel)
+	envVars["OVSLogLevel"] = env.SetValue(instance.Spec.OVSLogLevel)
 
 	for _, ovnPod := range ovnPods.Items {
 		commands := []string{

templates/ovncontroller/bin/start-vswitchd.sh

@@ -15,6 +15,7 @@
 # under the License.
 
 source $(dirname $0)/functions
+
 wait_for_ovsdb_server
 
 # The order - first wait for db server, then set -ex - is important. Otherwise,

templates/ovncontroller/config/configure-ovn.sh

@@ -20,10 +20,20 @@
 source $(dirname $0)/../container-scripts/functions
 
 OVNEncapTos={{.OVNEncapTos}}
+OVSLogLevel={{.OVSLogLevel}}
+OVNLogLevel={{.OVNLogLevel}}
 
 function configure_ovn_external_ids {
     ovs-vsctl set open . external-ids:ovn-encap-tos=${OVNEncapTos}
 }
 
+function configure_log_level {
+    ovs-appctl -t /var/run/openvswitch/ovs-vswitchd.5.ctl vlog/set ${OVSLogLevel}
+    ovs-appctl -t /var/run/openvswitch/ovs-vswitchd.11.ctl vlog/set ${OVSLogLevel}
+    ovn-appctl -t /var/run/ovn/ovn-controller.1.ctl vlog/set ${OVNLogLevel}
+}
+
+
 wait_for_ovsdb_server
 configure_ovn_external_ids
+configure_log_level