Merge pull request #2897 from qqshfox/cni_assets_from_env_var

fix cniAsset from env var
2017-07-13 08:26:07 -06:00 · 2017-07-13 08:26:07 -06:00 · 87ad3eeaeb
parent e5420e916d b54724a3ea
commit 87ad3eeaeb
1 changed files with 6 additions and 1 deletions
--- a/upup/pkg/fi/cloudup/apply_cluster.go
+++ b/upup/pkg/fi/cloudup/apply_cluster.go
@ -238,7 +238,12 @@ func (c *ApplyClusterCmd) Run() error {
 				return err
 			}

-			c.Assets = append(c.Assets, cniAssetHashString+"@"+cniAsset)
+			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)
+			}
 		}

 		if needsStaticUtils(cluster, c.InstanceGroups) {