Skip to content

Commit

Permalink
Undo "breaking" changes
Browse files Browse the repository at this point in the history
  • Loading branch information
@matthchr
matthchr committed Jun 21, 2021
1 parent 67854c9 commit d979edd
Showing 1 changed file with 257 additions and 74 deletions.
331 changes: 257 additions & 74 deletions ...ervice/resource-manager/Microsoft.ContainerService/stable/2021-05-01/managedClusters.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2054,6 +2054,194 @@
],
"description": "Specifies what kind of storage to use. If omitted, the default will be chosen on your behalf based on the choice of orchestrator."
},
"ContainerServiceVnetSubnetID": {
"type": "string",
"description": "specifies a subnet's resource id with subscription, resource group, vnet and subnet name"
},
"ContainerServiceVMSize": {
"type": "string",
"x-ms-enum": {
"name": "ContainerServiceVMSizeTypes",
"modelAsString": true
},
"description": "Size of agent VMs. Note: This is no longer maintained.",
"enum": [
"Standard_A1",
"Standard_A10",
"Standard_A11",
"Standard_A1_v2",
"Standard_A2",
"Standard_A2_v2",
"Standard_A2m_v2",
"Standard_A3",
"Standard_A4",
"Standard_A4_v2",
"Standard_A4m_v2",
"Standard_A5",
"Standard_A6",
"Standard_A7",
"Standard_A8",
"Standard_A8_v2",
"Standard_A8m_v2",
"Standard_A9",
"Standard_B2ms",
"Standard_B2s",
"Standard_B4ms",
"Standard_B8ms",
"Standard_D1",
"Standard_D11",
"Standard_D11_v2",
"Standard_D11_v2_Promo",
"Standard_D12",
"Standard_D12_v2",
"Standard_D12_v2_Promo",
"Standard_D13",
"Standard_D13_v2",
"Standard_D13_v2_Promo",
"Standard_D14",
"Standard_D14_v2",
"Standard_D14_v2_Promo",
"Standard_D15_v2",
"Standard_D16_v3",
"Standard_D16s_v3",
"Standard_D1_v2",
"Standard_D2",
"Standard_D2_v2",
"Standard_D2_v2_Promo",
"Standard_D2_v3",
"Standard_D2s_v3",
"Standard_D3",
"Standard_D32_v3",
"Standard_D32s_v3",
"Standard_D3_v2",
"Standard_D3_v2_Promo",
"Standard_D4",
"Standard_D4_v2",
"Standard_D4_v2_Promo",
"Standard_D4_v3",
"Standard_D4s_v3",
"Standard_D5_v2",
"Standard_D5_v2_Promo",
"Standard_D64_v3",
"Standard_D64s_v3",
"Standard_D8_v3",
"Standard_D8s_v3",
"Standard_DS1",
"Standard_DS11",
"Standard_DS11_v2",
"Standard_DS11_v2_Promo",
"Standard_DS12",
"Standard_DS12_v2",
"Standard_DS12_v2_Promo",
"Standard_DS13",
"Standard_DS13-2_v2",
"Standard_DS13-4_v2",
"Standard_DS13_v2",
"Standard_DS13_v2_Promo",
"Standard_DS14",
"Standard_DS14-4_v2",
"Standard_DS14-8_v2",
"Standard_DS14_v2",
"Standard_DS14_v2_Promo",
"Standard_DS15_v2",
"Standard_DS1_v2",
"Standard_DS2",
"Standard_DS2_v2",
"Standard_DS2_v2_Promo",
"Standard_DS3",
"Standard_DS3_v2",
"Standard_DS3_v2_Promo",
"Standard_DS4",
"Standard_DS4_v2",
"Standard_DS4_v2_Promo",
"Standard_DS5_v2",
"Standard_DS5_v2_Promo",
"Standard_E16_v3",
"Standard_E16s_v3",
"Standard_E2_v3",
"Standard_E2s_v3",
"Standard_E32-16s_v3",
"Standard_E32-8s_v3",
"Standard_E32_v3",
"Standard_E32s_v3",
"Standard_E4_v3",
"Standard_E4s_v3",
"Standard_E64-16s_v3",
"Standard_E64-32s_v3",
"Standard_E64_v3",
"Standard_E64s_v3",
"Standard_E8_v3",
"Standard_E8s_v3",
"Standard_F1",
"Standard_F16",
"Standard_F16s",
"Standard_F16s_v2",
"Standard_F1s",
"Standard_F2",
"Standard_F2s",
"Standard_F2s_v2",
"Standard_F32s_v2",
"Standard_F4",
"Standard_F4s",
"Standard_F4s_v2",
"Standard_F64s_v2",
"Standard_F72s_v2",
"Standard_F8",
"Standard_F8s",
"Standard_F8s_v2",
"Standard_G1",
"Standard_G2",
"Standard_G3",
"Standard_G4",
"Standard_G5",
"Standard_GS1",
"Standard_GS2",
"Standard_GS3",
"Standard_GS4",
"Standard_GS4-4",
"Standard_GS4-8",
"Standard_GS5",
"Standard_GS5-16",
"Standard_GS5-8",
"Standard_H16",
"Standard_H16m",
"Standard_H16mr",
"Standard_H16r",
"Standard_H8",
"Standard_H8m",
"Standard_L16s",
"Standard_L32s",
"Standard_L4s",
"Standard_L8s",
"Standard_M128-32ms",
"Standard_M128-64ms",
"Standard_M128ms",
"Standard_M128s",
"Standard_M64-16ms",
"Standard_M64-32ms",
"Standard_M64ms",
"Standard_M64s",
"Standard_NC12",
"Standard_NC12s_v2",
"Standard_NC12s_v3",
"Standard_NC24",
"Standard_NC24r",
"Standard_NC24rs_v2",
"Standard_NC24rs_v3",
"Standard_NC24s_v2",
"Standard_NC24s_v3",
"Standard_NC6",
"Standard_NC6s_v2",
"Standard_NC6s_v3",
"Standard_ND12s",
"Standard_ND24rs",
"Standard_ND24s",
"Standard_ND6s",
"Standard_NV12",
"Standard_NV24",
"Standard_NV6"
]
},
"ManagedClusterServicePrincipalProfile": {
"properties": {
"clientId": {
Expand All @@ -2070,6 +2258,60 @@
"clientId"
]
},
"ContainerServiceMasterProfile": {
"properties": {
"count": {
"type": "integer",
"format": "int32",
"enum": [
1,
3,
5
],
"x-ms-enum": {
"name": "Count",
"modelAsString": false
},
"description": "Number of masters (VMs) in the container service cluster. Allowed values are 1, 3, and 5. The default value is 1.",
"default": 1
},
"dnsPrefix": {
"type": "string",
"description": "DNS prefix to be used to create the FQDN for the master pool."
},
"vmSize": {
"$ref": "#/definitions/ContainerServiceVMSize",
"description": "Size of agent VMs."
},
"osDiskSizeGB": {
"$ref": "#/definitions/ContainerServiceOSDisk",
"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."
},
"vnetSubnetID": {
"$ref": "#/definitions/ContainerServiceVnetSubnetID",
"description": "VNet SubnetID specifies the VNet's subnet identifier."
},
"firstConsecutiveStaticIP": {
"type": "string",
"description": "FirstConsecutiveStaticIP used to specify the first static ip of masters.",
"default": "10.240.255.5"
},
"storageProfile": {
"$ref": "#/definitions/ContainerServiceStorageProfile",
"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."
},
"fqdn": {
"readOnly": true,
"type": "string",
"description": "FQDN for the master pool."
}
},
"required": [
"dnsPrefix",
"vmSize"
],
"description": "Profile for the container service master."
},
"ManagedClusterAgentPoolProfileProperties": {
"properties": {
"count": {
Expand Down Expand Up @@ -2183,8 +2425,7 @@
"description": "This cannot be specified unless the scaleSetPriority is 'Spot'. If not specified, the default is 'Delete'."
},
"spotMaxPrice": {
"type": "number",
"default": -1,
"$ref": "#/definitions/SpotMaxPrice",
"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.",
"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)"
},
Expand All @@ -2210,7 +2451,7 @@
"description": "The taints added to new nodes during node pool create and scale. For example, key=value:NoSchedule."
},
"proximityPlacementGroupID": {
"type": "string",
"$ref": "#/definitions/ProximityPlacementGroupID",
"description": "The ID for Proximity Placement Group."
},
"kubeletConfig": {
Expand Down Expand Up @@ -3285,25 +3526,7 @@
"privateDNSZone": {
"type": "string",
"title": "The private DNS zone mode for the cluster.",
"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).",
"enum": [
"system",
"none"
],
"x-ms-enum": {
"name": "PrivateDNSZone",
"modelAsString": true,
"values": [
{
"value": "system",
"description": "AKS will create a private DNS zone in the Node Resource Group."
},
{
"value": "none",
"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."
}
]
}
"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'."
},
"enablePrivateClusterPublicFQDN": {
"type": "boolean",
Expand Down Expand Up @@ -3919,6 +4142,16 @@
"title": "The Virtual Machine Scale Set eviction policy.",
"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)"
},
"SpotMaxPrice": {
"type": "number",
"default": -1,
"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.",
"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)"
},
"ProximityPlacementGroupID": {
"type": "string",
"description": "The ID for Proximity Placement Group."
},
"CredentialResults": {
"properties": {
"kubeconfigs": {
Expand Down Expand Up @@ -4235,25 +4468,7 @@
"cpuManagerPolicy": {
"type": "string",
"title": "The CPU Manager policy to use.",
"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.",
"enum": [
"none",
"static"
],
"x-ms-enum": {
"name": "KubeletCpuManagerPolicy",
"modelAsString": true,
"values": [
{
"value": "none",
"description": "The default CPU affinity scheme. No affinity is provided beyond what the OS scheduler does automatically."
},
{
"value": "static",
"description": "Allows containers in Guaranteed pods with integer CPU requests access to exclusive CPUs on the node."
}
]
}
"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'."
},
"cpuCfsQuota": {
"type": "boolean",
Expand All @@ -4268,51 +4483,19 @@
"imageGcHighThreshold": {
"type": "integer",
"format": "int32",
"minimum": 0,
"maximum": 100,
"title": "The percent of disk usage after which image garbage collection is always run.",
"description": "To disable image garbage collection, set to 100. The default is 85%"
},
"imageGcLowThreshold": {
"type": "integer",
"format": "int32",
"minimum": 0,
"maximum": 100,
"title": "The percent of disk usage before which image garbage collection is never run.",
"description": "This cannot be set higher than imageGcHighThreshold. The default is 80%"
},
"topologyManagerPolicy": {
"type": "string",
"title": "The Topology Manager policy to use.",
"description": "For more information see [Kubernetes Topology Manager](https://kubernetes.io/docs/tasks/administer-cluster/topology-manager). The default is 'none'.",
"enum": [
"none",
"best-effort",
"restricted",
"single-numa-node"
],
"x-ms-enum": {
"name": "KubeletTopologyManagerPolicy",
"modelAsString": true,
"values": [
{
"value": "none",
"description": "No topology alignment is performed."
},
{
"value": "best-effort",
"description": "Topology Manager tries to honor containers NUMA Node affinity. Containers without a preferred NUMA node affinity are still admitted to the node."
},
{
"value": "restricted",
"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."
},
{
"value": "single-numa-node",
"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."
}
]
}
"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'."
},
"allowedUnsafeSysctls": {
"type": "array",
Expand Down

0 comments on commit d979edd

Please sign in to comment.