github/kubeshark
1
0
Fork 0
mirror of https://github.com/kubeshark/kubeshark.git synced 2025-09-10 23:10:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Cleaning unused code (#129)

Browse Source 
* Cleaning unused code
This commit is contained in:
Igor Gov
2021-07-21 17:07:32 +03:00
committed by GitHub
parent 7d5ed601df
commit e42c4f8648
2 changed files with 14 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
cli/kubernetes/provider.go
View File

@@ -6,6 +6,7 @@ import (
"encoding/json"
"errors"
"fmt"
"os"
"path/filepath"
"regexp"
"strconv"
@@ -45,6 +46,9 @@ const (
)
func NewProvider(kubeConfigPath string) *Provider {
if kubeConfigPath == "" {
kubeConfigPath = os.Getenv("KUBECONFIG")
}
kubernetesConfig := loadKubernetesConfiguration(kubeConfigPath)
restClientConfig, err := kubernetesConfig.ClientConfig()
if err != nil {
@@ -124,11 +128,11 @@ func (provider *Provider) CreateMizuAggregatorPod(ctx context.Context, namespace
},
Resources: core.ResourceRequirements{
Limits: core.ResourceList{
"cpu": cpuLimit,
"cpu": cpuLimit,
"memory": memLimit,
},
Requests: core.ResourceList{
"cpu": cpuRequests,
"cpu": cpuRequests,
"memory": memRequests,
},
},
@@ -248,8 +252,7 @@ func (provider *Provider) CreateMizuRBAC(ctx context.Context, namespace string,
}
func (provider *Provider) RemovePod(ctx context.Context, namespace string, podName string) error {
if isFound, err := provider.CheckPodExists(ctx, namespace, podName);
err != nil {
if isFound, err := provider.CheckPodExists(ctx, namespace, podName); err != nil {
return err
} else if !isFound {
return nil
@@ -259,8 +262,7 @@ func (provider *Provider) RemovePod(ctx context.Context, namespace string, podNa
}
func (provider *Provider) RemoveService(ctx context.Context, namespace string, serviceName string) error {
if isFound, err := provider.CheckServiceExists(ctx, namespace, serviceName);
err != nil {
if isFound, err := provider.CheckServiceExists(ctx, namespace, serviceName); err != nil {
return err
} else if !isFound {
return nil
@@ -270,8 +272,7 @@ func (provider *Provider) RemoveService(ctx context.Context, namespace string, s
}
func (provider *Provider) RemoveDaemonSet(ctx context.Context, namespace string, daemonSetName string) error {
if isFound, err := provider.CheckDaemonSetExists(ctx, namespace, daemonSetName);
err != nil {
if isFound, err := provider.CheckDaemonSetExists(ctx, namespace, daemonSetName); err != nil {
return err
} else if !isFound {
return nil
@@ -283,7 +284,7 @@ func (provider *Provider) RemoveDaemonSet(ctx context.Context, namespace string,
func (provider *Provider) CheckPodExists(ctx context.Context, namespace string, name string) (bool, error) {
listOptions := metav1.ListOptions{
FieldSelector: fmt.Sprintf("metadata.name=%s", name),
Limit: 1,
Limit: 1,
}
resourceList, err := provider.clientSet.CoreV1().Pods(namespace).List(ctx, listOptions)
if err != nil {
@@ -300,7 +301,7 @@ func (provider *Provider) CheckPodExists(ctx context.Context, namespace string,
func (provider *Provider) CheckServiceExists(ctx context.Context, namespace string, name string) (bool, error) {
listOptions := metav1.ListOptions{
FieldSelector: fmt.Sprintf("metadata.name=%s", name),
Limit: 1,
Limit: 1,
}
resourceList, err := provider.clientSet.CoreV1().Services(namespace).List(ctx, listOptions)
if err != nil {
@@ -317,7 +318,7 @@ func (provider *Provider) CheckServiceExists(ctx context.Context, namespace stri
func (provider *Provider) CheckDaemonSetExists(ctx context.Context, namespace string, name string) (bool, error) {
listOptions := metav1.ListOptions{
FieldSelector: fmt.Sprintf("metadata.name=%s", name),
Limit: 1,
Limit: 1,
}
resourceList, err := provider.clientSet.AppsV1().DaemonSets(namespace).List(ctx, listOptions)
if err != nil {
@@ -387,11 +388,11 @@ func (provider *Provider) ApplyMizuTapperDaemonSet(ctx context.Context, namespac
return errors.New("invalid memory request for tapper container")
}
agentResourceLimits := core.ResourceList{
"cpu": cpuLimit,
"cpu": cpuLimit,
"memory": memLimit,
}
agentResourceRequests := core.ResourceList{
"cpu": cpuRequests,
"cpu": cpuRequests,
"memory": memRequests,
}
agentResources := applyconfcore.ResourceRequirements().WithRequests(agentResourceRequests).WithLimits(agentResourceLimits)