kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Move kubectl binary function to kapi package to prevent future cyclic import dependencies

pull/8552/head
Priya Wadhwa 2020-06-25 09:40:14 -07:00
parent 6d3a0c4eca
commit 1b8eaaf76c
3 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/addons/kubectl.go
View File

@ -21,6 +21,7 @@ import (
"os/exec"
"path"
"k8s.io/minikube/pkg/kapi"
"k8s.io/minikube/pkg/minikube/config"
"k8s.io/minikube/pkg/minikube/constants"
"k8s.io/minikube/pkg/minikube/vmpath"
@ -32,7 +33,7 @@ func kubectlCommand(cc *config.ClusterConfig, files []string, enable bool) *exec
v = cc.KubernetesConfig.KubernetesVersion
}
kubectlBinary := KubectlBinaryPath(v)
kubectlBinary := kapi.KubectlBinaryPath(v)
kubectlAction := "apply"
if !enable {
@ -46,8 +47,3 @@ func kubectlCommand(cc *config.ClusterConfig, files []string, enable bool) *exec
return exec.Command("sudo", args...)
}
// KubectlBinaryPath returns the path to kubectl on the node
func KubectlBinaryPath(version string) string {
return path.Join(vmpath.GuestPersistentDir, "binaries", version, "kubectl")
}

7
pkg/kapi/kapi.go
View File

@ -19,6 +19,7 @@ package kapi
import (
"context"
"fmt"
"path"
"time"
"github.com/golang/glog"
@ -37,6 +38,7 @@ import (
watchtools "k8s.io/client-go/tools/watch"
kconst "k8s.io/kubernetes/cmd/kubeadm/app/constants"
"k8s.io/minikube/pkg/minikube/proxy"
"k8s.io/minikube/pkg/minikube/vmpath"
)
var (
@ -205,3 +207,8 @@ func WaitForService(c kubernetes.Interface, namespace, name string, exist bool,
func IsRetryableAPIError(err error) bool {
return apierr.IsTimeout(err) || apierr.IsServerTimeout(err) || apierr.IsTooManyRequests(err) || apierr.IsInternalError(err)
}
// KubectlBinaryPath returns the path to kubectl on the node
func KubectlBinaryPath(version string) string {
return path.Join(vmpath.GuestPersistentDir, "binaries", version, "kubectl")
}

3
pkg/minikube/node/start.go
View File

@ -36,6 +36,7 @@ import (
cmdcfg "k8s.io/minikube/cmd/minikube/cmd/config"
"k8s.io/minikube/pkg/addons"
"k8s.io/minikube/pkg/drivers/kic/oci"
"k8s.io/minikube/pkg/kapi"
"k8s.io/minikube/pkg/minikube/bootstrapper"
"k8s.io/minikube/pkg/minikube/bootstrapper/images"
"k8s.io/minikube/pkg/minikube/cluster"
@ -517,7 +518,7 @@ func prepareNone() {
// rescaleCoreDNS attempts to reduce coredns replicas from 2 to 1 to improve CPU overhead
// no worries if this doesn't work
func rescaleCoreDNS(cc *config.ClusterConfig, runner command.Runner) {
kubectl := addons.KubectlBinaryPath(cc.KubernetesConfig.KubernetesVersion)
kubectl := kapi.KubectlBinaryPath(cc.KubernetesConfig.KubernetesVersion)
cmd := exec.Command("sudo", "KUBECONFIG=/var/lib/minikube/kubeconfig", kubectl, "scale", "deployment", "--replicas=1", "coredns", "-n=kube-system")
if _, err := runner.RunCmd(cmd); err != nil {
glog.Infof("unable to scale coredns replicas to 1: %v", err)