Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ require (
k8s.io/api v0.35.4
k8s.io/apimachinery v0.35.4
k8s.io/client-go v0.35.4
knative.dev/eventing v0.49.1-0.20260506130425-5a46719f32de
knative.dev/eventing v0.49.1-0.20260511150731-43e651f7940a
knative.dev/hack v0.0.0-20260428014158-b2a37f1b6e7b
knative.dev/pkg v0.0.0-20260505204821-021ad709ec68
knative.dev/pkg v0.0.0-20260507212125-df317a52d112
)

require (
Expand Down
8 changes: 4 additions & 4 deletions go.sum
Original file line number Diff line number Diff line change
Expand Up @@ -348,12 +348,12 @@ k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912 h1:Y3gxNAuB0OBLImH611+UDZ
k8s.io/kube-openapi v0.0.0-20250910181357-589584f1c912/go.mod h1:kdmbQkyfwUagLfXIad1y2TdrjPFWp2Q89B3qkRwf/pQ=
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4 h1:SjGebBtkBqHFOli+05xYbK8YF1Dzkbzn+gDM4X9T4Ck=
k8s.io/utils v0.0.0-20251002143259-bc988d571ff4/go.mod h1:OLgZIPagt7ERELqWJFomSt595RzquPNLL48iOWgYOg0=
knative.dev/eventing v0.49.1-0.20260506130425-5a46719f32de h1:IMqOe0mpAq3hsLsO4vJ5QhT/a6A+sO498mQZ8YiUrxw=
knative.dev/eventing v0.49.1-0.20260506130425-5a46719f32de/go.mod h1:uH3Qh1gRhNPoO/hidrGp36gyl21m5wtuqiahNlrVXI4=
knative.dev/eventing v0.49.1-0.20260511150731-43e651f7940a h1:Iq198f0CCOm+gIArlRzxyw+Ini/izupUjBjqyZy6GoM=
knative.dev/eventing v0.49.1-0.20260511150731-43e651f7940a/go.mod h1:rqixbt+It0fwbQQuPjVDAEiLi12KnLG3Bmul3T5IHAM=
knative.dev/hack v0.0.0-20260428014158-b2a37f1b6e7b h1:MvbV2F2BdI8qKrYYUhDwbUZbX0BAYRSIpXM2TOtTvs0=
knative.dev/hack v0.0.0-20260428014158-b2a37f1b6e7b/go.mod h1:L5RzHgbvam0u8QFHfzCX6MKxu/a/gIGEdaRBqNiVbl0=
knative.dev/pkg v0.0.0-20260505204821-021ad709ec68 h1:cZz3AkOusfsFBJCOKiCiadBbHjbEiqlsu/55gzRhPZM=
knative.dev/pkg v0.0.0-20260505204821-021ad709ec68/go.mod h1:JM+8ds+MTBtPK2aCp6pGUHQx9gNIL8wuMhqr0sxtDog=
knative.dev/pkg v0.0.0-20260507212125-df317a52d112 h1:ftdGpzukmrlcTRTCZytQQ+mAMUAFqcq/cwIUwc/Lk2s=
knative.dev/pkg v0.0.0-20260507212125-df317a52d112/go.mod h1:JM+8ds+MTBtPK2aCp6pGUHQx9gNIL8wuMhqr0sxtDog=
sigs.k8s.io/gateway-api v1.1.0 h1:DsLDXCi6jR+Xz8/xd0Z1PYl2Pn0TyaFMOPPZIj4inDM=
sigs.k8s.io/gateway-api v1.1.0/go.mod h1:ZH4lHrL2sDi0FHZ9jjneb8kKnGzFWyrTya35sWUTrRs=
sigs.k8s.io/json v0.0.0-20250730193827-2d320260d730 h1:IpInykpT6ceI+QxKBbEflcR5EXP7sU1kvOlxwZh5txg=
Expand Down
10 changes: 10 additions & 0 deletions vendor/knative.dev/eventing/pkg/adapter/v2/config.go
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@ import (
"go.uber.org/zap"

"knative.dev/eventing/pkg/observability"
pkgutils "knative.dev/eventing/pkg/utils"
duckv1 "knative.dev/pkg/apis/duck/v1"
kle "knative.dev/pkg/leaderelection"
"knative.dev/pkg/logging"
Expand All @@ -47,6 +48,7 @@ const (
EnvConfigObservabilityConfig = "K_OBSERVABILITY_CONFIG"
EnvConfigLeaderElectionConfig = "K_LEADER_ELECTION_CONFIG"
EnvSinkTimeout = "K_SINK_TIMEOUT"
EnvConfigKlogVerbosity = "K_KLOG_VERBOSITY"
)

// EnvConfig is the minimal set of configuration parameters
Expand Down Expand Up @@ -86,6 +88,9 @@ type EnvConfig struct {
// a config map inside the controllers namespace and copied here.
LoggingConfigJson string `envconfig:"K_LOGGING_CONFIG" default:"{}"`

// KlogVerbosity is the klog verbosity level (0-9). Injected from config-logging ConfigMap.
KlogVerbosity string `envconfig:"K_KLOG_VERBOSITY" default:"0"`

// ObservabilityConfigJson is a json string of observability.Config.
// This is used to configure the observability config, the config is stored in
// a config map inside the controllers namespace and copied here.
Expand Down Expand Up @@ -157,6 +162,11 @@ func (e *EnvConfig) GetLogger() *zap.SugaredLogger {
}

logger, _ := logging.NewLoggerFromConfig(loggingConfig, e.Component)

if _, err := pkgutils.SetKlogVerbosity(e.KlogVerbosity); err != nil {
logger.Warnw("Failed to set klog verbosity", zap.Error(err))
}

e.logger = logger
}
return e.logger
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,7 @@ import (
"knative.dev/eventing/pkg/observability"
o11yconfigmap "knative.dev/eventing/pkg/observability/configmap"
"knative.dev/eventing/pkg/observability/otel"
"knative.dev/eventing/pkg/utils"
)

// loggerConfiguratorFromConfigMap dynamically
Expand Down Expand Up @@ -96,10 +97,17 @@ func (c *loggerConfiguratorFromConfigMap) CreateLogger(ctx context.Context) *zap

logger, atomicLevel := SetupLoggerFromConfig(lc, c.component)

if lcm != nil {
if _, err := utils.SetKlogVerbosityFromConfigMap(lcm.Data); err != nil {
logger.Warnw("Failed to set initial klog verbosity", zap.Error(err))
}
}

logger.Infof("Adding Watcher on ConfigMap %s for logs", c.configMapName)

cmw := ConfigWatcherFromContext(ctx)
cmw.Watch(c.configMapName, logging.UpdateLevelFromConfigMap(logger, atomicLevel, c.component))
cmw.Watch(c.configMapName, utils.UpdateKlogVerbosityFromConfigMap(logger))

return logger
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,15 @@ import (

"knative.dev/eventing/pkg/observability"
o11yconfigmap "knative.dev/eventing/pkg/observability/configmap"
pkgutils "knative.dev/eventing/pkg/utils"
"knative.dev/pkg/configmap"
"knative.dev/pkg/logging"
)

const (
EnvLoggingCfg = "K_LOGGING_CONFIG"
EnvObservabilityCfg = "K_OBSERVABILITY_CONFIG"
EnvKlogVerbosity = "K_KLOG_VERBOSITY"
)

type ConfigAccessor interface {
Expand All @@ -56,6 +58,8 @@ type ConfigWatcher struct {
// configurations remain nil if disabled
loggingCfg *logging.Config
observabilityCfg *observability.Config

klogVerbosity string
}

// configWatcherOption is a function option for ConfigWatchers.
Expand Down Expand Up @@ -130,6 +134,7 @@ func (cw *ConfigWatcher) updateFromLoggingConfigMap(cfg *corev1.ConfigMap) {
}

cw.loggingCfg = loggingCfg
cw.klogVerbosity = cfg.Data[pkgutils.KlogVerbosityKey]

cw.logger.Debugw("Updated logging config from ConfigMap", zap.Any("ConfigMap", cfg))
}
Expand Down Expand Up @@ -164,6 +169,7 @@ func (cw *ConfigWatcher) ToEnvVars() []corev1.EnvVar {
envs := make([]corev1.EnvVar, 0, 3)

envs = maybeAppendEnvVar(envs, cw.loggingConfigEnvVar(), cw.LoggingConfig() != nil)
envs = maybeAppendEnvVar(envs, cw.klogVerbosityEnvVar(), cw.LoggingConfig() != nil)
envs = maybeAppendEnvVar(envs, cw.observabilityConfigEnvVar(), cw.ObservabilityConfig() != nil)

return envs
Expand Down Expand Up @@ -206,6 +212,17 @@ func (cw *ConfigWatcher) loggingConfigEnvVar() corev1.EnvVar {
}
}

func (cw *ConfigWatcher) klogVerbosityEnvVar() corev1.EnvVar {
level := cw.klogVerbosity
if level == "" {
level = "0"
}
return corev1.EnvVar{
Name: EnvKlogVerbosity,
Value: level,
}
}

// loggingConfigEnvVar returns an EnvVar containing the serialized logging
// configuration from the ConfigWatcher.
func (cw *ConfigWatcher) observabilityConfigEnvVar() corev1.EnvVar {
Expand Down Expand Up @@ -254,6 +271,7 @@ var _ ConfigAccessor = (*EmptyVarsGenerator)(nil)
func (g *EmptyVarsGenerator) ToEnvVars() []corev1.EnvVar {
return []corev1.EnvVar{
{Name: EnvLoggingCfg},
{Name: EnvKlogVerbosity},
{Name: EnvObservabilityCfg},
}
}
Expand Down
68 changes: 68 additions & 0 deletions vendor/knative.dev/eventing/pkg/utils/logging.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,24 @@ package utils

import (
"context"
"flag"
"fmt"
"strconv"
"sync"

corev1 "k8s.io/api/core/v1"
apierrors "k8s.io/apimachinery/pkg/api/errors"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/klog/v2"

"go.uber.org/zap"
kubeclient "knative.dev/pkg/client/injection/kube/client"
"knative.dev/pkg/logging"
)

// KlogVerbosityKey is the key in config-logging ConfigMap for klog verbosity level.
const KlogVerbosityKey = "klog-verbosity"

// GetLoggingConfig fetches the logging ConfigMap from the given namespace and
// parses it into a *logging.Config. If the ConfigMap is not found, it returns
// the default logging config.
Expand All @@ -38,3 +48,61 @@ func GetLoggingConfig(ctx context.Context, namespace, loggingConfigMapName strin
}
return logging.NewConfigFromConfigMap(loggingConfigMap)
}

// klogFlagSet is initialized once at package load; reused on every verbosity update.
// klogMu guards all writes to klogFlagSet — flag.FlagSet.Set is not goroutine-safe.
var (
klogFlagSet = func() *flag.FlagSet {
fs := flag.NewFlagSet("klog", flag.ContinueOnError)
klog.InitFlags(fs)
return fs
}()
klogMu sync.Mutex
)

// 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
}

n, err := strconv.Atoi(level)
if err != nil || n < 0 || n > 9 {
return false, fmt.Errorf("invalid %s value %q: must be an integer between 0 and 9", KlogVerbosityKey, level)
}

klogMu.Lock()
defer klogMu.Unlock()
if err := klogFlagSet.Set("v", level); err != nil {
return false, err
}
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) {
return func(cm *corev1.ConfigMap) {
applied, err := SetKlogVerbosityFromConfigMap(cm.Data)
if err != nil {
logger.Warnw("Failed to update klog verbosity", zap.Error(err))
return
}
if applied {
logger.Infow("Updated klog verbosity", zap.String("level", cm.Data[KlogVerbosityKey]))
}
}
}
4 changes: 2 additions & 2 deletions vendor/modules.txt
Original file line number Diff line number Diff line change
Expand Up @@ -1095,7 +1095,7 @@ k8s.io/utils/net
k8s.io/utils/pointer
k8s.io/utils/ptr
k8s.io/utils/trace
# knative.dev/eventing v0.49.1-0.20260506130425-5a46719f32de
# knative.dev/eventing v0.49.1-0.20260511150731-43e651f7940a
## explicit; go 1.25.0
knative.dev/eventing/pkg/adapter/v2
knative.dev/eventing/pkg/adapter/v2/util/crstatusevent
Expand Down Expand Up @@ -1129,7 +1129,7 @@ knative.dev/eventing/pkg/utils
# knative.dev/hack v0.0.0-20260428014158-b2a37f1b6e7b
## explicit; go 1.24
knative.dev/hack
# knative.dev/pkg v0.0.0-20260505204821-021ad709ec68
# knative.dev/pkg v0.0.0-20260507212125-df317a52d112
## explicit; go 1.25.0
knative.dev/pkg/apis
knative.dev/pkg/apis/duck
Expand Down
Loading