github/kubeshark
1
0
Fork 0
mirror of https://github.com/kubeshark/kubeshark.git synced 2025-09-17 15:21:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

⬆️ github.com/kubeshark/base@v0.1.3

Browse Source
This commit is contained in:
M. Mert Yildiran
2022-12-01 02:31:05 +03:00
parent 0662b0a4ef
commit 168234598a
7 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
cmd/deployRunner.go
View File

@@ -107,14 +107,14 @@ func finishDeployExecution(kubernetesProvider *kubernetes.Provider) {
func getDeployConfig() *models.Config { func getDeployConfig() *models.Config {
conf := models.Config{ conf := models.Config{
MaxDBSizeBytes: config.Config.Deploy.MaxEntriesDBSizeBytes(), MaxDBSizeBytes: config.Config.Deploy.MaxEntriesDBSizeBytes(),
InsertionFilter: config.Config.Deploy.GetInsertionFilter(), InsertionFilter: config.Config.Deploy.GetInsertionFilter(),
PullPolicy: config.Config.ImagePullPolicyStr, PullPolicy: config.Config.ImagePullPolicyStr,
TapperResources: config.Config.Deploy.WorkerResources, WorkerResources: config.Config.Deploy.WorkerResources,
KubesharkResourcesNamespace: config.Config.ResourcesNamespace, ResourcesNamespace: config.Config.ResourcesNamespace,
AgentDatabasePath: models.DataDirPath, DatabasePath: models.DataDirPath,
ServiceMap: config.Config.ServiceMap, ServiceMap: config.Config.ServiceMap,
OAS: config.Config.OAS, OAS: config.Config.OAS,
} }
return &conf return &conf

2
go.mod
View File

@@ -6,7 +6,7 @@ require (
github.com/creasty/defaults v1.5.2 github.com/creasty/defaults v1.5.2
github.com/docker/go-units v0.4.0 github.com/docker/go-units v0.4.0
github.com/google/go-github/v37 v37.0.0 github.com/google/go-github/v37 v37.0.0
github.com/kubeshark/base v0.1.1 github.com/kubeshark/base v0.1.3
github.com/rs/zerolog v1.28.0 github.com/rs/zerolog v1.28.0
github.com/spf13/cobra v1.3.0 github.com/spf13/cobra v1.3.0
github.com/spf13/pflag v1.0.5 github.com/spf13/pflag v1.0.5

4
go.sum
View File

@@ -407,8 +407,8 @@ github.com/kr/pty v1.1.1/go.mod h1:pFQYn66WHrOpPYNljwOMqo10TkYh1fy3cYio2l3bCsQ=
github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI= github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY= github.com/kr/text v0.2.0 h1:5Nx0Ya0ZqY2ygV366QzturHI13Jq95ApcVaJBhpS+AY=
github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE= github.com/kr/text v0.2.0/go.mod h1:eLer722TekiGuMkidMxC/pM04lWEeraHUUmBw8l2grE=
github.com/kubeshark/base v0.1.1 h1:HiYshnIATBc4WIPndj7OkS0xcdmsLn7idhLLZETGstg= github.com/kubeshark/base v0.1.3 h1:VEiwMBMhl5q512WxpKIq3mtATMdQa8qZCMx7doD9Eug=
github.com/kubeshark/base v0.1.1/go.mod h1:8JVCnumWkO43+wkLjv1rQufTArm8ckoxVrFcmZsCyKc= github.com/kubeshark/base v0.1.3/go.mod h1:65ju4+Mzl5eztP9ir2BUEOd1qhpOD7L0Zjj4PpZ2w6g=
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0= github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de h1:9TO3cAIGXtEhnIaL+V+BEER86oLrvS+kWobKpbJuye0=
github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE= github.com/liggitt/tabwriter v0.0.0-20181228230101-89fcab3d43de/go.mod h1:zAbeS9B/r2mtpb6U+EI2rYA5OAXxsYw6wTamcNW+zcE=
github.com/lithammer/dedent v1.1.0/go.mod h1:jrXYCQtgg0nJiN+StA2KgR7w6CiQNv9Fd/Z9BP0jIOc= github.com/lithammer/dedent v1.1.0/go.mod h1:jrXYCQtgg0nJiN+StA2KgR7w6CiQNv9Fd/Z9BP0jIOc=

6
internal/connect/hub.go
View File

@@ -62,8 +62,8 @@ func (connector *Connector) isReachable(path string) (bool, error) {
} }
} }
func (connector *Connector) ReportWorkerStatus(workerStatus models.TapperStatus) error { func (connector *Connector) ReportWorkerStatus(workerStatus models.WorkerStatus) error {
workerStatusUrl := fmt.Sprintf("%s/status/tapperStatus", connector.url) workerStatusUrl := fmt.Sprintf("%s/status/workerStatus", connector.url)
if jsonValue, err := json.Marshal(workerStatus); err != nil { if jsonValue, err := json.Marshal(workerStatus); err != nil {
return fmt.Errorf("Failed Marshal the worker status %w", err) return fmt.Errorf("Failed Marshal the worker status %w", err)
@@ -78,7 +78,7 @@ func (connector *Connector) ReportWorkerStatus(workerStatus models.TapperStatus)
} }
func (connector *Connector) ReportTargettedPods(pods []core.Pod) error { func (connector *Connector) ReportTargettedPods(pods []core.Pod) error {
targettedPodsUrl := fmt.Sprintf("%s/status/tappedPods", connector.url) targettedPodsUrl := fmt.Sprintf("%s/status/targettedPods", connector.url)
if jsonValue, err := json.Marshal(pods); err != nil { if jsonValue, err := json.Marshal(pods); err != nil {
return fmt.Errorf("Failed Marshal the targetted pods %w", err) return fmt.Errorf("Failed Marshal the targetted pods %w", err)

2
kubernetes/errors.go
View File

@@ -3,7 +3,7 @@ package kubernetes
type K8sDeployManagerErrorReason string type K8sDeployManagerErrorReason string
const ( const (
DeployManagerWorkerUpdateError K8sDeployManagerErrorReason = "TAPPER_UPDATE_ERROR" DeployManagerWorkerUpdateError K8sDeployManagerErrorReason = "WORKER_UPDATE_ERROR"
DeployManagerPodWatchError K8sDeployManagerErrorReason = "POD_WATCH_ERROR" DeployManagerPodWatchError K8sDeployManagerErrorReason = "POD_WATCH_ERROR"
DeployManagerPodListError K8sDeployManagerErrorReason = "POD_LIST_ERROR" DeployManagerPodListError K8sDeployManagerErrorReason = "POD_LIST_ERROR"
) )

8
kubernetes/kubesharkTapperSyncer.go
View File

@@ -30,7 +30,7 @@ type WorkerSyncer struct {
config WorkerSyncerConfig config WorkerSyncerConfig
kubernetesProvider *Provider kubernetesProvider *Provider
DeployPodChangesOut chan TargettedPodChangeEvent DeployPodChangesOut chan TargettedPodChangeEvent
WorkerStatusChangedOut chan models.TapperStatus WorkerStatusChangedOut chan models.WorkerStatus
ErrorOut chan K8sDeployManagerError ErrorOut chan K8sDeployManagerError
nodeToTargettedPodMap models.NodeToPodsMap nodeToTargettedPodMap models.NodeToPodsMap
targettedNodes []string targettedNodes []string
@@ -58,7 +58,7 @@ func CreateAndStartWorkerSyncer(ctx context.Context, kubernetesProvider *Provide
config: config, config: config,
kubernetesProvider: kubernetesProvider, kubernetesProvider: kubernetesProvider,
DeployPodChangesOut: make(chan TargettedPodChangeEvent, 100), DeployPodChangesOut: make(chan TargettedPodChangeEvent, 100),
WorkerStatusChangedOut: make(chan models.TapperStatus, 100), WorkerStatusChangedOut: make(chan models.WorkerStatus, 100),
ErrorOut: make(chan K8sDeployManagerError, 100), ErrorOut: make(chan K8sDeployManagerError, 100),
} }
@@ -101,7 +101,7 @@ func (workerSyncer *WorkerSyncer) watchWorkerPods() {
Interface("phase", pod.Status.Phase). Interface("phase", pod.Status.Phase).
Msg("Watching pod events...") Msg("Watching pod events...")
if pod.Spec.NodeName != "" { if pod.Spec.NodeName != "" {
workerStatus := models.TapperStatus{TapperName: pod.Name, NodeName: pod.Spec.NodeName, Status: string(pod.Status.Phase)} workerStatus := models.WorkerStatus{Name: pod.Name, NodeName: pod.Spec.NodeName, Status: string(pod.Status.Phase)}
workerSyncer.WorkerStatusChangedOut <- workerStatus workerSyncer.WorkerStatusChangedOut <- workerStatus
} }
@@ -166,7 +166,7 @@ func (workerSyncer *WorkerSyncer) watchWorkerEvents() {
nodeName = pod.Spec.Affinity.NodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution.NodeSelectorTerms[0].MatchFields[0].Values[0] nodeName = pod.Spec.Affinity.NodeAffinity.RequiredDuringSchedulingIgnoredDuringExecution.NodeSelectorTerms[0].MatchFields[0].Values[0]
} }
workerStatus := models.TapperStatus{TapperName: pod.Name, NodeName: nodeName, Status: string(pod.Status.Phase)} workerStatus := models.WorkerStatus{Name: pod.Name, NodeName: nodeName, Status: string(pod.Status.Phase)}
workerSyncer.WorkerStatusChangedOut <- workerStatus workerSyncer.WorkerStatusChangedOut <- workerStatus
case err, ok := <-errorChan: case err, ok := <-errorChan:

2
kubernetes/provider.go
View File

@@ -831,7 +831,7 @@ func (provider *Provider) ApplyWorkerDaemonSet(ctx context.Context, namespace st
kubesharkCmd := []string{ kubesharkCmd := []string{
"./worker", "./worker",
"-i", "any", "-i", "any",
"--api-server-address", fmt.Sprintf("ws://%s/wsTapper", hubPodIp), "--api-server-address", fmt.Sprintf("ws://%s/wsWorker", hubPodIp),
"--nodefrag", "--nodefrag",
"--max-live-streams", strconv.Itoa(maxLiveStreams), "--max-live-streams", strconv.Itoa(maxLiveStreams),
} }