Skip to content

Commit d979edd

Browse files
matthchrmatthchr
committed
Undo "breaking" changes
1 parent 67854c9 commit d979edd

File tree

1 file changed

+257
-74
lines changed
  • specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2021-05-01

1 file changed

+257
-74
lines changed

‎specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2021-05-01/managedClusters.json‎

Lines changed: 257 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -2054,6 +2054,194 @@
20542054
],
20552055
"description": "Specifies what kind of storage to use. If omitted, the default will be chosen on your behalf based on the choice of orchestrator."
20562056
},
2057+
"ContainerServiceVnetSubnetID": {
2058+
"type": "string",
2059+
"description": "specifies a subnet's resource id with subscription, resource group, vnet and subnet name"
2060+
},
2061+
"ContainerServiceVMSize": {
2062+
"type": "string",
2063+
"x-ms-enum": {
2064+
"name": "ContainerServiceVMSizeTypes",
2065+
"modelAsString": true
2066+
},
2067+
"description": "Size of agent VMs. Note: This is no longer maintained.",
2068+
"enum": [
2069+
"Standard_A1",
2070+
"Standard_A10",
2071+
"Standard_A11",
2072+
"Standard_A1_v2",
2073+
"Standard_A2",
2074+
"Standard_A2_v2",
2075+
"Standard_A2m_v2",
2076+
"Standard_A3",
2077+
"Standard_A4",
2078+
"Standard_A4_v2",
2079+
"Standard_A4m_v2",
2080+
"Standard_A5",
2081+
"Standard_A6",
2082+
"Standard_A7",
2083+
"Standard_A8",
2084+
"Standard_A8_v2",
2085+
"Standard_A8m_v2",
2086+
"Standard_A9",
2087+
"Standard_B2ms",
2088+
"Standard_B2s",
2089+
"Standard_B4ms",
2090+
"Standard_B8ms",
2091+
"Standard_D1",
2092+
"Standard_D11",
2093+
"Standard_D11_v2",
2094+
"Standard_D11_v2_Promo",
2095+
"Standard_D12",
2096+
"Standard_D12_v2",
2097+
"Standard_D12_v2_Promo",
2098+
"Standard_D13",
2099+
"Standard_D13_v2",
2100+
"Standard_D13_v2_Promo",
2101+
"Standard_D14",
2102+
"Standard_D14_v2",
2103+
"Standard_D14_v2_Promo",
2104+
"Standard_D15_v2",
2105+
"Standard_D16_v3",
2106+
"Standard_D16s_v3",
2107+
"Standard_D1_v2",
2108+
"Standard_D2",
2109+
"Standard_D2_v2",
2110+
"Standard_D2_v2_Promo",
2111+
"Standard_D2_v3",
2112+
"Standard_D2s_v3",
2113+
"Standard_D3",
2114+
"Standard_D32_v3",
2115+
"Standard_D32s_v3",
2116+
"Standard_D3_v2",
2117+
"Standard_D3_v2_Promo",
2118+
"Standard_D4",
2119+
"Standard_D4_v2",
2120+
"Standard_D4_v2_Promo",
2121+
"Standard_D4_v3",
2122+
"Standard_D4s_v3",
2123+
"Standard_D5_v2",
2124+
"Standard_D5_v2_Promo",
2125+
"Standard_D64_v3",
2126+
"Standard_D64s_v3",
2127+
"Standard_D8_v3",
2128+
"Standard_D8s_v3",
2129+
"Standard_DS1",
2130+
"Standard_DS11",
2131+
"Standard_DS11_v2",
2132+
"Standard_DS11_v2_Promo",
2133+
"Standard_DS12",
2134+
"Standard_DS12_v2",
2135+
"Standard_DS12_v2_Promo",
2136+
"Standard_DS13",
2137+
"Standard_DS13-2_v2",
2138+
"Standard_DS13-4_v2",
2139+
"Standard_DS13_v2",
2140+
"Standard_DS13_v2_Promo",
2141+
"Standard_DS14",
2142+
"Standard_DS14-4_v2",
2143+
"Standard_DS14-8_v2",
2144+
"Standard_DS14_v2",
2145+
"Standard_DS14_v2_Promo",
2146+
"Standard_DS15_v2",
2147+
"Standard_DS1_v2",
2148+
"Standard_DS2",
2149+
"Standard_DS2_v2",
2150+
"Standard_DS2_v2_Promo",
2151+
"Standard_DS3",
2152+
"Standard_DS3_v2",
2153+
"Standard_DS3_v2_Promo",
2154+
"Standard_DS4",
2155+
"Standard_DS4_v2",
2156+
"Standard_DS4_v2_Promo",
2157+
"Standard_DS5_v2",
2158+
"Standard_DS5_v2_Promo",
2159+
"Standard_E16_v3",
2160+
"Standard_E16s_v3",
2161+
"Standard_E2_v3",
2162+
"Standard_E2s_v3",
2163+
"Standard_E32-16s_v3",
2164+
"Standard_E32-8s_v3",
2165+
"Standard_E32_v3",
2166+
"Standard_E32s_v3",
2167+
"Standard_E4_v3",
2168+
"Standard_E4s_v3",
2169+
"Standard_E64-16s_v3",
2170+
"Standard_E64-32s_v3",
2171+
"Standard_E64_v3",
2172+
"Standard_E64s_v3",
2173+
"Standard_E8_v3",
2174+
"Standard_E8s_v3",
2175+
"Standard_F1",
2176+
"Standard_F16",
2177+
"Standard_F16s",
2178+
"Standard_F16s_v2",
2179+
"Standard_F1s",
2180+
"Standard_F2",
2181+
"Standard_F2s",
2182+
"Standard_F2s_v2",
2183+
"Standard_F32s_v2",
2184+
"Standard_F4",
2185+
"Standard_F4s",
2186+
"Standard_F4s_v2",
2187+
"Standard_F64s_v2",
2188+
"Standard_F72s_v2",
2189+
"Standard_F8",
2190+
"Standard_F8s",
2191+
"Standard_F8s_v2",
2192+
"Standard_G1",
2193+
"Standard_G2",
2194+
"Standard_G3",
2195+
"Standard_G4",
2196+
"Standard_G5",
2197+
"Standard_GS1",
2198+
"Standard_GS2",
2199+
"Standard_GS3",
2200+
"Standard_GS4",
2201+
"Standard_GS4-4",
2202+
"Standard_GS4-8",
2203+
"Standard_GS5",
2204+
"Standard_GS5-16",
2205+
"Standard_GS5-8",
2206+
"Standard_H16",
2207+
"Standard_H16m",
2208+
"Standard_H16mr",
2209+
"Standard_H16r",
2210+
"Standard_H8",
2211+
"Standard_H8m",
2212+
"Standard_L16s",
2213+
"Standard_L32s",
2214+
"Standard_L4s",
2215+
"Standard_L8s",
2216+
"Standard_M128-32ms",
2217+
"Standard_M128-64ms",
2218+
"Standard_M128ms",
2219+
"Standard_M128s",
2220+
"Standard_M64-16ms",
2221+
"Standard_M64-32ms",
2222+
"Standard_M64ms",
2223+
"Standard_M64s",
2224+
"Standard_NC12",
2225+
"Standard_NC12s_v2",
2226+
"Standard_NC12s_v3",
2227+
"Standard_NC24",
2228+
"Standard_NC24r",
2229+
"Standard_NC24rs_v2",
2230+
"Standard_NC24rs_v3",
2231+
"Standard_NC24s_v2",
2232+
"Standard_NC24s_v3",
2233+
"Standard_NC6",
2234+
"Standard_NC6s_v2",
2235+
"Standard_NC6s_v3",
2236+
"Standard_ND12s",
2237+
"Standard_ND24rs",
2238+
"Standard_ND24s",
2239+
"Standard_ND6s",
2240+
"Standard_NV12",
2241+
"Standard_NV24",
2242+
"Standard_NV6"
2243+
]
2244+
},
20572245
"ManagedClusterServicePrincipalProfile": {
20582246
"properties": {
20592247
"clientId": {
@@ -2070,6 +2258,60 @@
20702258
"clientId"
20712259
]
20722260
},
2261+
"ContainerServiceMasterProfile": {
2262+
"properties": {
2263+
"count": {
2264+
"type": "integer",
2265+
"format": "int32",
2266+
"enum": [
2267+
1,
2268+
3,
2269+
5
2270+
],
2271+
"x-ms-enum": {
2272+
"name": "Count",
2273+
"modelAsString": false
2274+
},
2275+
"description": "Number of masters (VMs) in the container service cluster. Allowed values are 1, 3, and 5. The default value is 1.",
2276+
"default": 1
2277+
},
2278+
"dnsPrefix": {
2279+
"type": "string",
2280+
"description": "DNS prefix to be used to create the FQDN for the master pool."
2281+
},
2282+
"vmSize": {
2283+
"$ref": "#/definitions/ContainerServiceVMSize",
2284+
"description": "Size of agent VMs."
2285+
},
2286+
"osDiskSizeGB": {
2287+
"$ref": "#/definitions/ContainerServiceOSDisk",
2288+
"description": "OS Disk Size in GB to be used to specify the disk size for every machine in this master/agent pool. If you specify 0, it will apply the default osDisk size according to the vmSize specified."
2289+
},
2290+
"vnetSubnetID": {
2291+
"$ref": "#/definitions/ContainerServiceVnetSubnetID",
2292+
"description": "VNet SubnetID specifies the VNet's subnet identifier."
2293+
},
2294+
"firstConsecutiveStaticIP": {
2295+
"type": "string",
2296+
"description": "FirstConsecutiveStaticIP used to specify the first static ip of masters.",
2297+
"default": "10.240.255.5"
2298+
},
2299+
"storageProfile": {
2300+
"$ref": "#/definitions/ContainerServiceStorageProfile",
2301+
"description": "Storage profile specifies what kind of storage used. Choose from StorageAccount and ManagedDisks. Leave it empty, we will choose for you based on the orchestrator choice."
2302+
},
2303+
"fqdn": {
2304+
"readOnly": true,
2305+
"type": "string",
2306+
"description": "FQDN for the master pool."
2307+
}
2308+
},
2309+
"required": [
2310+
"dnsPrefix",
2311+
"vmSize"
2312+
],
2313+
"description": "Profile for the container service master."
2314+
},
20732315
"ManagedClusterAgentPoolProfileProperties": {
20742316
"properties": {
20752317
"count": {
@@ -2183,8 +2425,7 @@
21832425
"description": "This cannot be specified unless the scaleSetPriority is 'Spot'. If not specified, the default is 'Delete'."
21842426
},
21852427
"spotMaxPrice": {
2186-
"type": "number",
2187-
"default": -1,
2428+
"$ref": "#/definitions/SpotMaxPrice",
21882429
"title": "The max price (in US Dollars) you are willing to pay for spot instances. Possible values are any decimal value greater than zero or -1 which indicates default price to be up-to on-demand.",
21892430
"description": "Possible values are any decimal value greater than zero or -1 which indicates the willingness to pay any on-demand price. For more details on spot pricing, see [spot VMs pricing](https://docs.microsoft.com/azure/virtual-machines/spot-vms#pricing)"
21902431
},
@@ -2210,7 +2451,7 @@
22102451
"description": "The taints added to new nodes during node pool create and scale. For example, key=value:NoSchedule."
22112452
},
22122453
"proximityPlacementGroupID": {
2213-
"type": "string",
2454+
"$ref": "#/definitions/ProximityPlacementGroupID",
22142455
"description": "The ID for Proximity Placement Group."
22152456
},
22162457
"kubeletConfig": {
@@ -3285,25 +3526,7 @@
32853526
"privateDNSZone": {
32863527
"type": "string",
32873528
"title": "The private DNS zone mode for the cluster.",
3288-
"description": "The default is System. For more details see [configure private DNS zone](https://docs.microsoft.com/azure/aks/private-clusters#configure-private-dns-zone).",
3289-
"enum": [
3290-
"system",
3291-
"none"
3292-
],
3293-
"x-ms-enum": {
3294-
"name": "PrivateDNSZone",
3295-
"modelAsString": true,
3296-
"values": [
3297-
{
3298-
"value": "system",
3299-
"description": "AKS will create a private DNS zone in the Node Resource Group."
3300-
},
3301-
{
3302-
"value": "none",
3303-
"description": "AKS will not create a private DNS zone. This requires you to bring your own DNS server and configure the DNS resolution for the private FQDN."
3304-
}
3305-
]
3306-
}
3529+
"description": "The default is System. For more details see [configure private DNS zone](https://docs.microsoft.com/azure/aks/private-clusters#configure-private-dns-zone). Allowed values are 'system' and 'none'."
33073530
},
33083531
"enablePrivateClusterPublicFQDN": {
33093532
"type": "boolean",
@@ -3919,6 +4142,16 @@
39194142
"title": "The Virtual Machine Scale Set eviction policy.",
39204143
"description": "The eviction policy specifies what to do with the VM when it is evicted. The default is Delete. For more information about eviction see [spot VMs](https://docs.microsoft.com/azure/virtual-machines/spot-vms)"
39214144
},
4145+
"SpotMaxPrice": {
4146+
"type": "number",
4147+
"default": -1,
4148+
"title": "The max price (in US Dollars) you are willing to pay for spot instances. Possible values are any decimal value greater than zero or -1 which indicates default price to be up-to on-demand.",
4149+
"description": "Possible values are any decimal value greater than zero or -1 which indicates the willingness to pay any on-demand price. For more details on spot pricing, see [spot VMs pricing](https://docs.microsoft.com/azure/virtual-machines/spot-vms#pricing)"
4150+
},
4151+
"ProximityPlacementGroupID": {
4152+
"type": "string",
4153+
"description": "The ID for Proximity Placement Group."
4154+
},
39224155
"CredentialResults": {
39234156
"properties": {
39244157
"kubeconfigs": {
@@ -4235,25 +4468,7 @@
42354468
"cpuManagerPolicy": {
42364469
"type": "string",
42374470
"title": "The CPU Manager policy to use.",
4238-
"description": "The default is 'none'. See [Kubernetes CPU management policies](https://kubernetes.io/docs/tasks/administer-cluster/cpu-management-policies/#cpu-management-policies) for more information.",
4239-
"enum": [
4240-
"none",
4241-
"static"
4242-
],
4243-
"x-ms-enum": {
4244-
"name": "KubeletCpuManagerPolicy",
4245-
"modelAsString": true,
4246-
"values": [
4247-
{
4248-
"value": "none",
4249-
"description": "The default CPU affinity scheme. No affinity is provided beyond what the OS scheduler does automatically."
4250-
},
4251-
{
4252-
"value": "static",
4253-
"description": "Allows containers in Guaranteed pods with integer CPU requests access to exclusive CPUs on the node."
4254-
}
4255-
]
4256-
}
4471+
"description": "The default is 'none'. See [Kubernetes CPU management policies](https://kubernetes.io/docs/tasks/administer-cluster/cpu-management-policies/#cpu-management-policies) for more information. Allowed values are 'none' and 'static'."
42574472
},
42584473
"cpuCfsQuota": {
42594474
"type": "boolean",
@@ -4268,51 +4483,19 @@
42684483
"imageGcHighThreshold": {
42694484
"type": "integer",
42704485
"format": "int32",
4271-
"minimum": 0,
4272-
"maximum": 100,
42734486
"title": "The percent of disk usage after which image garbage collection is always run.",
42744487
"description": "To disable image garbage collection, set to 100. The default is 85%"
42754488
},
42764489
"imageGcLowThreshold": {
42774490
"type": "integer",
42784491
"format": "int32",
4279-
"minimum": 0,
4280-
"maximum": 100,
42814492
"title": "The percent of disk usage before which image garbage collection is never run.",
42824493
"description": "This cannot be set higher than imageGcHighThreshold. The default is 80%"
42834494
},
42844495
"topologyManagerPolicy": {
42854496
"type": "string",
42864497
"title": "The Topology Manager policy to use.",
4287-
"description": "For more information see [Kubernetes Topology Manager](https://kubernetes.io/docs/tasks/administer-cluster/topology-manager). The default is 'none'.",
4288-
"enum": [
4289-
"none",
4290-
"best-effort",
4291-
"restricted",
4292-
"single-numa-node"
4293-
],
4294-
"x-ms-enum": {
4295-
"name": "KubeletTopologyManagerPolicy",
4296-
"modelAsString": true,
4297-
"values": [
4298-
{
4299-
"value": "none",
4300-
"description": "No topology alignment is performed."
4301-
},
4302-
{
4303-
"value": "best-effort",
4304-
"description": "Topology Manager tries to honor containers NUMA Node affinity. Containers without a preferred NUMA node affinity are still admitted to the node."
4305-
},
4306-
{
4307-
"value": "restricted",
4308-
"description": "Topology Manager honors containers NUMA Node affinity. Containers without a preferred NUMA node affinity are rejected, resulting in a pod in a Terminated state with a pod admission failure."
4309-
},
4310-
{
4311-
"value": "single-numa-node",
4312-
"description": "Topology Manager ensures containers are assigned to a single NUMA Node. If it is not possible to assign a container to a single NUMA Node the pod is rejected, resulting in a pod in a Terminated state with a pod admission failure."
4313-
}
4314-
]
4315-
}
4498+
"description": "For more information see [Kubernetes Topology Manager](https://kubernetes.io/docs/tasks/administer-cluster/topology-manager). The default is 'none'. Allowed values are 'none', 'best-effort', 'restricted', and 'single-numa-node'."
43164499
},
43174500
"allowedUnsafeSysctls": {
43184501
"type": "array",

0 commit comments

Comments
 (0)