diff --git a/sdk/containerservice/arm-containerservice/src/containerServiceClientContext.ts b/sdk/containerservice/arm-containerservice/src/containerServiceClientContext.ts index b5402d3f7d73..2c68ffc7695a 100644 --- a/sdk/containerservice/arm-containerservice/src/containerServiceClientContext.ts +++ b/sdk/containerservice/arm-containerservice/src/containerServiceClientContext.ts @@ -37,7 +37,7 @@ export class ContainerServiceClientContext extends msRestAzure.AzureServiceClien if (!options) { options = {}; } - if (!options.userAgent) { + if(!options.userAgent) { const defaultUserAgent = msRestAzure.getDefaultUserAgentValue(); options.userAgent = `${packageName}/${packageVersion} ${defaultUserAgent}`; } @@ -51,10 +51,10 @@ export class ContainerServiceClientContext extends msRestAzure.AzureServiceClien this.credentials = credentials; this.subscriptionId = subscriptionId; - if (options.acceptLanguage !== null && options.acceptLanguage !== undefined) { + if(options.acceptLanguage !== null && options.acceptLanguage !== undefined) { this.acceptLanguage = options.acceptLanguage; } - if (options.longRunningOperationRetryTimeout !== null && options.longRunningOperationRetryTimeout !== undefined) { + if(options.longRunningOperationRetryTimeout !== null && options.longRunningOperationRetryTimeout !== undefined) { this.longRunningOperationRetryTimeout = options.longRunningOperationRetryTimeout; } } diff --git a/sdk/containerservice/arm-containerservice/src/models/agentPoolsMappers.ts b/sdk/containerservice/arm-containerservice/src/models/agentPoolsMappers.ts index 49ad2d5a96e6..160a143e7afe 100644 --- a/sdk/containerservice/arm-containerservice/src/models/agentPoolsMappers.ts +++ b/sdk/containerservice/arm-containerservice/src/models/agentPoolsMappers.ts @@ -46,6 +46,7 @@ export { ManagedClusterPropertiesAutoScalerProfile, ManagedClusterPropertiesIdentityProfileValue, ManagedClusterServicePrincipalProfile, + ManagedClusterSKU, ManagedClusterWindowsProfile, NetworkProfile, OpenShiftManagedCluster, diff --git a/sdk/containerservice/arm-containerservice/src/models/containerServicesMappers.ts b/sdk/containerservice/arm-containerservice/src/models/containerServicesMappers.ts index 4c84d94bb361..cecb5b339eba 100644 --- a/sdk/containerservice/arm-containerservice/src/models/containerServicesMappers.ts +++ b/sdk/containerservice/arm-containerservice/src/models/containerServicesMappers.ts @@ -42,6 +42,7 @@ export { ManagedClusterPropertiesAutoScalerProfile, ManagedClusterPropertiesIdentityProfileValue, ManagedClusterServicePrincipalProfile, + ManagedClusterSKU, ManagedClusterWindowsProfile, NetworkProfile, OpenShiftManagedCluster, diff --git a/sdk/containerservice/arm-containerservice/src/models/index.ts b/sdk/containerservice/arm-containerservice/src/models/index.ts index 744466c5ba9f..50a8f01a0b25 100644 --- a/sdk/containerservice/arm-containerservice/src/models/index.ts +++ b/sdk/containerservice/arm-containerservice/src/models/index.ts @@ -1269,14 +1269,22 @@ export interface ManagedClusterAddonProfile { * AADProfile specifies attributes for Azure Active Directory integration. */ export interface ManagedClusterAADProfile { + /** + * Whether to enable managed AAD. + */ + managed?: boolean; + /** + * AAD group object IDs that will have admin role of the cluster. + */ + adminGroupObjectIDs?: string[]; /** * The client AAD application ID. */ - clientAppID: string; + clientAppID?: string; /** * The server AAD application ID. */ - serverAppID: string; + serverAppID?: string; /** * The server AAD application secret. */ @@ -1292,6 +1300,7 @@ export interface ManagedClusterAADProfile { * Parameters to be applied to the cluster-autoscaler when enabled */ export interface ManagedClusterPropertiesAutoScalerProfile { + balanceSimilarNodeGroups?: boolean; scanInterval?: string; scaleDownDelayAfterAdd?: string; scaleDownDelayAfterDelete?: string; @@ -1345,6 +1354,20 @@ export interface ManagedClusterIdentity { type?: ResourceIdentityType; } +/** + * An interface representing ManagedClusterSKU. + */ +export interface ManagedClusterSKU { + /** + * Name of a managed cluster SKU. Possible values include: 'Basic' + */ + name?: ManagedClusterSKUName; + /** + * Tier of a managed cluster SKU. Possible values include: 'Paid', 'Free' + */ + tier?: ManagedClusterSKUTier; +} + /** * Managed cluster. */ @@ -1438,6 +1461,10 @@ export interface ManagedCluster extends Resource { * The identity of the managed cluster, if configured. */ identity?: ManagedClusterIdentity; + /** + * The managed cluster SKU. + */ + sku?: ManagedClusterSKU; } /** @@ -1875,6 +1902,22 @@ export type LoadBalancerSku = 'standard' | 'basic'; */ export type ResourceIdentityType = 'SystemAssigned' | 'None'; +/** + * Defines values for ManagedClusterSKUName. + * Possible values include: 'Basic' + * @readonly + * @enum {string} + */ +export type ManagedClusterSKUName = 'Basic'; + +/** + * Defines values for ManagedClusterSKUTier. + * Possible values include: 'Paid', 'Free' + * @readonly + * @enum {string} + */ +export type ManagedClusterSKUTier = 'Paid' | 'Free'; + /** * Contains response data for the list operation. */ diff --git a/sdk/containerservice/arm-containerservice/src/models/managedClustersMappers.ts b/sdk/containerservice/arm-containerservice/src/models/managedClustersMappers.ts index 6a0d92c8e771..a60f49872379 100644 --- a/sdk/containerservice/arm-containerservice/src/models/managedClustersMappers.ts +++ b/sdk/containerservice/arm-containerservice/src/models/managedClustersMappers.ts @@ -46,6 +46,7 @@ export { ManagedClusterPropertiesAutoScalerProfile, ManagedClusterPropertiesIdentityProfileValue, ManagedClusterServicePrincipalProfile, + ManagedClusterSKU, ManagedClusterUpgradeProfile, ManagedClusterWindowsProfile, NetworkProfile, diff --git a/sdk/containerservice/arm-containerservice/src/models/mappers.ts b/sdk/containerservice/arm-containerservice/src/models/mappers.ts index 0e642ff00ef4..36ff28207c96 100644 --- a/sdk/containerservice/arm-containerservice/src/models/mappers.ts +++ b/sdk/containerservice/arm-containerservice/src/models/mappers.ts @@ -1856,15 +1856,30 @@ export const ManagedClusterAADProfile: msRest.CompositeMapper = { name: "Composite", className: "ManagedClusterAADProfile", modelProperties: { + managed: { + serializedName: "managed", + type: { + name: "Boolean" + } + }, + adminGroupObjectIDs: { + serializedName: "adminGroupObjectIDs", + type: { + name: "Sequence", + element: { + type: { + name: "String" + } + } + } + }, clientAppID: { - required: true, serializedName: "clientAppID", type: { name: "String" } }, serverAppID: { - required: true, serializedName: "serverAppID", type: { name: "String" @@ -1892,6 +1907,12 @@ export const ManagedClusterPropertiesAutoScalerProfile: msRest.CompositeMapper = name: "Composite", className: "ManagedClusterPropertiesAutoScalerProfile", modelProperties: { + balanceSimilarNodeGroups: { + serializedName: "balance-similar-node-groups", + type: { + name: "Boolean" + } + }, scanInterval: { serializedName: "scan-interval", type: { @@ -2016,6 +2037,28 @@ export const ManagedClusterIdentity: msRest.CompositeMapper = { } }; +export const ManagedClusterSKU: msRest.CompositeMapper = { + serializedName: "ManagedClusterSKU", + type: { + name: "Composite", + className: "ManagedClusterSKU", + modelProperties: { + name: { + serializedName: "name", + type: { + name: "String" + } + }, + tier: { + serializedName: "tier", + type: { + name: "String" + } + } + } + } +}; + export const ManagedCluster: msRest.CompositeMapper = { serializedName: "ManagedCluster", type: { @@ -2178,6 +2221,13 @@ export const ManagedCluster: msRest.CompositeMapper = { name: "Composite", className: "ManagedClusterIdentity" } + }, + sku: { + serializedName: "sku", + type: { + name: "Composite", + className: "ManagedClusterSKU" + } } } } diff --git a/sdk/containerservice/arm-containerservice/src/models/openShiftManagedClustersMappers.ts b/sdk/containerservice/arm-containerservice/src/models/openShiftManagedClustersMappers.ts index 7458a1ef58ae..3df73e9c3b4b 100644 --- a/sdk/containerservice/arm-containerservice/src/models/openShiftManagedClustersMappers.ts +++ b/sdk/containerservice/arm-containerservice/src/models/openShiftManagedClustersMappers.ts @@ -41,6 +41,7 @@ export { ManagedClusterPropertiesAutoScalerProfile, ManagedClusterPropertiesIdentityProfileValue, ManagedClusterServicePrincipalProfile, + ManagedClusterSKU, ManagedClusterWindowsProfile, NetworkProfile, OpenShiftManagedCluster, diff --git a/sdk/containerservice/arm-containerservice/src/models/parameters.ts b/sdk/containerservice/arm-containerservice/src/models/parameters.ts index 8d1d0ce731d9..d75a579bf937 100644 --- a/sdk/containerservice/arm-containerservice/src/models/parameters.ts +++ b/sdk/containerservice/arm-containerservice/src/models/parameters.ts @@ -72,7 +72,7 @@ export const apiVersion3: msRest.OperationQueryParameter = { required: true, isConstant: true, serializedName: "api-version", - defaultValue: '2020-02-01', + defaultValue: '2020-03-01', type: { name: "String" }