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

Merge pull request #2897 from qqshfox/cni_assets_from_env_var 

fix cniAsset from env var
This commit is contained in:
Chris Love 2017-07-13 08:26:07 -06:00 committed by GitHub
parent e5420e916d b54724a3ea
commit 87ad3eeaeb
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
upup/pkg/fi/cloudup/apply_cluster.go
View File

@ -238,8 +238,13 @@ func (c *ApplyClusterCmd) Run() error {
return err return err
} }
if cniAssetHashString == "" {
glog.Warningf("cniAssetHashString is empty, using cniAsset directly: %s", cniAsset)
c.Assets = append(c.Assets, cniAsset)
} else {
c.Assets = append(c.Assets, cniAssetHashString+"@"+cniAsset) c.Assets = append(c.Assets, cniAssetHashString+"@"+cniAsset)
} }
}
if needsStaticUtils(cluster, c.InstanceGroups) { if needsStaticUtils(cluster, c.InstanceGroups) {
utilsLocation := BaseUrl() + "linux/amd64/utils.tar.gz" utilsLocation := BaseUrl() + "linux/amd64/utils.tar.gz"