From b54724a3eab4a68496fda74437e6362573e8bf0d Mon Sep 17 00:00:00 2001 From: Hanfei Shen Date: Mon, 10 Jul 2017 19:29:21 +0800 Subject: [PATCH] fix cniAsset from env var --- upup/pkg/fi/cloudup/apply_cluster.go | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/upup/pkg/fi/cloudup/apply_cluster.go b/upup/pkg/fi/cloudup/apply_cluster.go index 3e52012858..44f5ae4c86 100644 --- 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) {