From 109809f6b1263b17865f9faf156dc18e349a68a5 Mon Sep 17 00:00:00 2001 From: Yongli Chen Date: Wed, 24 Oct 2018 15:57:31 -0700 Subject: [PATCH 1/6] e2e test acs-engine deployment template --- test/e2e/kubernetes/cniLinux.json | 42 ++++++++++++++++++++++++++ test/e2e/kubernetes/cniWindows.json | 47 +++++++++++++++++++++++++++++ 2 files changed, 89 insertions(+) create mode 100644 test/e2e/kubernetes/cniLinux.json create mode 100644 test/e2e/kubernetes/cniWindows.json diff --git a/test/e2e/kubernetes/cniLinux.json b/test/e2e/kubernetes/cniLinux.json new file mode 100644 index 0000000000..9ed40620c1 --- /dev/null +++ b/test/e2e/kubernetes/cniLinux.json @@ -0,0 +1,42 @@ +{ + "apiVersion": "vlabs", + "properties": { + "orchestratorProfile": { + "orchestratorType": "Kubernetes", + "orchestratorRelease": "1.8", + "kubernetesConfig":{ + "networkPlugin":"azure", + "networkPolicy":"azure", + "azureCNIVersion":"v1.0.12", + "azureCNIURLLinux":"https://github.com/Azure/azure-container-networking/releases/download/v1.0.12/azure-vnet-cni-linux-amd64-v1.0.12.tgz" + } + }, + "masterProfile": { + "count": 1, + "dnsPrefix": "cniLinux", + "vmSize": "Standard_D2_v2" + }, + "agentPoolProfiles": [ + { + "name": "agentpool1", + "count": 3, + "vmSize": "Standard_D2_v2", + "availabilityProfile": "AvailabilitySet" + } + ], + "linuxProfile": { + "adminUsername": "azureuser", + "ssh": { + "publicKeys": [ + { + "keyData":"" + } + ] + } + }, + "servicePrincipalProfile": { + "clientId": "", + "secret": "" + } + } + } \ No newline at end of file diff --git a/test/e2e/kubernetes/cniWindows.json b/test/e2e/kubernetes/cniWindows.json new file mode 100644 index 0000000000..507e2b51a8 --- /dev/null +++ b/test/e2e/kubernetes/cniWindows.json @@ -0,0 +1,47 @@ +{ + "apiVersion":"vlabs", + "properties":{ + "orchestratorProfile":{ + "orchestratorType":"Kubernetes", + "orchestratorRelease": "1.11", + "kubernetesConfig":{ + "networkPlugin":"azure", + "networkPolicy":"azure", + "azureCNIVersion":"v1.0.12", + "azureCNIURLLinux":"https://github.com/Azure/azure-container-networking/releases/download/v1.0.12/azure-vnet-cni-linux-amd64-v1.0.12.tgz" + } + }, + "masterProfile":{ + "count":1, + "dnsPrefix":"cniWindows", + "vmSize":"Standard_D2_v2" + }, + "agentPoolProfiles":[ + { + "name":"windowspool2", + "count":2, + "vmSize":"Standard_D2_v2", + "availabilityProfile":"AvailabilitySet", + "osType":"Windows" + } + ], + "windowsProfile":{ + "adminUsername":"", + "adminPassword":"" + }, + "linuxProfile":{ + "adminUsername":"azureuser", + "ssh":{ + "publicKeys":[ + { + "keyData":"" + } + ] + } + }, + "servicePrincipalProfile":{ + "clientId":"", + "secret":"" + } + } +} \ No newline at end of file From 401c04c1505a5e6d399223a3eebb7ba5a5fc51d4 Mon Sep 17 00:00:00 2001 From: Yongli Chen Date: Wed, 24 Oct 2018 16:36:26 -0700 Subject: [PATCH 2/6] update windows cni url --- test/e2e/kubernetes/cniWindows.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/e2e/kubernetes/cniWindows.json b/test/e2e/kubernetes/cniWindows.json index 507e2b51a8..adf08ee903 100644 --- a/test/e2e/kubernetes/cniWindows.json +++ b/test/e2e/kubernetes/cniWindows.json @@ -8,7 +8,7 @@ "networkPlugin":"azure", "networkPolicy":"azure", "azureCNIVersion":"v1.0.12", - "azureCNIURLLinux":"https://github.com/Azure/azure-container-networking/releases/download/v1.0.12/azure-vnet-cni-linux-amd64-v1.0.12.tgz" + "azureCNIURLWindows":"https://github.com/Azure/azure-container-networking/releases/download/v1.0.12/azure-vnet-cni-windows-amd64-v1.0.12.zip" } }, "masterProfile":{ From 938045f388e0b46e81ac67dd868ae2553ef028f9 Mon Sep 17 00:00:00 2001 From: Yongli Chen Date: Wed, 24 Oct 2018 17:03:31 -0700 Subject: [PATCH 3/6] update windows credentials --- test/e2e/kubernetes/cniWindows.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/e2e/kubernetes/cniWindows.json b/test/e2e/kubernetes/cniWindows.json index adf08ee903..70f5052f17 100644 --- a/test/e2e/kubernetes/cniWindows.json +++ b/test/e2e/kubernetes/cniWindows.json @@ -26,8 +26,8 @@ } ], "windowsProfile":{ - "adminUsername":"", - "adminPassword":"" + "adminUsername":"azureuser", + "adminPassword":"azureTest@!" }, "linuxProfile":{ "adminUsername":"azureuser", From b64f1350c1b967a8ecadd3d71960acf7bab24390 Mon Sep 17 00:00:00 2001 From: Yongli Chen Date: Thu, 25 Oct 2018 13:46:55 -0700 Subject: [PATCH 4/6] leave cni url empty --- test/e2e/kubernetes/cniLinux.json | 4 ++-- test/e2e/kubernetes/cniWindows.json | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/test/e2e/kubernetes/cniLinux.json b/test/e2e/kubernetes/cniLinux.json index 9ed40620c1..1efa60fb8f 100644 --- a/test/e2e/kubernetes/cniLinux.json +++ b/test/e2e/kubernetes/cniLinux.json @@ -3,12 +3,12 @@ "properties": { "orchestratorProfile": { "orchestratorType": "Kubernetes", - "orchestratorRelease": "1.8", + "orchestratorRelease": "1.11", "kubernetesConfig":{ "networkPlugin":"azure", "networkPolicy":"azure", "azureCNIVersion":"v1.0.12", - "azureCNIURLLinux":"https://github.com/Azure/azure-container-networking/releases/download/v1.0.12/azure-vnet-cni-linux-amd64-v1.0.12.tgz" + "azureCNIURLLinux":"" } }, "masterProfile": { diff --git a/test/e2e/kubernetes/cniWindows.json b/test/e2e/kubernetes/cniWindows.json index 70f5052f17..52975dd351 100644 --- a/test/e2e/kubernetes/cniWindows.json +++ b/test/e2e/kubernetes/cniWindows.json @@ -8,7 +8,7 @@ "networkPlugin":"azure", "networkPolicy":"azure", "azureCNIVersion":"v1.0.12", - "azureCNIURLWindows":"https://github.com/Azure/azure-container-networking/releases/download/v1.0.12/azure-vnet-cni-windows-amd64-v1.0.12.zip" + "azureCNIURLWindows":"" } }, "masterProfile":{ From a88527b2155cf21d0ea127995d65dae3923d2def Mon Sep 17 00:00:00 2001 From: Yongli Chen Date: Mon, 28 Jan 2019 10:36:46 -0800 Subject: [PATCH 5/6] apply windows patch to fix dns error --- test/e2e/kubernetes/cniWindows.json | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/test/e2e/kubernetes/cniWindows.json b/test/e2e/kubernetes/cniWindows.json index 52975dd351..b01fa69453 100644 --- a/test/e2e/kubernetes/cniWindows.json +++ b/test/e2e/kubernetes/cniWindows.json @@ -7,7 +7,7 @@ "kubernetesConfig":{ "networkPlugin":"azure", "networkPolicy":"azure", - "azureCNIVersion":"v1.0.12", + "azureCNIVersion":"v1.0.16", "azureCNIURLWindows":"" } }, @@ -22,7 +22,20 @@ "count":2, "vmSize":"Standard_D2_v2", "availabilityProfile":"AvailabilitySet", - "osType":"Windows" + "osType":"Windows", + "extensions": [ + { + "name": "windows-patches" + } + ] + } + ], + "extensionProfiles": [ + { + "name": "windows-patches", + "version": "v1", + "rootURL": "https://raw.githubusercontent.com/Azure/aks-engine/master/", + "extensionParameters": "'http://download.windowsupdate.com/c/msdownload/update/software/updt/2019/01/windows10.0-kb4476976-x64_a9c241844c041cb8dbcf28b5635eecb1a57e028a.msu'" } ], "windowsProfile":{ From 8c0da7990c5d4052bd7ad5951cb6f3e57b9902ba Mon Sep 17 00:00:00 2001 From: Yongli Chen Date: Mon, 28 Jan 2019 15:44:41 -0800 Subject: [PATCH 6/6] Update cniLinux.json --- test/e2e/kubernetes/cniLinux.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/test/e2e/kubernetes/cniLinux.json b/test/e2e/kubernetes/cniLinux.json index 1efa60fb8f..32090105b8 100644 --- a/test/e2e/kubernetes/cniLinux.json +++ b/test/e2e/kubernetes/cniLinux.json @@ -7,7 +7,7 @@ "kubernetesConfig":{ "networkPlugin":"azure", "networkPolicy":"azure", - "azureCNIVersion":"v1.0.12", + "azureCNIVersion":"v1.0.16", "azureCNIURLLinux":"" } }, @@ -39,4 +39,4 @@ "secret": "" } } - } \ No newline at end of file + }