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

Merge pull request #730 from justinsb/update_cni_1 

CNI: update version to latest
This commit is contained in:
Chris Love 2016-10-26 20:31:37 -06:00 committed by GitHub
parent 2487ef0c42 205a027b8a
commit 131721d2e4
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -186,15 +186,20 @@ func (c *ApplyClusterCmd) Run() error {
}
if usesCNI(cluster) {
defaultCNIAsset := fmt.Sprintf("https://storage.googleapis.com/kubernetes-release/network-plugins/cni-8a936732094c0941e1543ef5d292a1f4fffa1ac5.tar.gz")
// TODO: we really need to sort this out:
// https://github.com/kubernetes/kops/issues/724
// https://github.com/kubernetes/kops/issues/626
// https://github.com/kubernetes/kubernetes/issues/30338
// CNI version for 1.3
//defaultCNIAsset = "https://storage.googleapis.com/kubernetes-release/network-plugins/cni-8a936732094c0941e1543ef5d292a1f4fffa1ac5.tar.gz"
//hashString := "86966c78cc9265ee23f7892c5cad0ec7590cec93"
defaultCNIAsset := "https://storage.googleapis.com/kubernetes-release/network-plugins/cni-07a8a28637e97b22eb8dfe710eeae1344f69d16e.tar.gz"
hashString := "19d49f7b2b99cd2493d5ae0ace896c64e289ccbb"
glog.V(2).Infof("Adding default CNI asset: %s", defaultCNIAsset)
hashString := "86966c78cc9265ee23f7892c5cad0ec7590cec93"
//hash, err := findHash(defaultCNIAsset)
//if err != nil {
// return err
//}
//hashString := hash.Hex()
c.Assets = append(c.Assets, hashString+"@"+defaultCNIAsset)
}
}