Use CNI 0.7.5

Equivalent of kubernetes/kubernetes#75455
justinsb · Mar 28, 2019 · 15e7601 · 15e7601
1 parent 9285f63
commit 15e7601
Showing 1 changed file with 13 additions and 9 deletions.
diff --git a/upup/pkg/fi/cloudup/networking.go b/upup/pkg/fi/cloudup/networking.go
@@ -21,7 +21,6 @@ import (
 	"net/url"
 	"os"
 
-	"github.com/blang/semver"
 	"github.com/golang/glog"
 	api "k8s.io/kops/pkg/apis/kops"
 	"k8s.io/kops/pkg/apis/kops/util"
@@ -123,6 +122,10 @@ const (
 	defaultCNIAssetK8s1_9           = "https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-amd64-v0.6.0.tgz"
 	defaultCNIAssetHashStringK8s1_9 = "d595d3ded6499a64e8dac02466e2f5f2ce257c9f"
 
+	// defaultCNIAssetK8s1_11 is the CNI tarball for k8s >= 1.11
+	defaultCNIAssetK8s1_11           = "https://storage.googleapis.com/kubernetes-release/network-plugins/cni-plugins-amd64-v0.7.5.tgz"
+	defaultCNIAssetHashStringK8s1_11 = "52e9d2de8a5f927307d9397308735658ee44ab8d"
+
 	// Environment variable for overriding CNI url
 	ENV_VAR_CNI_VERSION_URL       = "CNI_VERSION_URL"
 	ENV_VAR_CNI_ASSET_HASH_STRING = "CNI_ASSET_HASH_STRING"
@@ -153,22 +156,23 @@ func findCNIAssets(c *api.Cluster, assetBuilder *assets.AssetBuilder) (*url.URL,
 		return nil, "", fmt.Errorf("failed to lookup kubernetes version: %v", err)
 	}
 
-	sv.Pre = nil
-	sv.Build = nil
-
 	var cniAsset, cniAssetHash string
-	if sv.GTE(semver.Version{Major: 1, Minor: 9, Patch: 0, Pre: nil, Build: nil}) {
+	if util.IsKubernetesGTE("1.11", *sv) {
+		cniAsset = defaultCNIAssetK8s1_11
+		cniAssetHash = defaultCNIAssetHashStringK8s1_11
+		glog.V(2).Infof("Adding default CNI asset for k8s >= 1.11: %s", defaultCNIAssetK8s1_9)
+	} else if util.IsKubernetesGTE("1.9", *sv) {
 		cniAsset = defaultCNIAssetK8s1_9
 		cniAssetHash = defaultCNIAssetHashStringK8s1_9
-		glog.V(2).Infof("Adding default CNI asset for k8s 1.9.x and higher: %s", defaultCNIAssetK8s1_9)
-	} else if sv.GTE(semver.Version{Major: 1, Minor: 6, Patch: 0, Pre: nil, Build: nil}) {
+		glog.V(2).Infof("Adding default CNI asset for 1.11 > k8s >= 1.9: %s", defaultCNIAssetK8s1_9)
+	} else if util.IsKubernetesGTE("1.6", *sv) {
 		cniAsset = defaultCNIAssetK8s1_6
 		cniAssetHash = defaultCNIAssetHashStringK8s1_6
-		glog.V(2).Infof("Adding default CNI asset for k8s 1.6.x and higher: %s", defaultCNIAssetK8s1_6)
+		glog.V(2).Infof("Adding default CNI asset for 1.9 > k8s >= 1.6: %s", defaultCNIAssetK8s1_6)
 	} else {
 		cniAsset = defaultCNIAssetK8s1_5
 		cniAssetHash = defaultCNIAssetHashStringK8s1_5
-		glog.V(2).Infof("Adding default CNI asset for k8s 1.5: %s", defaultCNIAssetK8s1_5)
+		glog.V(2).Infof("Adding default CNI asset for 1.6 > k8s >= 1.5: %s", defaultCNIAssetK8s1_5)
 	}
 
 	u, err := url.Parse(cniAsset)