From cb3ac5ed278f7f5d9ca176c890005cf9d78cf244 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Fri, 8 Nov 2019 14:57:11 +0100 Subject: [PATCH 1/6] 2019-06-01: making the `count` field optional for updates --- .../examples/AgentPools_Update.json | 72 +++++++++++++++++++ .../stable/2019-06-01/managedClusters.json | 6 +- 2 files changed, 76 insertions(+), 2 deletions(-) create mode 100644 specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-06-01/examples/AgentPools_Update.json diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-06-01/examples/AgentPools_Update.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-06-01/examples/AgentPools_Update.json new file mode 100644 index 000000000000..db17c3ccd802 --- /dev/null +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-06-01/examples/AgentPools_Update.json @@ -0,0 +1,72 @@ +{ + "parameters": { + "api-version": "2019-06-01", + "subscriptionId": "subid1", + "resourceGroupName": "rg1", + "resourceName": "clustername1", + "agentPoolName": "agentpool1", + "parameters": { + "properties": { + "orchestratorVersion": "", + "enableAutoScaling": true, + "minCount": 2, + "maxCount": 2, + "vmSize": "Standard_DS1_v2", + "osType": "Linux", + "nodeTaints": [ + "Key1=Value1:NoSchedule" + ], + "scaleSetPriority": "Low", + "scaleSetEvictionPolicy": "Delete" + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1/agentPools/agentpool1", + "type": "Microsoft.ContainerService/managedClusters/agentPools", + "name": "agentpool1", + "properties": { + "provisioningState": "Succeeded", + "orchestratorVersion": "1.9.6", + "enableAutoScaling": true, + "minCount": 2, + "maxCount": 2, + "count": 3, + "vmSize": "Standard_DS1_v2", + "maxPods": 110, + "osType": "Linux", + "nodeTaints": [ + "Key1=Value1:NoSchedule" + ], + "scaleSetPriority": "Low", + "scaleSetEvictionPolicy": "Delete" + } + } + }, + "201": { + "body": { + "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1/agentPools/agentpool1", + "type": "Microsoft.ContainerService/managedClusters/agentPools", + "name": "agentpool1", + "properties": { + "provisioningState": "Creating", + "orchestratorVersion": "1.9.6", + "count": 3, + "enableAutoScaling": true, + "minCount": 2, + "maxCount": 2, + "vmSize": "Standard_DS1_v2", + "maxPods": 110, + "osType": "Linux", + "nodeTaints": [ + "Key1=Value1:NoSchedule" + ], + "scaleSetPriority": "Low", + "scaleSetEvictionPolicy": "Delete" + } + } + } + } +} diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-06-01/managedClusters.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-06-01/managedClusters.json index 57e98ffa0c12..df76d434f88d 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-06-01/managedClusters.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-06-01/managedClusters.json @@ -676,6 +676,9 @@ "x-ms-examples": { "Create/Update Agent Pool": { "$ref": "./examples/AgentPoolsCreate_Update.json" + }, + "Update Agent Pool": { + "$ref": "./examples/AgentPools_Update.json" } } }, @@ -1417,8 +1420,7 @@ } }, "required": [ - "vmSize", - "count" + "vmSize" ], "description": "Properties for the container service agent pool profile." }, From aad3ffdb783fa9e1a94abde6d8207e4ecc05179d Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Fri, 8 Nov 2019 14:59:24 +0100 Subject: [PATCH 2/6] 2019-08-01: making `count` optional during updates --- .../examples/AgentPools_Update.json | 72 +++++++++++++++++++ .../stable/2019-08-01/managedClusters.json | 6 +- 2 files changed, 76 insertions(+), 2 deletions(-) create mode 100644 specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-08-01/examples/AgentPools_Update.json diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-08-01/examples/AgentPools_Update.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-08-01/examples/AgentPools_Update.json new file mode 100644 index 000000000000..1f1805d4d8bf --- /dev/null +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-08-01/examples/AgentPools_Update.json @@ -0,0 +1,72 @@ +{ + "parameters": { + "api-version": "2019-08-01", + "subscriptionId": "subid1", + "resourceGroupName": "rg1", + "resourceName": "clustername1", + "agentPoolName": "agentpool1", + "parameters": { + "properties": { + "orchestratorVersion": "", + "enableAutoScaling": true, + "minCount": 2, + "maxCount": 2, + "vmSize": "Standard_DS1_v2", + "osType": "Linux", + "nodeTaints": [ + "Key1=Value1:NoSchedule" + ], + "scaleSetPriority": "Low", + "scaleSetEvictionPolicy": "Delete" + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1/agentPools/agentpool1", + "type": "Microsoft.ContainerService/managedClusters/agentPools", + "name": "agentpool1", + "properties": { + "provisioningState": "Succeeded", + "orchestratorVersion": "1.9.6", + "count": 3, + "enableAutoScaling": true, + "minCount": 2, + "maxCount": 2, + "vmSize": "Standard_DS1_v2", + "maxPods": 110, + "osType": "Linux", + "nodeTaints": [ + "Key1=Value1:NoSchedule" + ], + "scaleSetPriority": "Low", + "scaleSetEvictionPolicy": "Delete" + } + } + }, + "201": { + "body": { + "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1/agentPools/agentpool1", + "type": "Microsoft.ContainerService/managedClusters/agentPools", + "name": "agentpool1", + "properties": { + "provisioningState": "Creating", + "orchestratorVersion": "1.9.6", + "count": 3, + "enableAutoScaling": true, + "minCount": 2, + "maxCount": 2, + "vmSize": "Standard_DS1_v2", + "maxPods": 110, + "osType": "Linux", + "nodeTaints": [ + "Key1=Value1:NoSchedule" + ], + "scaleSetPriority": "Low", + "scaleSetEvictionPolicy": "Delete" + } + } + } + } +} diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-08-01/managedClusters.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-08-01/managedClusters.json index 15d5f5ecc635..c3527d05402f 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-08-01/managedClusters.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-08-01/managedClusters.json @@ -676,6 +676,9 @@ "x-ms-examples": { "Create/Update Agent Pool": { "$ref": "./examples/AgentPoolsCreate_Update.json" + }, + "Update Agent Pool": { + "$ref": "./examples/AgentPools_Update.json" } } }, @@ -1461,8 +1464,7 @@ } }, "required": [ - "vmSize", - "count" + "vmSize" ], "description": "Properties for the container service agent pool profile." }, From 2495a97b588dc0bef4afbae76f3df4461921073e Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Fri, 8 Nov 2019 15:00:47 +0100 Subject: [PATCH 3/6] 2019-10-01: allowing for `count` to be nil during updates --- .../examples/AgentPools_Update.json | 73 +++++++++++++++++++ .../stable/2019-10-01/managedClusters.json | 6 +- 2 files changed, 77 insertions(+), 2 deletions(-) create mode 100644 specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-10-01/examples/AgentPools_Update.json diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-10-01/examples/AgentPools_Update.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-10-01/examples/AgentPools_Update.json new file mode 100644 index 000000000000..b29b563c564e --- /dev/null +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-10-01/examples/AgentPools_Update.json @@ -0,0 +1,73 @@ +{ + "parameters": { + "api-version": "2019-10-01", + "subscriptionId": "subid1", + "resourceGroupName": "rg1", + "resourceName": "clustername1", + "agentPoolName": "agentpool1", + "parameters": { + "properties": { + "orchestratorVersion": "", + "count": 3, + "enableAutoScaling": true, + "minCount": 2, + "maxCount": 2, + "vmSize": "Standard_DS1_v2", + "osType": "Linux", + "nodeTaints": [ + "Key1=Value1:NoSchedule" + ], + "scaleSetPriority": "Low", + "scaleSetEvictionPolicy": "Delete" + } + } + }, + "responses": { + "200": { + "body": { + "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1/agentPools/agentpool1", + "type": "Microsoft.ContainerService/managedClusters/agentPools", + "name": "agentpool1", + "properties": { + "provisioningState": "Succeeded", + "orchestratorVersion": "1.9.6", + "count": 3, + "enableAutoScaling": true, + "minCount": 2, + "maxCount": 2, + "vmSize": "Standard_DS1_v2", + "maxPods": 110, + "osType": "Linux", + "nodeTaints": [ + "Key1=Value1:NoSchedule" + ], + "scaleSetPriority": "Low", + "scaleSetEvictionPolicy": "Delete" + } + } + }, + "201": { + "body": { + "id": "/subscriptions/subid1/resourcegroups/rg1/providers/Microsoft.ContainerService/managedClusters/clustername1/agentPools/agentpool1", + "type": "Microsoft.ContainerService/managedClusters/agentPools", + "name": "agentpool1", + "properties": { + "provisioningState": "Creating", + "orchestratorVersion": "1.9.6", + "count": 3, + "enableAutoScaling": true, + "minCount": 2, + "maxCount": 2, + "vmSize": "Standard_DS1_v2", + "maxPods": 110, + "osType": "Linux", + "nodeTaints": [ + "Key1=Value1:NoSchedule" + ], + "scaleSetPriority": "Low", + "scaleSetEvictionPolicy": "Delete" + } + } + } + } +} diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-10-01/managedClusters.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-10-01/managedClusters.json index 7195255be966..7d0dbea4a905 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-10-01/managedClusters.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-10-01/managedClusters.json @@ -676,6 +676,9 @@ "x-ms-examples": { "Create/Update Agent Pool": { "$ref": "./examples/AgentPoolsCreate_Update.json" + }, + "Update Agent Pool": { + "$ref": "./examples/AgentPools_Update.json" } } }, @@ -1461,8 +1464,7 @@ } }, "required": [ - "vmSize", - "count" + "vmSize" ], "description": "Properties for the container service agent pool profile." }, From 27d03a14592691f08e01b1eb885a16cd74d9a9d5 Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Fri, 8 Nov 2019 15:10:36 +0100 Subject: [PATCH 4/6] kubernetes: removing the inclusiveMinumum since this is only applicable on creation --- .../stable/2019-06-01/managedClusters.json | 5 +---- .../stable/2019-08-01/managedClusters.json | 5 +---- .../stable/2019-10-01/managedClusters.json | 5 +---- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-06-01/managedClusters.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-06-01/managedClusters.json index df76d434f88d..a51a38c726a4 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-06-01/managedClusters.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-06-01/managedClusters.json @@ -1339,10 +1339,7 @@ "count": { "type": "integer", "format": "int32", - "maximum": 100, - "minimum": 1, - "description": "Number of agents (VMs) to host docker containers. Allowed values must be in the range of 1 to 100 (inclusive). The default value is 1. ", - "default": 1 + "description": "Number of agents (VMs) to host docker containers. Allowed values must be in the range of 1 to 100 (inclusive). The default value is 1." }, "vmSize": { "$ref": "#/definitions/ContainerServiceVMSize", diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-08-01/managedClusters.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-08-01/managedClusters.json index c3527d05402f..5e7de9f61999 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-08-01/managedClusters.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-08-01/managedClusters.json @@ -1383,10 +1383,7 @@ "count": { "type": "integer", "format": "int32", - "maximum": 100, - "minimum": 1, - "description": "Number of agents (VMs) to host docker containers. Allowed values must be in the range of 1 to 100 (inclusive). The default value is 1. ", - "default": 1 + "description": "Number of agents (VMs) to host docker containers. Allowed values must be in the range of 1 to 100 (inclusive). The default value is 1." }, "vmSize": { "$ref": "#/definitions/ContainerServiceVMSize", diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-10-01/managedClusters.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-10-01/managedClusters.json index 7d0dbea4a905..eb459a84b122 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-10-01/managedClusters.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-10-01/managedClusters.json @@ -1383,10 +1383,7 @@ "count": { "type": "integer", "format": "int32", - "maximum": 100, - "minimum": 1, - "description": "Number of agents (VMs) to host docker containers. Allowed values must be in the range of 1 to 100 (inclusive). The default value is 1. ", - "default": 1 + "description": "Number of agents (VMs) to host docker containers. Allowed values must be in the range of 1 to 100 (inclusive). The default value is 1." }, "vmSize": { "$ref": "#/definitions/ContainerServiceVMSize", From ec9bb83e8e2de9c40b39792644284ca977f1abbb Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Mon, 11 Nov 2019 13:30:10 +0100 Subject: [PATCH 5/6] kubernetes: making `vmSize` optional since it's not required during updates --- .../stable/2019-06-01/managedClusters.json | 3 --- .../stable/2019-08-01/managedClusters.json | 3 --- .../stable/2019-10-01/managedClusters.json | 3 --- 3 files changed, 9 deletions(-) diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-06-01/managedClusters.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-06-01/managedClusters.json index a51a38c726a4..2adcf5c68ab2 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-06-01/managedClusters.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-06-01/managedClusters.json @@ -1416,9 +1416,6 @@ "description": "Taints added to new nodes during node pool create and scale. For example, key=value:NoSchedule." } }, - "required": [ - "vmSize" - ], "description": "Properties for the container service agent pool profile." }, "ManagedClusterAgentPoolProfile": { diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-08-01/managedClusters.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-08-01/managedClusters.json index 5e7de9f61999..c16a98053709 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-08-01/managedClusters.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-08-01/managedClusters.json @@ -1460,9 +1460,6 @@ "description": "Taints added to new nodes during node pool create and scale. For example, key=value:NoSchedule." } }, - "required": [ - "vmSize" - ], "description": "Properties for the container service agent pool profile." }, "ManagedClusterAgentPoolProfile": { diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-10-01/managedClusters.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-10-01/managedClusters.json index eb459a84b122..62a0092e0909 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-10-01/managedClusters.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-10-01/managedClusters.json @@ -1460,9 +1460,6 @@ "description": "Taints added to new nodes during node pool create and scale. For example, key=value:NoSchedule." } }, - "required": [ - "vmSize" - ], "description": "Properties for the container service agent pool profile." }, "ManagedClusterAgentPoolProfile": { From 2525a594f53d6133d98966642f532e75df29d8de Mon Sep 17 00:00:00 2001 From: tombuildsstuff Date: Sun, 17 Nov 2019 14:27:30 +0200 Subject: [PATCH 6/6] kubernetes: 'creating' -> 'updating' --- .../stable/2019-06-01/examples/AgentPools_Update.json | 2 +- .../stable/2019-08-01/examples/AgentPools_Update.json | 2 +- .../stable/2019-10-01/examples/AgentPools_Update.json | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-06-01/examples/AgentPools_Update.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-06-01/examples/AgentPools_Update.json index db17c3ccd802..d1387137a84e 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-06-01/examples/AgentPools_Update.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-06-01/examples/AgentPools_Update.json @@ -51,7 +51,7 @@ "type": "Microsoft.ContainerService/managedClusters/agentPools", "name": "agentpool1", "properties": { - "provisioningState": "Creating", + "provisioningState": "Updating", "orchestratorVersion": "1.9.6", "count": 3, "enableAutoScaling": true, diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-08-01/examples/AgentPools_Update.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-08-01/examples/AgentPools_Update.json index 1f1805d4d8bf..4328104e0709 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-08-01/examples/AgentPools_Update.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-08-01/examples/AgentPools_Update.json @@ -51,7 +51,7 @@ "type": "Microsoft.ContainerService/managedClusters/agentPools", "name": "agentpool1", "properties": { - "provisioningState": "Creating", + "provisioningState": "Updating", "orchestratorVersion": "1.9.6", "count": 3, "enableAutoScaling": true, diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-10-01/examples/AgentPools_Update.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-10-01/examples/AgentPools_Update.json index b29b563c564e..c9d121e3d76a 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-10-01/examples/AgentPools_Update.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2019-10-01/examples/AgentPools_Update.json @@ -52,7 +52,7 @@ "type": "Microsoft.ContainerService/managedClusters/agentPools", "name": "agentpool1", "properties": { - "provisioningState": "Creating", + "provisioningState": "Updating", "orchestratorVersion": "1.9.6", "count": 3, "enableAutoScaling": true,