github/kubeshark
1
0
Fork 0
mirror of https://github.com/kubeshark/kubeshark.git synced 2025-06-21 13:58:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

🐛 Fix PostWorkerPodToHub and PostTargettedPodsToHub failure

Browse Source
This commit is contained in:
M. Mert Yildiran 2022-12-26 07:23:00 +03:00
parent 8235dc7d5f
commit 57257025d2
No known key found for this signature in database
GPG Key ID: DA5D6DCBB758A461
2 changed files with 31 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cmd/tapRunner.go
View File

@ -174,17 +174,13 @@ func startWorkerSyncer(ctx context.Context, cancel context.CancelFunc, provider
log.Debug().Msg("workerSyncer pod changes channel closed, ending listener loop")
return
}
if err := connector.PostTargettedPodsToHub(workerSyncer.CurrentlyTargettedPods); err != nil {
log.Error().Err(err).Msg("Failed to POST targetted pods to Hub.")
}
go connector.PostTargettedPodsToHub(workerSyncer.CurrentlyTargettedPods)
case pod, ok := <-workerSyncer.WorkerPodsChanges:
if !ok {
log.Debug().Msg("workerSyncer worker status changed channel closed, ending listener loop")
return
}
if err := connector.PostWorkerPodToHub(pod); err != nil {
log.Error().Err(err).Msg("Failed to POST Worker pod to Hub.")
}
go connector.PostWorkerPodToHub(pod)
case <-ctx.Done():
log.Debug().Msg("workerSyncer event listener loop exiting due to context done")
return

43
internal/connect/hub.go
View File

@ -5,6 +5,7 @@ import (
"encoding/json"
"fmt"
"net/http"
"net/url"
"time"
"github.com/kubeshark/kubeshark/utils"
@ -62,32 +63,46 @@ func (connector *Connector) isReachable(path string) (bool, error) {
}
}
func (connector *Connector) PostWorkerPodToHub(pod *v1.Pod) error {
func (connector *Connector) PostWorkerPodToHub(pod *v1.Pod) {
postWorkerUrl := fmt.Sprintf("%s/pods/worker", connector.url)
if podMarshalled, err := json.Marshal(pod); err != nil {
return fmt.Errorf("Failed to marshal the Worker pod: %w", err)
log.Error().Err(err).Msg("Failed to marshal the Worker pod:")
} else {
if _, err := utils.Post(postWorkerUrl, "application/json", bytes.NewBuffer(podMarshalled), connector.client); err != nil {
return fmt.Errorf("Failed sending the Worker pod to Hub: %w", err)
} else {
log.Debug().Interface("worker-pod", pod).Msg("Reported worker pod to Hub:")
return nil
ok := false
for !ok {
if _, err = utils.Post(postWorkerUrl, "application/json", bytes.NewBuffer(podMarshalled), connector.client); err != nil {
if _, ok := err.(*url.Error); ok {
break
}
log.Debug().Err(err).Msg("Failed sending the Worker pod to Hub:")
} else {
ok = true
log.Debug().Interface("worker-pod", pod).Msg("Reported worker pod to Hub:")
}
time.Sleep(1 * time.Second)
}
}
}
func (connector *Connector) PostTargettedPodsToHub(pods []core.Pod) error {
func (connector *Connector) PostTargettedPodsToHub(pods []core.Pod) {
postTargettedUrl := fmt.Sprintf("%s/pods/targetted", connector.url)
if podsMarshalled, err := json.Marshal(pods); err != nil {
return fmt.Errorf("Failed to marshal the targetted pods: %w", err)
log.Error().Err(err).Msg("Failed to marshal the targetted pods:")
} else {
if _, err := utils.Post(postTargettedUrl, "application/json", bytes.NewBuffer(podsMarshalled), connector.client); err != nil {
return fmt.Errorf("Failed sending the targetted pods to Hub: %w", err)
} else {
log.Debug().Int("pod-count", len(pods)).Msg("Reported targetted pods to Hub:")
return nil
ok := false
for !ok {
if _, err = utils.Post(postTargettedUrl, "application/json", bytes.NewBuffer(podsMarshalled), connector.client); err != nil {
if _, ok := err.(*url.Error); ok {
break
}
log.Debug().Err(err).Msg("Failed sending the targetted pods to Hub:")
} else {
ok = true
log.Debug().Int("pod-count", len(pods)).Msg("Reported targetted pods to Hub:")
}
time.Sleep(1 * time.Second)
}
}
}