diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-03-01/examples/AgentPoolsCreate_Update.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-03-01/examples/AgentPoolsCreate_Update.json index 6c2d6028dc4a..df1598f47fbd 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-03-01/examples/AgentPoolsCreate_Update.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-03-01/examples/AgentPoolsCreate_Update.json @@ -21,7 +21,8 @@ "Key1=Value1:NoSchedule" ], "scaleSetPriority": "Low", - "scaleSetEvictionPolicy": "Delete" + "scaleSetEvictionPolicy": "Delete", + "mode": "User" } } }, @@ -48,7 +49,8 @@ "Key1=Value1:NoSchedule" ], "scaleSetPriority": "Low", - "scaleSetEvictionPolicy": "Delete" + "scaleSetEvictionPolicy": "Delete", + "mode": "User" } } }, @@ -74,7 +76,8 @@ "Key1=Value1:NoSchedule" ], "scaleSetPriority": "Low", - "scaleSetEvictionPolicy": "Delete" + "scaleSetEvictionPolicy": "Delete", + "mode": "User" } } } diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-03-01/examples/ManagedClustersCreate_Update.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-03-01/examples/ManagedClustersCreate_Update.json index ffdf05ab1307..f8c21e503ff4 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-03-01/examples/ManagedClustersCreate_Update.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-03-01/examples/ManagedClustersCreate_Update.json @@ -29,7 +29,8 @@ "2", "3" ], - "enableNodePublicIP": true + "enableNodePublicIP": true, + "mode": "System" } ], "linuxProfile": { @@ -101,7 +102,8 @@ "2", "3" ], - "enableNodePublicIP": true + "enableNodePublicIP": true, + "mode": "System" } ], "linuxProfile": { @@ -186,7 +188,8 @@ "2", "3" ], - "enableNodePublicIP": true + "enableNodePublicIP": true, + "mode": "System" } ], "linuxProfile": { diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-03-01/managedClusters.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-03-01/managedClusters.json index fea16ecfc383..aa93e0aedb66 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-03-01/managedClusters.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-03-01/managedClusters.json @@ -1427,8 +1427,8 @@ "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. ", + "minimum": 0, + "description": "Number of agents (VMs) to host docker containers. Allowed values must be in the range of 0 to 100 (inclusive). The default value is 1. ", "default": 1 }, "vmSize": { @@ -1470,6 +1470,10 @@ "$ref": "#/definitions/AgentPoolType", "description": "AgentPoolType represents types of an agent pool" }, + "mode": { + "$ref": "#/definitions/AgentPoolMode", + "description": "AgentPoolMode represents mode of an agent pool" + }, "orchestratorVersion": { "type": "string", "description": "Version of orchestrator specified when creating the managed cluster." @@ -1562,6 +1566,18 @@ }, "description": "AgentPoolType represents types of an agent pool." }, + "AgentPoolMode": { + "type": "string", + "enum": [ + "System", + "User" + ], + "x-ms-enum": { + "name": "AgentPoolMode", + "modelAsString": true + }, + "description": "AgentPoolMode represents mode of an agent pool." + }, "AgentPoolListResult": { "properties": { "value": { diff --git a/specification/containerservice/resource-manager/readme.md b/specification/containerservice/resource-manager/readme.md index 87f1181193d8..b85391585f92 100644 --- a/specification/containerservice/resource-manager/readme.md +++ b/specification/containerservice/resource-manager/readme.md @@ -490,6 +490,7 @@ input-file: - $(this-folder)/Microsoft.ContainerService/stable/2019-04-30/openShiftManagedClusters.json - $(this-folder)/Microsoft.ContainerService/stable/2017-07-01/containerService.json - $(this-folder)/Microsoft.ContainerService/stable/2019-08-01/location.json + - $(this-folder)/Microsoft.ContainerService/stable/2020-03-01/managedClusters.json - $(this-folder)/Microsoft.ContainerService/stable/2020-02-01/managedClusters.json - $(this-folder)/Microsoft.ContainerService/stable/2020-01-01/managedClusters.json - $(this-folder)/Microsoft.ContainerService/stable/2019-11-01/managedClusters.json diff --git a/specification/containerservice/resource-manager/readme.python.md b/specification/containerservice/resource-manager/readme.python.md index 109b868d9d38..79522fde81ec 100644 --- a/specification/containerservice/resource-manager/readme.python.md +++ b/specification/containerservice/resource-manager/readme.python.md @@ -18,7 +18,7 @@ Generate all API versions currently shipped for this package ```yaml $(python) && $(multiapi) batch: - - tag: pacakge-2020-03-01-only + - tag: package-2020-03-01-only - tag: package-2020-02-01-only - tag: package-2020-01-01-only - tag: package-2019-11-01-only