Azure
/
azure-container-networking
зеркало из https://github.com/Azure/azure-container-networking.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

fix windows 1903 test apimodel.json (#585)

This commit is contained in:
Mathew Merrick 2020-06-22 09:42:48 -07:00 коммит произвёл GitHub
Родитель 7b3a71fd2a
Коммит 383df33d07
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
2 изменённых файлов: 42 добавлений и 62 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

32
test/e2e/kubernetes/cniWindows1809.json
Просмотреть файл

@ -13,18 +13,14 @@
"--tls-min-version": "VersionTLS12", "--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" "--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", "name": "azure-npm-daemonset",
"enabled": true, "enabled": true,
"containers": [ "containers": [{
{
"name": "azure-npm-daemonset", "name": "azure-npm-daemonset",
"image": "" "image": ""
} }]
] }]
}
]
} }
}, },
"masterProfile": { "masterProfile": {
@ -32,20 +28,16 @@
"dnsPrefix": "cniWindows", "dnsPrefix": "cniWindows",
"vmSize": "Standard_D2_v2" "vmSize": "Standard_D2_v2"
}, },
"agentPoolProfiles": [ "agentPoolProfiles": [{
{
"name": "windowspool2", "name": "windowspool2",
"count": 2, "count": 2,
"vmSize": "Standard_D2_v2", "vmSize": "Standard_D2_v2",
"availabilityProfile": "AvailabilitySet", "availabilityProfile": "AvailabilitySet",
"osType": "Windows", "osType": "Windows",
"extensions": [ "extensions": [{
{
"name": "windows-patches" "name": "windows-patches"
} }]
] }],
}
],
"windowsProfile": { "windowsProfile": {
"adminUsername": "azureuser", "adminUsername": "azureuser",
"adminPassword": "azureTest@!", "adminPassword": "azureTest@!",
@ -54,16 +46,14 @@
"windowsPublisher": "MicrosoftWindowsServer", "windowsPublisher": "MicrosoftWindowsServer",
"windowsOffer": "WindowsServerSemiAnnual", "windowsOffer": "WindowsServerSemiAnnual",
"windowsSku": "Datacenter-Core-1809-with-Containers-smalldisk", "windowsSku": "Datacenter-Core-1809-with-Containers-smalldisk",
"imageVersion": "1809.0.20190826" "imageVersion": "latest"
}, },
"linuxProfile": { "linuxProfile": {
"adminUsername": "azureuser", "adminUsername": "azureuser",
"ssh": { "ssh": {
"publicKeys": [ "publicKeys": [{
{
"keyData": "" "keyData": ""
} }]
]
} }
}, },
"servicePrincipalProfile": { "servicePrincipalProfile": {

32
test/e2e/kubernetes/cniWindows1903.json
Просмотреть файл

@ -13,18 +13,14 @@
"--tls-min-version": "VersionTLS12", "--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" "--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", "name": "azure-npm-daemonset",
"enabled": true, "enabled": true,
"containers": [ "containers": [{
{
"name": "azure-npm-daemonset", "name": "azure-npm-daemonset",
"image": "" "image": ""
} }]
] }]
}
]
} }
}, },
"masterProfile": { "masterProfile": {
@ -32,20 +28,16 @@
"dnsPrefix": "cniWindows", "dnsPrefix": "cniWindows",
"vmSize": "Standard_D2_v2" "vmSize": "Standard_D2_v2"
}, },
"agentPoolProfiles": [ "agentPoolProfiles": [{
{
"name": "windowspool2", "name": "windowspool2",
"count": 2, "count": 2,
"vmSize": "Standard_D2_v2", "vmSize": "Standard_D2_v2",
"availabilityProfile": "AvailabilitySet", "availabilityProfile": "AvailabilitySet",
"osType": "Windows", "osType": "Windows",
"extensions": [ "extensions": [{
{
"name": "windows-patches" "name": "windows-patches"
} }]
] }],
}
],
"windowsProfile": { "windowsProfile": {
"adminUsername": "azureuser", "adminUsername": "azureuser",
"adminPassword": "azureTest@!", "adminPassword": "azureTest@!",
@ -54,16 +46,14 @@
"windowsPublisher": "MicrosoftWindowsServer", "windowsPublisher": "MicrosoftWindowsServer",
"windowsOffer": "WindowsServer", "windowsOffer": "WindowsServer",
"windowsSku": "Datacenter-Core-1903-with-Containers-smalldisk", "windowsSku": "Datacenter-Core-1903-with-Containers-smalldisk",
"imageVersion": "1903.0.20190603" "imageVersion": "latest"
}, },
"linuxProfile": { "linuxProfile": {
"adminUsername": "azureuser", "adminUsername": "azureuser",
"ssh": { "ssh": {
"publicKeys": [ "publicKeys": [{
{
"keyData": "" "keyData": ""
} }]
]
} }
}, },
"servicePrincipalProfile": { "servicePrincipalProfile": {