Skip to content
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

Jump to bottom

fix(log): add custom error handler for Kubernetes API errors #1024

Draft
wants to merge 5 commits into
base: main
Choose a base branch
from
+30 −1
Draft

fix(log): add custom error handler for Kubernetes API errors #1024

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f352170
fix(log): add custom error handler for Kubernetes API errors
ritwikranjan Nov 18, 2024
97feca3
Merge branch 'main' into fix/k8s-watcher-logs
ritwikranjan Nov 18, 2024
c9cea88
Merge branch 'main' into fix/k8s-watcher-logs
ritwikranjan Nov 19, 2024
876d221
refactor: rename and relocate custom error handler for Kubernetes wat…
ritwikranjan Nov 19, 2024
bf509b4
Merge branch 'main' into fix/k8s-watcher-logs
ritwikranjan Nov 20, 2024
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/controllers/operator/cilium-crds/endpoint/endpoint_controller.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -533,7 +533,7 @@ func (r *endpointReconciler) handlePodUpsert(ctx context.Context, newPEP *PodEnd
// May end up getting another endpoint ID below if we try to create the CEP below.
// No downside to this.

if !k8serrors.IsNotFound(err) && err != nil {
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

this change is unrelated but was quick so did it, we have already checked this condition before so it was an always true condition

if !k8serrors.IsNotFound(err) {
r.l.WithError(err).WithFields(logrus.Fields{
"podKey": newPEP.key.String(),
"pep": newPEP,
Expand Down
29 changes: 29 additions & 0 deletions pkg/k8s/watcher_linux.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,12 @@ package k8s

import (
"context"
"strings"
"sync"
"time"

"k8s.io/apimachinery/pkg/util/runtime"

agentK8s "github.com/cilium/cilium/daemon/k8s"
"github.com/cilium/cilium/pkg/hive/cell"
"github.com/cilium/cilium/pkg/ipcache"
Expand All @@ -17,6 +20,13 @@ import (
"github.com/cilium/cilium/pkg/option"
)

func init() {
// Register custom error handler for the watcher
runtime.ErrorHandlers = []func(error){
retinaK8sErrorHandler,
}
}

const (
K8sAPIGroupCiliumEndpointV2 = "cilium/v2::CiliumEndpoint"
K8sAPIGroupServiceV1Core = "core/v1::Service"
Expand Down Expand Up @@ -92,3 +102,22 @@ func Start(ctx context.Context, k *watchers.K8sWatcher) {
<-syncdCache
logger.Info("Kubernetes watcher synced")
}

// retinaK8sErrorHandler is a custom error handler for the watcher
// that logs the error and tags the error to easily identify
func retinaK8sErrorHandler(e error) {
errStr := e.Error()
switch {
case strings.Contains(errStr, "Failed to watch *v1.Node"):
logger.WithField("actualError", errStr).Error("Potentially Network Error coming from K8s API Server failing to watch Nodes")
case strings.Contains(errStr, "Failed to watch *v2.CiliumEndpoint"):
logger.WithField("actualError", errStr).Error("Potentially Network Error coming from K8s API Server failing to watch CiliumEndpoints")
case strings.Contains(errStr, "Failed to watch *v1.Service"):
logger.WithField("actualError", errStr).Error("Potentially Network Error coming from K8s API Server failing to watch Services")
case strings.Contains(errStr, "Failed to watch *v2.CiliumNode"):
logger.WithField("actualError", errStr).Error("Potentially Network Error coming from K8s API Server failing to watch CiliumNodes")

default:
k8s.K8sErrorHandler(e)
}
}
Loading