Merge pull request #134 from oshoval/logv

logs: Add custom verbosity, and change selected logs verbosity

Author: kubevirt-bot

cmd/main.go

@@ -19,6 +19,7 @@ package main
 import (
 	"crypto/tls"
 	"flag"
+	"fmt"
 	"os"
 
 	// Import all Kubernetes client auth plugins (e.g. Azure, GCP, OIDC, etc.)
@@ -33,11 +34,12 @@ import (
 	clientgoscheme "k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/rest"
 
+	klog "k8s.io/klog/v2"
+
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/cache"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/healthz"
-	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 	"sigs.k8s.io/controller-runtime/pkg/webhook"
 
 	virtv1 "kubevirt.io/api/core/v1"
@@ -90,13 +92,20 @@ func main() {
 		"Define the namespace where the NAD to override the default network is located",
 	)
 
-	opts := zap.Options{
-		Development: true,
+	klog.InitFlags(nil)
+
+	logLevelStr := os.Getenv("LOG_LEVEL")
+	if logLevelStr == "" {
+		logLevelStr = "0"
 	}
-	opts.BindFlags(flag.CommandLine)
+	if err := flag.Set("v", logLevelStr); err != nil {
+		fmt.Fprintf(os.Stderr, "failed to set log level: %v\n", err)
+		os.Exit(1)
+	}
+
 	flag.Parse()
 
-	ctrl.SetLogger(zap.New(zap.UseFlagOptions(&opts)))
+	ctrl.SetLogger(klog.NewKlogr())
 
 	// if the enable-http2 flag is false (the default), http/2 should be disabled
 	// due to its vulnerabilities. More specifically, disabling http/2 will

config/manager/manager.yaml

@@ -67,6 +67,9 @@ spec:
         - --leader-elect
         image: controller:latest
         name: manager
+        env:
+        - name: LOG_LEVEL
+          value: "0"
         securityContext:
           allowPrivilegeEscalation: false
           capabilities:

dist/install.yaml

@@ -225,6 +225,9 @@ spec:
         - --leader-elect
         command:
         - /manager
+        env:
+        - name: LOG_LEVEL
+          value: "0"
         image: ghcr.io/kubevirt/ipam-controller:main
         livenessProbe:
           httpGet:

go.mod

@@ -14,6 +14,7 @@ require (
 	k8s.io/api v0.32.5
 	k8s.io/apimachinery v0.32.5
 	k8s.io/client-go v0.32.5
+	k8s.io/klog/v2 v2.130.1
 	k8s.io/utils v0.0.0-20241210054802-24370beab758
 	kubevirt.io/api v1.4.0
 	sigs.k8s.io/controller-runtime v0.19.4
@@ -72,7 +73,6 @@ require (
 	gopkg.in/inf.v0 v0.9.1 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 	k8s.io/apiextensions-apiserver v0.32.0 // indirect
-	k8s.io/klog/v2 v2.130.1 // indirect
 	k8s.io/kube-openapi v0.0.0-20241212222426-2c72e554b1e7 // indirect
 	kubevirt.io/containerized-data-importer-api v1.57.0-alpha1 // indirect
 	kubevirt.io/controller-lifecycle-operator-sdk/api v0.0.0-20220329064328-f3cc58c6ed90 // indirect

pkg/ipamclaimswebhook/podmutator.go

@@ -83,11 +83,11 @@ func (a *IPAMClaimsValet) Handle(ctx context.Context, request admission.Request)
 		return admission.Errored(http.StatusBadRequest, err)
 	}
 
-	log.Info("webhook handling event")
+	log.V(1).Info("webhook handling event")
 
 	vmName, hasVMAnnotation := pod.Annotations["kubevirt.io/domain"]
 	if !hasVMAnnotation {
-		log.Info(
+		log.V(1).Info(
 			"does not have the kubevirt VM annotation",
 		)
 		return admission.Allowed("not a VM")
@@ -191,7 +191,7 @@ func (a *IPAMClaimsValet) Handle(ctx context.Context, request admission.Request)
 			return admission.Errored(http.StatusInternalServerError, err)
 		}
 
-		log.Info("new pod annotations", "pod", newPod.Annotations)
+		log.V(1).Info("new pod annotations", "pod", newPod.Annotations)
 		return admission.PatchResponseFromRaw(request.Object.Raw, marshaledPod)
 	}
 
@@ -275,7 +275,7 @@ func ensureIPAMClaimRefAtNetworkSelectionElements(ctx context.Context,
 	hasChangedNetworkSelectionElements := false
 	for i, networkSelectionElement := range networkSelectionElements {
 		nadName := fmt.Sprintf("%s/%s", networkSelectionElement.Namespace, networkSelectionElement.Name)
-		log.Info(
+		log.V(1).Info(
 			"iterating network selection elements",
 			"NAD", nadName,
 		)
@@ -369,7 +369,7 @@ func primaryNetworkConfig(
 ) (*config.RelevantConfig, error) {
 	log := logf.FromContext(ctx)
 
-	log.Info(
+	log.V(1).Info(
 		"Looking for primary network config",
 		"vmi",
 		client.ObjectKeyFromObject(vmi),
@@ -381,7 +381,7 @@ func primaryNetworkConfig(
 	}
 
 	if primaryNetworkNAD == nil {
-		log.Info(
+		log.V(1).Info(
 			"Did not find primary network config",
 			"namespace", vmi.Namespace,
 		)

pkg/vminetworkscontroller/vmi_controller.go

@@ -112,7 +112,7 @@ func (r *VirtualMachineInstanceReconciler) Reconcile(
 				}
 
 				if len(existingIPAMClaim.OwnerReferences) == 1 && existingIPAMClaim.OwnerReferences[0].UID == ownerInfo.UID {
-					r.Log.Info("found existing IPAMClaim belonging to this VM/VMI, nothing to do", "UID", ownerInfo.UID)
+					r.Log.V(1).Info("found existing IPAMClaim belonging to this VM/VMI, nothing to do", "UID", ownerInfo.UID)
 					continue
 				} else {
 					err := fmt.Errorf("failed since it found an existing IPAMClaim for %q", claimKey.Name)