refactor(logging): streamline klog verbosity handling

Replace SetKlogVerbosityFromConfigMap with a direct SetKlogVerbosity function that simplifies verbosity application. Update related calls in ConfigWatcher and tests to reflect this change, ensuring proper logging behavior for zero values. This refactor enhances clarity and reduces redundancy in the logging configuration process.

Author: Ankitsinghsisodya

pkg/adapter/v2/config.go

@@ -163,9 +163,7 @@ func (e *EnvConfig) GetLogger() *zap.SugaredLogger {
 
 		logger, _ := logging.NewLoggerFromConfig(loggingConfig, e.Component)
 
-		if _, err := pkgutils.SetKlogVerbosityFromConfigMap(map[string]string{
-			pkgutils.KlogVerbosityKey: e.KlogVerbosity,
-		}); err != nil {
+		if _, err := pkgutils.SetKlogVerbosity(e.KlogVerbosity); err != nil {
 			logger.Warnw("Failed to set klog verbosity", zap.Error(err))
 		}
 

pkg/reconciler/source/config_watcher.go

@@ -136,10 +136,6 @@ func (cw *ConfigWatcher) updateFromLoggingConfigMap(cfg *corev1.ConfigMap) {
 	cw.loggingCfg = loggingCfg
 	cw.klogVerbosity = cfg.Data[pkgutils.KlogVerbosityKey]
 
-	if _, err := pkgutils.SetKlogVerbosityFromConfigMap(cfg.Data); err != nil {
-		cw.logger.Warnw("failed to apply klog verbosity", zap.Error(err))
-	}
-
 	cw.logger.Debugw("Updated logging config from ConfigMap", zap.Any("ConfigMap", cfg))
 }
 

pkg/utils/logging.go

@@ -60,12 +60,11 @@ var (
 	klogMu sync.Mutex
 )
 
-// SetKlogVerbosityFromConfigMap reads klog-verbosity from the ConfigMap data and
-// applies it to klog. Missing, empty, or "0" values are no-ops and return
-// (false, nil). A level in the range 1–9 is applied and returns (true, nil).
-func SetKlogVerbosityFromConfigMap(data map[string]string) (bool, error) {
-	level, ok := data[KlogVerbosityKey]
-	if !ok || level == "" || level == "0" {
+// SetKlogVerbosity applies the given verbosity level string directly to klog.
+// An empty string is a no-op and returns (false, nil).
+// "0" resets verbosity and levels 1–9 raise it; both return (true, nil).
+func SetKlogVerbosity(level string) (bool, error) {
+	if level == "" {
 		return false, nil
 	}
 
@@ -82,6 +81,17 @@ func SetKlogVerbosityFromConfigMap(data map[string]string) (bool, error) {
 	return true, nil
 }
 
+// SetKlogVerbosityFromConfigMap reads klog-verbosity from the ConfigMap data and
+// applies it to klog. Missing or empty values are no-ops and return (false, nil).
+// "0" resets verbosity and levels 1–9 raise it; both return (true, nil).
+func SetKlogVerbosityFromConfigMap(data map[string]string) (bool, error) {
+	level, ok := data[KlogVerbosityKey]
+	if !ok || level == "" {
+		return false, nil
+	}
+	return SetKlogVerbosity(level)
+}
+
 // UpdateKlogVerbosityFromConfigMap returns a ConfigMap watch handler that updates
 // klog verbosity when the config-logging ConfigMap changes.
 func UpdateKlogVerbosityFromConfigMap(logger *zap.SugaredLogger) func(*corev1.ConfigMap) {

pkg/utils/logging_test.go

@@ -81,7 +81,7 @@ func TestSetKlogVerbosityFromConfigMap(t *testing.T) {
 		{
 			name:        "zero value",
 			data:        map[string]string{KlogVerbosityKey: "0"},
-			wantApplied: false,
+			wantApplied: true,
 			wantErr:     false,
 		},
 		{
@@ -155,10 +155,10 @@ func TestUpdateKlogVerbosityFromConfigMap(t *testing.T) {
 			wantInfo: false,
 		},
 		{
-			name:     "zero value - no log",
+			name:     "zero value - info logged",
 			data:     map[string]string{KlogVerbosityKey: "0"},
 			wantWarn: false,
-			wantInfo: false,
+			wantInfo: true,
 		},
 		{
 			name:     "empty value - no log",