From 030ff125004bb4c4da55c74f86be0abd1a569714 Mon Sep 17 00:00:00 2001 From: CecileRobertMichon Date: Wed, 24 Jan 2018 18:01:20 -0800 Subject: [PATCH 1/2] added multi master configs --- .../kubernetes-3-masters.json | 35 +++++++++++++++++++ .../kubernetes-5-masters.json | 35 +++++++++++++++++++ test/acse-conf/acse-regression.json | 14 ++++++-- 3 files changed, 81 insertions(+), 3 deletions(-) create mode 100644 examples/multiple-masters/kubernetes-3-masters.json create mode 100644 examples/multiple-masters/kubernetes-5-masters.json diff --git a/examples/multiple-masters/kubernetes-3-masters.json b/examples/multiple-masters/kubernetes-3-masters.json new file mode 100644 index 0000000000..7b9a439c04 --- /dev/null +++ b/examples/multiple-masters/kubernetes-3-masters.json @@ -0,0 +1,35 @@ +{ + "apiVersion": "vlabs", + "properties": { + "orchestratorProfile": { + "orchestratorType": "Kubernetes" + }, + "masterProfile": { + "count": 3, + "dnsPrefix": "", + "vmSize": "Standard_D2_v2" + }, + "agentPoolProfiles": [ + { + "name": "agent", + "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/examples/multiple-masters/kubernetes-5-masters.json b/examples/multiple-masters/kubernetes-5-masters.json new file mode 100644 index 0000000000..56b80a8555 --- /dev/null +++ b/examples/multiple-masters/kubernetes-5-masters.json @@ -0,0 +1,35 @@ +{ + "apiVersion": "vlabs", + "properties": { + "orchestratorProfile": { + "orchestratorType": "Kubernetes" + }, + "masterProfile": { + "count": 5, + "dnsPrefix": "", + "vmSize": "Standard_D2_v2" + }, + "agentPoolProfiles": [ + { + "name": "agent", + "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/acse-conf/acse-regression.json b/test/acse-conf/acse-regression.json index 64080ec53b..06097c520b 100644 --- a/test/acse-conf/acse-regression.json +++ b/test/acse-conf/acse-regression.json @@ -28,9 +28,9 @@ "cluster_definition": "disks-managed/kubernetes-vmas.json", "category": "managed-disk" }, - { - "cluster_definition": "disks-managed/swarm-preAttachedDisks-vmss.json", - "category": "managed-disk" + { + "cluster_definition": "disks-managed/swarm-preAttachedDisks-vmss.json", + "category": "managed-disk" }, { "cluster_definition": "disks-managed/swarmmode-vmas.json", @@ -81,6 +81,14 @@ "cluster_definition": "kubernetes-config/kubernetes-rescheduler.json", "category": "config" }, + { + "cluster_definition": "multiple-masters/kubernetes-3-masters.json", + "category": "multimaster" + }, + { + "cluster_definition": "multiple-masters/kubernetes-5-masters.json", + "category": "multimaster" + }, { "cluster_definition": "v20170131/swarmmode.json", "category": "version" From ff0106990c0d4f5ef9c58bfdb1b70a1487fe40c7 Mon Sep 17 00:00:00 2001 From: CecileRobertMichon Date: Thu, 25 Jan 2018 09:53:16 -0800 Subject: [PATCH 2/2] fix fmt --- test/acse-conf/acse-regression.json | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/test/acse-conf/acse-regression.json b/test/acse-conf/acse-regression.json index 06097c520b..22d983e3b3 100644 --- a/test/acse-conf/acse-regression.json +++ b/test/acse-conf/acse-regression.json @@ -85,10 +85,10 @@ "cluster_definition": "multiple-masters/kubernetes-3-masters.json", "category": "multimaster" }, - { - "cluster_definition": "multiple-masters/kubernetes-5-masters.json", - "category": "multimaster" - }, + { + "cluster_definition": "multiple-masters/kubernetes-5-masters.json", + "category": "multimaster" + }, { "cluster_definition": "v20170131/swarmmode.json", "category": "version"