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

Use new kapi.KubectlBinary API

pull/8545/head
Thomas Stromberg 2020-06-25 14:43:19 -07:00
parent 2a39d993ea
commit d16e7d4924
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/minikube/cni/cni.go
View File

@ -26,6 +26,7 @@ import (
"github.com/golang/glog"
"github.com/pkg/errors"
"k8s.io/minikube/pkg/kapi"
"k8s.io/minikube/pkg/minikube/assets"
"k8s.io/minikube/pkg/minikube/command"
"k8s.io/minikube/pkg/minikube/config"
@ -123,17 +124,12 @@ func manifestAsset(b []byte) assets.CopyableFile {
return assets.NewMemoryAssetTarget(b, manifestPath(), "0644")
}
// kubectlPath returns the path to the kubelet
func kubectlPath(cc config.ClusterConfig) string {
return path.Join(vmpath.GuestPersistentDir, "binaries", cc.KubernetesConfig.KubernetesVersion, "kubectl")
}
// applyManifest applies a CNI manifest
func applyManifest(cc config.ClusterConfig, r Runner, f assets.CopyableFile) error {
ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
defer cancel()
kubectl := kubectlPath(cc)
kubectl := kapi.KubectlBinaryPath(cc.KubernetesConfig.KubernetesVersion)
glog.Infof("applying CNI manifest using %s ...", kubectl)
if err := r.Copy(f); err != nil {