Merge pull request #1688 from r2d4/local-localkube

Don't fetch localkube when version specified is default
pull/1700/head
Matt Rickard 2017-07-13 09:03:42 -07:00 committed by GitHub
commit e550e3d0ea
1 changed files with 1 additions and 2 deletions

View File

@ -211,13 +211,12 @@ func UpdateCluster(d drivers.Driver, config KubernetesConfig) error {
var err error var err error
//add url/file/bundled localkube to file list //add url/file/bundled localkube to file list
if localkubeURIWasSpecified(config) { if localkubeURIWasSpecified(config) && config.KubernetesVersion != constants.DefaultKubernetesVersion {
lCacher := localkubeCacher{config} lCacher := localkubeCacher{config}
localkubeFile, err = lCacher.fetchLocalkubeFromURI() localkubeFile, err = lCacher.fetchLocalkubeFromURI()
if err != nil { if err != nil {
return errors.Wrap(err, "Error updating localkube from uri") return errors.Wrap(err, "Error updating localkube from uri")
} }
} else { } else {
localkubeFile = assets.NewMemoryAsset("out/localkube", "/usr/local/bin", "localkube", "0777") localkubeFile = assets.NewMemoryAsset("out/localkube", "/usr/local/bin", "localkube", "0777")
} }