fixes azure networkPolicy regression (Azure#1787)

* added azure networkPolicy example and updated e2e * restoring previous cni plugins download url
yangl900 · Nov 17, 2017 · 5070934 · 5070934
1 parent 14fbc90
commit 5070934
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 6 deletions.
diff --git a/examples/networkpolicy/kubernetes-azure.json b/examples/networkpolicy/kubernetes-azure.json
@@ -0,0 +1,44 @@
+{
+  "apiVersion": "vlabs",
+  "properties": {
+    "orchestratorProfile": {
+      "orchestratorType": "Kubernetes",
+      "kubernetesConfig": {
+        "networkPolicy": "azure"
+      }
+    },
+    "masterProfile": {
+      "count": 1,
+      "dnsPrefix": "",
+      "vmSize": "Standard_D2_v2"
+    },
+    "agentPoolProfiles": [
+      {
+        "name": "agentpool1",
+        "count": 3,
+        "vmSize": "Standard_D2_v2",
+        "availabilityProfile": "AvailabilitySet"
+      },
+      {
+        "name": "agentpool2",
+        "count": 3,
+        "vmSize": "Standard_D2_v2",
+        "availabilityProfile": "AvailabilitySet"
+      }
+    ],
+    "linuxProfile": {
+      "adminUsername": "azureuser",
+      "ssh": {
+        "publicKeys": [
+          {
+            "keyData": ""
+          }
+        ]
+      }
+    },
+    "servicePrincipalProfile": {
+      "clientId": "",
+      "secret": ""
+    }
+  }
+}
diff --git a/pkg/acsengine/defaults.go b/pkg/acsengine/defaults.go
@@ -10,11 +10,6 @@ import (
 )
 
 const (
-	// CniPluginVer specifies version of CNI plugin, mirrored from
-	// https://github.com/containernetworking/cni/releases/download/${CNI_PLUGIN_VER}/cni-amd64-${CNI_PLUGIN_VER}.tgz
-	// to https://acs-mirror.azureedge.net/cni/
-	CniPluginVer = "v0.6.0"
-
 	// AzureCniPluginVer specifies version of Azure CNI plugin, which has been mirrored from
 	// https://github.com/Azure/azure-container-networking/releases/download/${AZURE_PLUGIN_VER}/azure-vnet-cni-linux-amd64-${AZURE_PLUGIN_VER}.tgz
 	// to https://acs-mirror.azureedge.net/cni/
@@ -29,7 +24,7 @@ var (
 		EtcdDownloadURLBase:              "https://acs-mirror.azureedge.net/github-coreos",
 		KubeBinariesSASURLBase:           "https://acs-mirror.azureedge.net/wink8s/",
 		WindowsTelemetryGUID:             "fb801154-36b9-41bc-89c2-f4d4f05472b0",
-		CNIPluginsDownloadURL:            "https://acs-mirror.azureedge.net/cni/cni-amd64-" + CniPluginVer + ".tgz",
+		CNIPluginsDownloadURL:            "https://acs-mirror.azureedge.net/cni/cni-plugins-amd64-latest.tgz",
 		VnetCNILinuxPluginsDownloadURL:   "https://acs-mirror.azureedge.net/cni/azure-vnet-cni-linux-amd64-" + AzureCniPluginVer + ".tgz",
 		VnetCNIWindowsPluginsDownloadURL: "https://acs-mirror.azureedge.net/cni/azure-vnet-cni-windows-amd64-" + AzureCniPluginVer + ".zip",
 	}

diff --git a/test/acse-conf/acse-regression.json b/test/acse-conf/acse-regression.json
@@ -69,6 +69,10 @@
       "cluster_definition": "networkpolicy/kubernetes-calico.json",
       "category": "network"
     },
+    {
+      "cluster_definition": "networkpolicy/kubernetes-azure.json",
+      "category": "network"
+    },
     {
       "cluster_definition": "kubernetes-config/kubernetes-clustersubnet.json",
       "category": "network"