From fe24e3298b02c280f51223b65c06a131c64dcd78 Mon Sep 17 00:00:00 2001 From: Marwan Ahmed Date: Wed, 12 Feb 2020 21:22:13 -0800 Subject: [PATCH] AutoScaler Profile Change (#8350) * add autoScalerProfile to spec * add example for put MC * add to custom words * add list of accepted params * disable linting for profile * update example --- custom-words.txt | 1 + .../ManagedClustersCreate_Update.json | 12 ++++++++ .../stable/2020-02-01/managedClusters.json | 30 +++++++++++++++++++ .../resource-manager/readme.md | 4 +++ 4 files changed, 47 insertions(+) diff --git a/custom-words.txt b/custom-words.txt index f71670c793cc..327465fcca5a 100644 --- a/custom-words.txt +++ b/custom-words.txt @@ -131,6 +131,7 @@ autopatching autopool autorest autoscale +autoscaler autoscalesettings autoscaling Avro diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-02-01/examples/ManagedClustersCreate_Update.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-02-01/examples/ManagedClustersCreate_Update.json index d2668db7dfd8..e619a763e923 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-02-01/examples/ManagedClustersCreate_Update.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-02-01/examples/ManagedClustersCreate_Update.json @@ -47,6 +47,10 @@ } } }, + "autoScalerProfile": { + "scan-interval": "20s", + "scale-down-delay-after-add": "15m" + }, "windowsProfile": { "adminUsername": "azureuser", "adminPassword": "replacePassword1234$" @@ -140,6 +144,10 @@ } ] } + }, + "autoScalerProfile": { + "scan-interval": "20s", + "scale-down-delay-after-add": "15m" } } } @@ -220,6 +228,10 @@ } ] } + }, + "autoScalerProfile": { + "scan-interval": "20s", + "scale-down-delay-after-add": "15m" } } } diff --git a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-02-01/managedClusters.json b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-02-01/managedClusters.json index f588fa6589c9..09a127a07480 100644 --- a/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-02-01/managedClusters.json +++ b/specification/containerservice/resource-manager/Microsoft.ContainerService/stable/2020-02-01/managedClusters.json @@ -1971,6 +1971,36 @@ "$ref": "#/definitions/ManagedClusterAADProfile", "description": "Profile of Azure Active Directory configuration." }, + "autoScalerProfile": { + "type": "object", + "properties": { + "scan-interval": { + "type": "string" + }, + "scale-down-delay-after-add": { + "type": "string" + }, + "scale-down-delay-after-delete": { + "type": "string" + }, + "scale-down-delay-after-failure": { + "type": "string" + }, + "scale-down-unneeded-time": { + "type": "string" + }, + "scale-down-unready-time": { + "type": "string" + }, + "scale-down-utilization-threshold": { + "type": "string" + }, + "max-graceful-termination-sec": { + "type": "string" + } + }, + "description": "Parameters to be applied to the cluster-autoscaler when enabled" + }, "apiServerAccessProfile": { "$ref": "#/definitions/ManagedClusterAPIServerAccessProfile", "description": "Access profile for managed cluster API server." diff --git a/specification/containerservice/resource-manager/readme.md b/specification/containerservice/resource-manager/readme.md index 30a3906ffb4d..004e7d8d1afc 100644 --- a/specification/containerservice/resource-manager/readme.md +++ b/specification/containerservice/resource-manager/readme.md @@ -218,6 +218,10 @@ These settings apply only when `--tag=package-2020-02-01-only` is specified on t ``` yaml $(tag) == 'package-2020-02-01-only' input-file: - Microsoft.ContainerService/stable/2020-02-01/managedClusters.json +directive: + - suppress: DefinitionsPropertiesNamesCamelCase + where: $.definitions.ManagedClusterProperties.properties.autoScalerProfile + reason: Cluster-autoscaler settings are not camel-cased ``` ### Tag: package-2020-01-01-only