diff --git a/test/e2e/kubernetes/cniLinux1604.json b/test/e2e/kubernetes/cniLinux1604.json index 5e923a4811..43d28e80e1 100644 --- a/test/e2e/kubernetes/cniLinux1604.json +++ b/test/e2e/kubernetes/cniLinux1604.json @@ -8,7 +8,11 @@ "networkPlugin": "azure", "networkPolicy": "azure", "azureCNIVersion": "", - "azureCNIURLLinux": "" + "azureCNIURLLinux": "", + "kubeletConfig": { + "--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" + } } }, "masterProfile": { @@ -16,24 +20,20 @@ "dnsPrefix": "cniLinux", "vmSize": "Standard_D2_v2" }, - "agentPoolProfiles": [ - { - "name": "agentpool1", - "count": 3, - "vmSize": "Standard_D2_v2", - "availabilityProfile": "AvailabilitySet", - "osType": "Linux", - "distro": "aks-ubuntu-16.04" - } - ], + "agentPoolProfiles": [{ + "name": "agentpool1", + "count": 3, + "vmSize": "Standard_D2_v2", + "availabilityProfile": "AvailabilitySet", + "osType": "Linux", + "distro": "aks-ubuntu-16.04" + }], "linuxProfile": { "adminUsername": "azureuser", "ssh": { - "publicKeys": [ - { - "keyData": "" - } - ] + "publicKeys": [{ + "keyData": "" + }] } }, "servicePrincipalProfile": { diff --git a/test/e2e/kubernetes/cniLinux1804.json b/test/e2e/kubernetes/cniLinux1804.json index 59ed4f7851..b498ac372e 100644 --- a/test/e2e/kubernetes/cniLinux1804.json +++ b/test/e2e/kubernetes/cniLinux1804.json @@ -8,7 +8,11 @@ "networkPlugin": "azure", "networkPolicy": "azure", "azureCNIVersion": "", - "azureCNIURLLinux": "" + "azureCNIURLLinux": "", + "kubeletConfig": { + "--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" + } } }, "masterProfile": { @@ -16,24 +20,20 @@ "dnsPrefix": "cniLinux", "vmSize": "Standard_D2_v2" }, - "agentPoolProfiles": [ - { - "name": "agentpool1", - "count": 3, - "vmSize": "Standard_D2_v2", - "availabilityProfile": "AvailabilitySet", - "osType": "Linux", - "distro": "aks-ubuntu-18.04" - } - ], + "agentPoolProfiles": [{ + "name": "agentpool1", + "count": 3, + "vmSize": "Standard_D2_v2", + "availabilityProfile": "AvailabilitySet", + "osType": "Linux", + "distro": "aks-ubuntu-18.04" + }], "linuxProfile": { "adminUsername": "azureuser", "ssh": { - "publicKeys": [ - { - "keyData": "" - } - ] + "publicKeys": [{ + "keyData": "" + }] } }, "servicePrincipalProfile": { diff --git a/test/e2e/kubernetes/cniWindows1809.json b/test/e2e/kubernetes/cniWindows1809.json index 1b43627917..ea045f97bb 100644 --- a/test/e2e/kubernetes/cniWindows1809.json +++ b/test/e2e/kubernetes/cniWindows1809.json @@ -8,7 +8,11 @@ "networkPlugin": "azure", "networkPolicy": "azure", "azureCNIVersion": "", - "azureCNIURLWindows": "" + "azureCNIURLWindows": "", + "kubeletConfig": { + "--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" + } } }, "masterProfile": { @@ -16,20 +20,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@!", @@ -43,11 +43,9 @@ "linuxProfile": { "adminUsername": "azureuser", "ssh": { - "publicKeys": [ - { - "keyData": "" - } - ] + "publicKeys": [{ + "keyData": "" + }] } }, "servicePrincipalProfile": { diff --git a/test/e2e/kubernetes/cniWindows1903.json b/test/e2e/kubernetes/cniWindows1903.json index 0bcaa498af..41ccc2d444 100644 --- a/test/e2e/kubernetes/cniWindows1903.json +++ b/test/e2e/kubernetes/cniWindows1903.json @@ -8,7 +8,11 @@ "networkPlugin": "azure", "networkPolicy": "azure", "azureCNIVersion": "", - "azureCNIURLWindows": "" + "azureCNIURLWindows": "", + "kubeletConfig": { + "--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" + } } }, "masterProfile": { @@ -16,20 +20,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@!", @@ -43,11 +43,9 @@ "linuxProfile": { "adminUsername": "azureuser", "ssh": { - "publicKeys": [ - { - "keyData": "" - } - ] + "publicKeys": [{ + "keyData": "" + }] } }, "servicePrincipalProfile": {