Skip to content

[shell-operator] fix: use informer logger for sync errors #921

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ldmonster merged 1 commit into from
Jul 9, 2026
Merged

[shell-operator] fix: use informer logger for sync errors #921

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion pkg/kube_events_manager/monitor.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -190,7 +190,7 @@ func (m *monitor) CreateInformers() error {

if m.Config.NamespaceSelector != nil && m.Config.NamespaceSelector.LabelSelector != nil {
logEntry.Debug("Create NamespaceInformer for namespace.labelSelector")
m.NamespaceInformer = NewNamespaceInformer(m.ctx, m.KubeClient, m.Config)
m.NamespaceInformer = NewNamespaceInformer(m.ctx, m.KubeClient, m.Config, m.logger.Named("namespace-informer"))
err := m.NamespaceInformer.createSharedInformer(
func(nsName string) {
// Added/Modified event: check, create and run informers for Ns
Expand Down
7 changes: 5 additions & 2 deletions pkg/kube_events_manager/namespace_informer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,11 @@ type namespaceInformer struct {

addFn func(string)
delFn func(string)

logger *log.Logger
}

func NewNamespaceInformer(ctx context.Context, client *klient.Client, monitor *MonitorConfig) *namespaceInformer {
func NewNamespaceInformer(ctx context.Context, client *klient.Client, monitor *MonitorConfig, logger *log.Logger) *namespaceInformer {
cctx, cancel := context.WithCancel(ctx)

informer := &namespaceInformer{
Expand All @@ -47,6 +49,7 @@ func NewNamespaceInformer(ctx context.Context, client *klient.Client, monitor *M
KubeClient: client,
Monitor: monitor,
ExistedObjects: make(map[string]bool),
logger: logger,
}
return informer
}
Expand Down Expand Up @@ -150,7 +153,7 @@ func (ni *namespaceInformer) start() {
if err := wait.PollUntilContextCancel(cctx, DefaultSyncTime, true, func(_ context.Context) (bool, error) {
return ni.SharedInformer.HasSynced(), nil
}); err != nil {
ni.Monitor.Logger.Error("Cache is not synced for informer",
ni.logger.Error("Cache is not synced for informer",
slog.String("debugName", ni.Monitor.Metadata.DebugName))
}

Expand Down
2 changes: 1 addition & 1 deletion pkg/kube_events_manager/resource_informer.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -463,7 +463,7 @@ func (ei *resourceInformer) start() {
errorHandler := newWatchErrorHandler(ei.Monitor.Metadata.DebugName, ei.Monitor.Kind, ei.Monitor.Metadata.LogLabels, ei.metricStorage, ei.logger.Named("watch-error-handler"))
err := DefaultFactoryStore.Start(ei.ctx, ei.id, ei.KubeClient.Dynamic(), ei.FactoryIndex, ei, errorHandler)
if err != nil {
ei.Monitor.Logger.Error("cache is not synced for informer", slog.String("debugName", ei.Monitor.Metadata.DebugName))
ei.logger.Error("cache is not synced for informer", slog.String("debugName", ei.Monitor.Metadata.DebugName))
return
}

Expand Down
Loading