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..282dc4d10ef6 100644 --- a/sdk/containerservice/arm-containerservice/src/models/index.ts +++ b/sdk/containerservice/arm-containerservice/src/models/index.ts @@ -805,7 +805,7 @@ export interface ManagedClusterServicePrincipalProfile { */ export interface ManagedClusterAgentPoolProfileProperties { /** - * Number of agents (VMs) to host docker containers. Allowed values must be in the range of 1 to + * 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 value: 1. */ count: number; @@ -886,6 +886,10 @@ export interface ManagedClusterAgentPoolProfileProperties { * 'VirtualMachineScaleSets', 'AvailabilitySet' */ type?: AgentPoolType; + /** + * AgentPoolMode represents mode of an agent pool. Possible values include: 'System', 'User' + */ + mode?: AgentPoolMode; /** * Version of orchestrator specified when creating the managed cluster. */ @@ -950,7 +954,7 @@ export interface ManagedClusterAgentPoolProfile extends ManagedClusterAgentPoolP */ export interface AgentPool extends SubResource { /** - * Number of agents (VMs) to host docker containers. Allowed values must be in the range of 1 to + * 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 value: 1. */ count: number; @@ -1031,6 +1035,10 @@ export interface AgentPool extends SubResource { * 'VirtualMachineScaleSets', 'AvailabilitySet' */ agentPoolType?: AgentPoolType; + /** + * AgentPoolMode represents mode of an agent pool. Possible values include: 'System', 'User' + */ + mode?: AgentPoolMode; /** * Version of orchestrator specified when creating the managed cluster. */ @@ -1269,14 +1277,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 +1308,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 +1362,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 +1469,10 @@ export interface ManagedCluster extends Resource { * The identity of the managed cluster, if configured. */ identity?: ManagedClusterIdentity; + /** + * The managed cluster SKU. + */ + sku?: ManagedClusterSKU; } /** @@ -1811,6 +1846,14 @@ export type ContainerServiceOrchestratorTypes = 'Kubernetes' | 'Swarm' | 'DCOS' */ export type AgentPoolType = 'VirtualMachineScaleSets' | 'AvailabilitySet'; +/** + * Defines values for AgentPoolMode. + * Possible values include: 'System', 'User' + * @readonly + * @enum {string} + */ +export type AgentPoolMode = 'System' | 'User'; + /** * Defines values for ScaleSetPriority. * Possible values include: 'Spot', 'Low', 'Regular' @@ -1875,6 +1918,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..be69ffed513f 100644 --- a/sdk/containerservice/arm-containerservice/src/models/mappers.ts +++ b/sdk/containerservice/arm-containerservice/src/models/mappers.ts @@ -1179,7 +1179,7 @@ export const ManagedClusterAgentPoolProfileProperties: msRest.CompositeMapper = defaultValue: 1, constraints: { InclusiveMaximum: 100, - InclusiveMinimum: 1 + InclusiveMinimum: 0 }, type: { name: "Number" @@ -1241,6 +1241,12 @@ export const ManagedClusterAgentPoolProfileProperties: msRest.CompositeMapper = name: "String" } }, + mode: { + serializedName: "mode", + type: { + name: "String" + } + }, orchestratorVersion: { serializedName: "orchestratorVersion", type: { @@ -1362,7 +1368,7 @@ export const AgentPool: msRest.CompositeMapper = { defaultValue: 1, constraints: { InclusiveMaximum: 100, - InclusiveMinimum: 1 + InclusiveMinimum: 0 }, type: { name: "Number" @@ -1424,6 +1430,12 @@ export const AgentPool: msRest.CompositeMapper = { name: "String" } }, + mode: { + serializedName: "properties.mode", + type: { + name: "String" + } + }, orchestratorVersion: { serializedName: "properties.orchestratorVersion", type: { @@ -1856,15 +1868,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 +1919,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 +2049,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 +2233,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" }