From 050cf9ee08c66356ac64c2db082e7d1eb2169f91 Mon Sep 17 00:00:00 2001 From: Mathew Merrick Date: Mon, 22 Jun 2020 09:27:50 -0700 Subject: [PATCH] fix windows 1903 test apimodel --- test/e2e/kubernetes/cniWindows1809.json | 52 ++++++++++--------------- test/e2e/kubernetes/cniWindows1903.json | 52 ++++++++++--------------- 2 files changed, 42 insertions(+), 62 deletions(-) diff --git a/test/e2e/kubernetes/cniWindows1809.json b/test/e2e/kubernetes/cniWindows1809.json index 7be581d0b5..d2b7f0a385 100644 --- a/test/e2e/kubernetes/cniWindows1809.json +++ b/test/e2e/kubernetes/cniWindows1809.json @@ -13,18 +13,14 @@ "--tls-min-version": "VersionTLS12", "--tls-cipher-suites": "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256" }, - "addons": [ - { + "addons": [{ + "name": "azure-npm-daemonset", + "enabled": true, + "containers": [{ "name": "azure-npm-daemonset", - "enabled": true, - "containers": [ - { - "name": "azure-npm-daemonset", - "image": "" - } - ] - } - ] + "image": "" + }] + }] } }, "masterProfile": { @@ -32,20 +28,16 @@ "dnsPrefix": "cniWindows", "vmSize": "Standard_D2_v2" }, - "agentPoolProfiles": [ - { - "name": "windowspool2", - "count": 2, - "vmSize": "Standard_D2_v2", - "availabilityProfile": "AvailabilitySet", - "osType": "Windows", - "extensions": [ - { - "name": "windows-patches" - } - ] - } - ], + "agentPoolProfiles": [{ + "name": "windowspool2", + "count": 2, + "vmSize": "Standard_D2_v2", + "availabilityProfile": "AvailabilitySet", + "osType": "Windows", + "extensions": [{ + "name": "windows-patches" + }] + }], "windowsProfile": { "adminUsername": "azureuser", "adminPassword": "azureTest@!", @@ -54,16 +46,14 @@ "windowsPublisher": "MicrosoftWindowsServer", "windowsOffer": "WindowsServerSemiAnnual", "windowsSku": "Datacenter-Core-1809-with-Containers-smalldisk", - "imageVersion": "1809.0.20190826" + "imageVersion": "latest" }, "linuxProfile": { "adminUsername": "azureuser", "ssh": { - "publicKeys": [ - { - "keyData": "" - } - ] + "publicKeys": [{ + "keyData": "" + }] } }, "servicePrincipalProfile": { diff --git a/test/e2e/kubernetes/cniWindows1903.json b/test/e2e/kubernetes/cniWindows1903.json index 4d545ecbd8..d65ac102da 100644 --- a/test/e2e/kubernetes/cniWindows1903.json +++ b/test/e2e/kubernetes/cniWindows1903.json @@ -13,18 +13,14 @@ "--tls-min-version": "VersionTLS12", "--tls-cipher-suites": "TLS_ECDHE_ECDSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_ECDSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_128_GCM_SHA256,TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384,TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256" }, - "addons": [ - { + "addons": [{ + "name": "azure-npm-daemonset", + "enabled": true, + "containers": [{ "name": "azure-npm-daemonset", - "enabled": true, - "containers": [ - { - "name": "azure-npm-daemonset", - "image": "" - } - ] - } - ] + "image": "" + }] + }] } }, "masterProfile": { @@ -32,20 +28,16 @@ "dnsPrefix": "cniWindows", "vmSize": "Standard_D2_v2" }, - "agentPoolProfiles": [ - { - "name": "windowspool2", - "count": 2, - "vmSize": "Standard_D2_v2", - "availabilityProfile": "AvailabilitySet", - "osType": "Windows", - "extensions": [ - { - "name": "windows-patches" - } - ] - } - ], + "agentPoolProfiles": [{ + "name": "windowspool2", + "count": 2, + "vmSize": "Standard_D2_v2", + "availabilityProfile": "AvailabilitySet", + "osType": "Windows", + "extensions": [{ + "name": "windows-patches" + }] + }], "windowsProfile": { "adminUsername": "azureuser", "adminPassword": "azureTest@!", @@ -54,16 +46,14 @@ "windowsPublisher": "MicrosoftWindowsServer", "windowsOffer": "WindowsServer", "windowsSku": "Datacenter-Core-1903-with-Containers-smalldisk", - "imageVersion": "1903.0.20190603" + "imageVersion": "latest" }, "linuxProfile": { "adminUsername": "azureuser", "ssh": { - "publicKeys": [ - { - "keyData": "" - } - ] + "publicKeys": [{ + "keyData": "" + }] } }, "servicePrincipalProfile": {