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 only take effect after restarting a pod.

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

@@ -17,13 +17,13 @@ limitations under the License.
 package v1beta1
 
 import (
-	"k8s.io/apimachinery/pkg/util/validation/field"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/condition"
 	"github.com/openstack-k8s-operators/lib-common/modules/common/tls"
+	"k8s.io/apimachinery/pkg/util/validation/field"
 
+	topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
 	corev1 "k8s.io/api/core/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	topologyv1 "github.com/openstack-k8s-operators/infra-operator/apis/topology/v1beta1"
 )
 
 const (
@@ -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
@@ -204,7 +214,7 @@ type OVSExternalIDs struct {
 	OvnAvailabilityZones []string `json:"availability-zones,omitempty"`
 
 	// DEPRECATED: To be removed in the next API version
-        // Any value set to this field is ignored
+	// Any value set to this field is ignored
 	// +kubebuilder:validation:Optional
 	// +kubebuilder:default=true
 	EnableChassisAsGateway *bool `json:"enable-chassis-as-gateway"`

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).

pkg/ovncontroller/daemonset.go

@@ -63,6 +63,7 @@ func CreateOVNDaemonSet(
 			fmt.Sprintf("--certificate=%s", ovn_common.OVNDbCertPath),
 			fmt.Sprintf("--private-key=%s", ovn_common.OVNDbKeyPath),
 			fmt.Sprintf("--ca-cert=%s", ovn_common.OVNDbCaCertPath),
+			fmt.Sprintf("--verbose=%s", instance.Spec.OVNLogLevel),
 		}...)
 	}
 
@@ -238,6 +239,7 @@ func CreateOVSDaemonSet(
 
 	envVars := map[string]env.Setter{}
 	envVars["CONFIG_HASH"] = env.SetValue(configHash)
+	envVars["OVSLogLevel"] = env.SetValue(instance.Spec.OVSLogLevel)
 
 	initContainers := []corev1.Container{
 		{

templates/ovncontroller/bin/functions

@@ -22,6 +22,7 @@ OVNAvailabilityZones=${OVNAvailabilityZones:-""}
 EnableChassisAsGateway=${EnableChassisAsGateway:-true}
 PhysicalNetworks=${PhysicalNetworks:-""}
 OVNHostName=${OVNHostName:-""}
+OVSLogLevel=${OVSLogLevel:-"info"}
 DB_FILE=/etc/openvswitch/conf.db
 
 ovs_dir=/var/lib/openvswitch

templates/ovncontroller/bin/start-ovsdb-server.sh

@@ -26,4 +26,5 @@ ovsdb-server ${DB_FILE} \
     --remote=punix:/var/run/openvswitch/db.sock \
     --private-key=db:Open_vSwitch,SSL,private_key \
     --certificate=db:Open_vSwitch,SSL,certificate \
+    --verbose=${OVSLogLevel}
     --bootstrap-ca-cert=db:Open_vSwitch,SSL,ca_cert

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,
@@ -52,6 +53,9 @@ cleanup_flows_backup
 # Now, inform vswitchd that we are done.
 ovs-vsctl remove open_vswitch . other_config flow-restore-wait
 
+# Set the log level for ovs-vswitchd
+/usr/bin/ovs-appctl vlog/set ${OVSLogLevel}
+
 # This is container command script. Block it from exiting, otherwise k8s will
 # restart the container again.
 tail -f /var/log/openvswitch/ovs-vswitchd.log