From a9008283b55e97412e9351d4ad80c3a8823f8b28 Mon Sep 17 00:00:00 2001 From: Robusta Runner Date: Wed, 3 Sep 2025 09:21:48 +0300 Subject: [PATCH] fix --- pkg/controller/controller.go | 8 ++++++-- pkg/handlers/flock/flock.go | 3 ++- pkg/handlers/lark/webhook.go | 3 ++- pkg/handlers/mattermost/mattermost.go | 3 ++- pkg/handlers/webhook/webhook.go | 3 ++- 5 files changed, 14 insertions(+), 6 deletions(-) diff --git a/pkg/controller/controller.go b/pkg/controller/controller.go index 5bb907a3..0bbabb38 100644 --- a/pkg/controller/controller.go +++ b/pkg/controller/controller.go @@ -598,10 +598,10 @@ func Start(conf *config.Config, eventHandler handlers.Handler) { func newResourceController(client kubernetes.Interface, eventHandler handlers.Handler, informer cache.SharedIndexInformer, resourceType string, apiVersion string, kubewatchEventsMetrics *prometheus.CounterVec) *Controller { queue := workqueue.NewRateLimitingQueue(workqueue.DefaultControllerRateLimiter()) - var newEvent Event - var err error informer.AddEventHandler(cache.ResourceEventHandlerFuncs{ AddFunc: func(obj interface{}) { + var newEvent Event + var err error var ok bool newEvent.namespace = "" // namespace retrived in processItem incase namespace value is empty newEvent.key, err = cache.MetaNamespaceKeyFunc(obj) @@ -620,6 +620,8 @@ func newResourceController(client kubernetes.Interface, eventHandler handlers.Ha kubewatchEventsMetrics.WithLabelValues(resourceType, "create").Inc() }, UpdateFunc: func(old, new interface{}) { + var newEvent Event + var err error var ok bool newEvent.namespace = "" // namespace retrived in processItem incase namespace value is empty newEvent.key, err = cache.MetaNamespaceKeyFunc(old) @@ -642,6 +644,8 @@ func newResourceController(client kubernetes.Interface, eventHandler handlers.Ha kubewatchEventsMetrics.WithLabelValues(resourceType, "update").Inc() }, DeleteFunc: func(obj interface{}) { + var newEvent Event + var err error var ok bool newEvent.namespace = "" // namespace retrived in processItem incase namespace value is empty newEvent.key, err = cache.DeletionHandlingMetaNamespaceKeyFunc(obj) diff --git a/pkg/handlers/flock/flock.go b/pkg/handlers/flock/flock.go index 7b01a595..d1976521 100644 --- a/pkg/handlers/flock/flock.go +++ b/pkg/handlers/flock/flock.go @@ -133,10 +133,11 @@ func postMessage(url string, flockMessage *FlockMessage) error { req.Header.Add("Content-Type", "application/json") client := &http.Client{} - _, err = client.Do(req) + resp, err := client.Do(req) if err != nil { return err } + defer resp.Body.Close() return nil } diff --git a/pkg/handlers/lark/webhook.go b/pkg/handlers/lark/webhook.go index a65c7a05..544e3598 100644 --- a/pkg/handlers/lark/webhook.go +++ b/pkg/handlers/lark/webhook.go @@ -106,9 +106,10 @@ func postMessage(url string, textMessage *TextMessage) error { req.Header.Add("Content-Type", "application/json") client := &http.Client{} - _, err = client.Do(req) + resp, err := client.Do(req) if err != nil { return err } + defer resp.Body.Close() return nil } diff --git a/pkg/handlers/mattermost/mattermost.go b/pkg/handlers/mattermost/mattermost.go index dff11387..8129763d 100644 --- a/pkg/handlers/mattermost/mattermost.go +++ b/pkg/handlers/mattermost/mattermost.go @@ -146,10 +146,11 @@ func postMessage(url string, mattermostMessage *MattermostMessage) error { req.Header.Add("Content-Type", "application/json") client := &http.Client{} - _, err = client.Do(req) + resp, err := client.Do(req) if err != nil { return err } + defer resp.Body.Close() return nil } diff --git a/pkg/handlers/webhook/webhook.go b/pkg/handlers/webhook/webhook.go index d20ff09d..4414ca58 100644 --- a/pkg/handlers/webhook/webhook.go +++ b/pkg/handlers/webhook/webhook.go @@ -149,10 +149,11 @@ func postMessage(url string, webhookMessage *WebhookMessage) error { req.Header.Add("Content-Type", "application/json") client := &http.Client{} - _, err = client.Do(req) + resp, err := client.Do(req) if err != nil { return err } + defer resp.Body.Close() return nil }