From e42c4f8648afc39cc9876ea690236ec67381b47d Mon Sep 17 00:00:00 2001 From: Igor Gov Date: Wed, 21 Jul 2021 17:07:32 +0300 Subject: [PATCH] Cleaning unused code (#129) * Cleaning unused code --- api/pkg/resolver/loader.go | 45 -------------------------------------- cli/kubernetes/provider.go | 27 ++++++++++++----------- 2 files changed, 14 insertions(+), 58 deletions(-) diff --git a/api/pkg/resolver/loader.go b/api/pkg/resolver/loader.go index b9cd6e1fc..26de1dcc8 100644 --- a/api/pkg/resolver/loader.go +++ b/api/pkg/resolver/loader.go @@ -7,10 +7,6 @@ import ( _ "k8s.io/client-go/plugin/pkg/client/auth/oidc" _ "k8s.io/client-go/plugin/pkg/client/auth/openstack" restclient "k8s.io/client-go/rest" - "k8s.io/client-go/tools/clientcmd" - "k8s.io/client-go/util/homedir" - "path/filepath" - "os" ) func NewFromInCluster(errOut chan error) (*Resolver, error) { @@ -24,44 +20,3 @@ func NewFromInCluster(errOut chan error) (*Resolver, error) { } return &Resolver{clientConfig: config, clientSet: clientset, nameMap: make(map[string]string), serviceMap: make(map[string]string), errOut: errOut}, nil } - -func NewFromOutOfCluster(kubeConfigPath string, errOut chan error) (*Resolver, error) { - if kubeConfigPath == "" { - env := os.Getenv("KUBECONFIG") - if env != "" { - kubeConfigPath = env - } else { - home := homedir.HomeDir() - kubeConfigPath = filepath.Join(home, ".kube", "config") - } - } - - configPathList := filepath.SplitList(kubeConfigPath) - configLoadingRules := &clientcmd.ClientConfigLoadingRules{} - if len(configPathList) <= 1 { - configLoadingRules.ExplicitPath = kubeConfigPath - } else { - configLoadingRules.Precedence = configPathList - } - contextName := "" - clientConfigLoader := clientcmd.NewNonInteractiveDeferredLoadingClientConfig( - configLoadingRules, - &clientcmd.ConfigOverrides{ - CurrentContext: contextName, - }, - ) - clientConfig, err := clientConfigLoader.ClientConfig() - if err != nil { - return nil, err - } - clientset, err := kubernetes.NewForConfig(clientConfig) - if err != nil { - return nil, err - } - - return &Resolver{clientConfig: clientConfig, clientSet: clientset, nameMap: make(map[string]string), serviceMap: make(map[string]string), errOut: errOut}, nil -} - -func NewFromExisting(clientConfig *restclient.Config, clientSet *kubernetes.Clientset, errOut chan error) *Resolver { - return &Resolver{clientConfig: clientConfig, clientSet: clientSet, nameMap: make(map[string]string), serviceMap: make(map[string]string), errOut: errOut} -} diff --git a/cli/kubernetes/provider.go b/cli/kubernetes/provider.go index 7141e1a27..42a157b64 100644 --- a/cli/kubernetes/provider.go +++ b/cli/kubernetes/provider.go @@ -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)