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

increased VM size for e2e dcos deployments (#3092)

This commit is contained in:
dmitsh 2018-05-29 22:38:18 -07:00 коммит произвёл Jack Francis
Родитель 24c4537f6f
Коммит 38aee1957a
11 изменённых файлов: 28 добавлений и 36 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

10
examples/dcos-releases/dcos1.10.json
Просмотреть файл

@ -8,18 +8,18 @@
"masterProfile": {
"count": 3,
"dnsPrefix": "",
"vmSize": "Standard_D2_v2"
"vmSize": "Standard_D2s_v3"
},
"agentPoolProfiles": [
{
"name": "agentprivate",
"count": 3,
"vmSize": "Standard_D2_v2"
"count": 2,
"vmSize": "Standard_D2s_v3"
},
{
"name": "agentpublic",
"count": 3,
"vmSize": "Standard_D2_v2",
"count": 2,
"vmSize": "Standard_D2s_v3",
"dnsPrefix": "",
"ports": [
80,

6
examples/dcos-releases/dcos1.8.json
Просмотреть файл

@ -8,18 +8,18 @@
"masterProfile": {
"count": 3,
"dnsPrefix": "",
"vmSize": "Standard_D2_v2"
"vmSize": "Standard_D2s_v3"
},
"agentPoolProfiles": [
{
"name": "agentprivate",
"count": 3,
"vmSize": "Standard_D2_v2"
"vmSize": "Standard_D2s_v3"
},
{
"name": "agentpublic",
"count": 3,
"vmSize": "Standard_D2_v2",
"vmSize": "Standard_D2s_v3",
"dnsPrefix": "",
"ports": [
80,

6
examples/dcos-releases/dcos1.9.json
Просмотреть файл

@ -8,18 +8,18 @@
"masterProfile": {
"count": 3,
"dnsPrefix": "",
"vmSize": "Standard_D2_v2"
"vmSize": "Standard_D2s_v3"
},
"agentPoolProfiles": [
{
"name": "agentprivate",
"count": 3,
"vmSize": "Standard_D2_v2"
"vmSize": "Standard_D2s_v3"
},
{
"name": "agentpublic",
"count": 3,
"vmSize": "Standard_D2_v2",
"vmSize": "Standard_D2s_v3",
"dnsPrefix": "",
"ports": [
80,

10
examples/dcos.json
Просмотреть файл

@ -7,18 +7,18 @@
"masterProfile": {
"count": 1,
"dnsPrefix": "",
"vmSize": "Standard_D2_v2"
"vmSize": "Standard_D2s_v3"
},
"agentPoolProfiles": [
{
"name": "agentprivate",
"count": 1,
"vmSize": "Standard_D2_v2"
"count": 2,
"vmSize": "Standard_D2s_v3"
},
{
"name": "agentpublic",
"count": 1,
"vmSize": "Standard_D2_v2",
"count": 2,
"vmSize": "Standard_D2s_v3",
"dnsPrefix": "",
"ports": [
80,

4
examples/disks-managed/dcos-preAttachedDisks-vmas.json
Просмотреть файл

@ -7,13 +7,13 @@
"masterProfile": {
"count": 1,
"dnsPrefix": "",
"vmSize": "Standard_D2_v2"
"vmSize": "Standard_D2s_v3"
},
"agentPoolProfiles": [
{
"name": "agentpublic",
"count": 6,
"vmSize": "Standard_D2_v2",
"vmSize": "Standard_D2s_v3",
"availabilityProfile": "AvailabilitySet",
"storageProfile": "ManagedDisks",
"diskSizesGB": [128, 128, 128, 128],

4
examples/disks-managed/dcos-vmss.json
Просмотреть файл

@ -7,14 +7,14 @@
"masterProfile": {
"count": 1,
"dnsPrefix": "",
"vmSize": "Standard_D2_v2",
"vmSize": "Standard_D2s_v3",
"OSDiskSizeGB": 200
},
"agentPoolProfiles": [
{
"name": "agentpublic",
"count": 3,
"vmSize": "Standard_D2_v2",
"vmSize": "Standard_D2s_v3",
"OSDiskSizeGB": 200,
"AvailabilityProfile": "VirtualMachineScaleSets",
"storageProfile": "ManagedDisks",

6
examples/disks-storageaccount/dcos.json
Просмотреть файл

@ -7,14 +7,14 @@
"masterProfile": {
"count": 3,
"dnsPrefix": "",
"vmSize": "Standard_D2_v2",
"vmSize": "Standard_D2s_v3",
"OSDiskSizeGB": 200
},
"agentPoolProfiles": [
{
"name": "agent128",
"count": 3,
"vmSize": "Standard_D2_v2",
"vmSize": "Standard_D2s_v3",
"OSDiskSizeGB": 200,
"availabilityProfile": "AvailabilitySet",
"storageProfile": "StorageAccount",
@ -23,7 +23,7 @@
{
"name": "agentpublic",
"count": 3,
"vmSize": "Standard_D2_v2",
"vmSize": "Standard_D2s_v3",
"dnsPrefix": "",
"availabilityProfile": "AvailabilitySet",
"storageProfile": "StorageAccount",

6
examples/vnet/dcosvnet.json
Просмотреть файл

@ -7,7 +7,7 @@
"masterProfile": {
"count": 3,
"dnsPrefix": "",
"vmSize": "Standard_D2_v2",
"vmSize": "Standard_D2s_v3",
"vnetSubnetId": "/subscriptions/SUB_ID/resourceGroups/RG_NAME/providers/Microsoft.Network/virtualNetworks/VNET_NAME/subnets/MASTER_SUBNET_NAME",
"firstConsecutiveStaticIP": "10.100.0.5"
},
@ -15,14 +15,14 @@
{
"name": "agentprivate",
"count": 3,
"vmSize": "Standard_D2_v2",
"vmSize": "Standard_D2s_v3",
"availabilityProfile": "AvailabilitySet",
"vnetSubnetId": "/subscriptions/SUB_ID/resourceGroups/RG_NAME/providers/Microsoft.Network/virtualNetworks/VNET_NAME/subnets/AGENT_SUBNET_NAME"
},
{
"name": "agentpublic",
"count": 3,
"vmSize": "Standard_D2_v2",
"vmSize": "Standard_D2s_v3",
"dnsPrefix": "",
"vnetSubnetId": "/subscriptions/SUB_ID/resourceGroups/RG_NAME/providers/Microsoft.Network/virtualNetworks/VNET_NAME/subnets/AGENT_SUBNET_NAME",
"ports": [

2
test/cluster-tests/dcos/test.sh
Просмотреть файл

@ -50,7 +50,7 @@ function check_node_count() {
check_node_count
log "Downloading dcos"
${remote_exec} curl -O https://downloads.dcos.io/binaries/cli/linux/x86-64/dcos-1.10/dcos
${remote_exec} curl -O https://dcos-mirror.azureedge.net/binaries/cli/linux/x86-64/dcos-1.10/dcos
if [[ "$?" != "0" ]]; then log "Failed to download dcos"; exit 1; fi
log "Setting dcos permissions"
${remote_exec} chmod a+x ./dcos

8
test/e2e/dcos-deployments.json
Просмотреть файл

@ -1,13 +1,5 @@
{
"deployments": [
{
"cluster_definition": "dcos-releases/dcos1.8.json",
"location": "eastus"
},
{
"cluster_definition": "dcos-releases/dcos1.9.json",
"location": "eastus"
},
{
"cluster_definition": "disks-managed/dcos-preAttachedDisks-vmas.json",
"location": "eastus"

2
test/e2e/dcos/dcos.go
Просмотреть файл

@ -128,7 +128,7 @@ func NewCluster(cfg *config.Config, eng *engine.Engine) (*Cluster, error) {
// InstallDCOSClient will download and place in the path the dcos client
func (c *Cluster) InstallDCOSClient() error {
out, err := c.Connection.Execute("curl -O https://downloads.dcos.io/binaries/cli/linux/x86-64/dcos-1.10/dcos")
out, err := c.Connection.Execute("curl -O https://dcos-mirror.azureedge.net/binaries/cli/linux/x86-64/dcos-1.10/dcos")
if err != nil {
log.Printf("Error downloading DCOS cli:%s\n", err)
log.Printf("Output:%s\n", out)