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..da4f347f66c4 100644 --- a/sdk/containerservice/arm-containerservice/src/models/agentPoolsMappers.ts +++ b/sdk/containerservice/arm-containerservice/src/models/agentPoolsMappers.ts @@ -14,6 +14,7 @@ export { AgentPoolListResult, AgentPoolUpgradeProfile, AgentPoolUpgradeProfilePropertiesUpgradesItem, + AgentPoolUpgradeSettings, BaseResource, CloudError, ContainerService, @@ -46,6 +47,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..d5af1409eb73 100644 --- a/sdk/containerservice/arm-containerservice/src/models/containerServicesMappers.ts +++ b/sdk/containerservice/arm-containerservice/src/models/containerServicesMappers.ts @@ -9,6 +9,7 @@ export { discriminators, AgentPool, + AgentPoolUpgradeSettings, BaseResource, CloudError, ContainerService, @@ -42,6 +43,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..b5b36858f7ab 100644 --- a/sdk/containerservice/arm-containerservice/src/models/index.ts +++ b/sdk/containerservice/arm-containerservice/src/models/index.ts @@ -800,12 +800,22 @@ export interface ManagedClusterServicePrincipalProfile { secret?: string; } +/** + * Settings for upgrading an agentpool + */ +export interface AgentPoolUpgradeSettings { + /** + * Count or percentage of additional nodes to be added during upgrade. If empty uses AKS default + */ + maxSurge?: string; +} + /** * Properties for the container service agent pool profile. */ 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,10 +896,22 @@ 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. */ orchestratorVersion?: string; + /** + * Version of node image + */ + nodeImageVersion?: string; + /** + * Settings for upgrading the agentpool + */ + upgradeSettings?: AgentPoolUpgradeSettings; /** * The current deployment or provisioning state, which only appears in the response. * **NOTE: This property will not be serialized. It can only be populated by the server.** @@ -905,13 +927,13 @@ export interface ManagedClusterAgentPoolProfileProperties { enableNodePublicIP?: boolean; /** * ScaleSetPriority to be used to specify virtual machine scale set priority. Default to regular. - * Possible values include: 'Spot', 'Low', 'Regular'. Default value: 'Regular'. + * Possible values include: 'Spot', 'Regular'. Default value: 'Regular'. */ scaleSetPriority?: ScaleSetPriority; /** - * ScaleSetEvictionPolicy to be used to specify eviction policy for Spot or low priority virtual - * machine scale set. Default to Delete. Possible values include: 'Delete', 'Deallocate'. Default - * value: 'Delete'. + * ScaleSetEvictionPolicy to be used to specify eviction policy for Spot virtual machine scale + * set. Default to Delete. Possible values include: 'Delete', 'Deallocate'. Default value: + * 'Delete'. */ scaleSetEvictionPolicy?: ScaleSetEvictionPolicy; /** @@ -950,7 +972,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,10 +1053,22 @@ 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. */ orchestratorVersion?: string; + /** + * Version of node image + */ + nodeImageVersion?: string; + /** + * Settings for upgrading the agentpool + */ + upgradeSettings?: AgentPoolUpgradeSettings; /** * The current deployment or provisioning state, which only appears in the response. * **NOTE: This property will not be serialized. It can only be populated by the server.** @@ -1050,13 +1084,13 @@ export interface AgentPool extends SubResource { enableNodePublicIP?: boolean; /** * ScaleSetPriority to be used to specify virtual machine scale set priority. Default to regular. - * Possible values include: 'Spot', 'Low', 'Regular'. Default value: 'Regular'. + * Possible values include: 'Spot', 'Regular'. Default value: 'Regular'. */ scaleSetPriority?: ScaleSetPriority; /** - * ScaleSetEvictionPolicy to be used to specify eviction policy for Spot or low priority virtual - * machine scale set. Default to Delete. Possible values include: 'Delete', 'Deallocate'. Default - * value: 'Delete'. + * ScaleSetEvictionPolicy to be used to specify eviction policy for Spot virtual machine scale + * set. Default to Delete. Possible values include: 'Delete', 'Deallocate'. Default value: + * 'Delete'. */ scaleSetEvictionPolicy?: ScaleSetEvictionPolicy; /** @@ -1269,14 +1303,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 +1334,7 @@ export interface ManagedClusterAADProfile { * Parameters to be applied to the cluster-autoscaler when enabled */ export interface ManagedClusterPropertiesAutoScalerProfile { + balanceSimilarNodeGroups?: string; scanInterval?: string; scaleDownDelayAfterAdd?: string; scaleDownDelayAfterDelete?: string; @@ -1345,6 +1388,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 +1495,10 @@ export interface ManagedCluster extends Resource { * The identity of the managed cluster, if configured. */ identity?: ManagedClusterIdentity; + /** + * The managed cluster SKU. + */ + sku?: ManagedClusterSKU; } /** @@ -1562,6 +1623,10 @@ export interface AgentPoolUpgradeProfile { * List of orchestrator types and versions available for upgrade. */ upgrades?: AgentPoolUpgradeProfilePropertiesUpgradesItem[]; + /** + * LatestNodeImageVersion is the latest AKS supported node image version. + */ + latestNodeImageVersion?: string; } /** @@ -1811,13 +1876,21 @@ 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' + * Possible values include: 'Spot', 'Regular' * @readonly * @enum {string} */ -export type ScaleSetPriority = 'Spot' | 'Low' | 'Regular'; +export type ScaleSetPriority = 'Spot' | 'Regular'; /** * Defines values for ScaleSetEvictionPolicy. @@ -1875,6 +1948,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..c09019f63b10 100644 --- a/sdk/containerservice/arm-containerservice/src/models/managedClustersMappers.ts +++ b/sdk/containerservice/arm-containerservice/src/models/managedClustersMappers.ts @@ -9,6 +9,7 @@ export { discriminators, AgentPool, + AgentPoolUpgradeSettings, BaseResource, CloudError, ContainerService, @@ -46,6 +47,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..01c419813162 100644 --- a/sdk/containerservice/arm-containerservice/src/models/mappers.ts +++ b/sdk/containerservice/arm-containerservice/src/models/mappers.ts @@ -1167,6 +1167,22 @@ export const ManagedClusterServicePrincipalProfile: msRest.CompositeMapper = { } }; +export const AgentPoolUpgradeSettings: msRest.CompositeMapper = { + serializedName: "AgentPoolUpgradeSettings", + type: { + name: "Composite", + className: "AgentPoolUpgradeSettings", + modelProperties: { + maxSurge: { + serializedName: "maxSurge", + type: { + name: "String" + } + } + } + } +}; + export const ManagedClusterAgentPoolProfileProperties: msRest.CompositeMapper = { serializedName: "ManagedClusterAgentPoolProfileProperties", type: { @@ -1179,7 +1195,7 @@ export const ManagedClusterAgentPoolProfileProperties: msRest.CompositeMapper = defaultValue: 1, constraints: { InclusiveMaximum: 100, - InclusiveMinimum: 1 + InclusiveMinimum: 0 }, type: { name: "Number" @@ -1241,12 +1257,31 @@ export const ManagedClusterAgentPoolProfileProperties: msRest.CompositeMapper = name: "String" } }, + mode: { + serializedName: "mode", + type: { + name: "String" + } + }, orchestratorVersion: { serializedName: "orchestratorVersion", type: { name: "String" } }, + nodeImageVersion: { + serializedName: "nodeImageVersion", + type: { + name: "String" + } + }, + upgradeSettings: { + serializedName: "upgradeSettings", + type: { + name: "Composite", + className: "AgentPoolUpgradeSettings" + } + }, provisioningState: { readOnly: true, serializedName: "provisioningState", @@ -1362,7 +1397,7 @@ export const AgentPool: msRest.CompositeMapper = { defaultValue: 1, constraints: { InclusiveMaximum: 100, - InclusiveMinimum: 1 + InclusiveMinimum: 0 }, type: { name: "Number" @@ -1424,12 +1459,31 @@ export const AgentPool: msRest.CompositeMapper = { name: "String" } }, + mode: { + serializedName: "properties.mode", + type: { + name: "String" + } + }, orchestratorVersion: { serializedName: "properties.orchestratorVersion", type: { name: "String" } }, + nodeImageVersion: { + serializedName: "properties.nodeImageVersion", + type: { + name: "String" + } + }, + upgradeSettings: { + serializedName: "properties.upgradeSettings", + type: { + name: "Composite", + className: "AgentPoolUpgradeSettings" + } + }, provisioningState: { readOnly: true, serializedName: "properties.provisioningState", @@ -1856,15 +1910,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 +1961,12 @@ export const ManagedClusterPropertiesAutoScalerProfile: msRest.CompositeMapper = name: "Composite", className: "ManagedClusterPropertiesAutoScalerProfile", modelProperties: { + balanceSimilarNodeGroups: { + serializedName: "balance-similar-node-groups", + type: { + name: "String" + } + }, scanInterval: { serializedName: "scan-interval", type: { @@ -2016,6 +2091,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 +2275,13 @@ export const ManagedCluster: msRest.CompositeMapper = { name: "Composite", className: "ManagedClusterIdentity" } + }, + sku: { + serializedName: "sku", + type: { + name: "Composite", + className: "ManagedClusterSKU" + } } } } @@ -2392,6 +2496,12 @@ export const AgentPoolUpgradeProfile: msRest.CompositeMapper = { } } } + }, + latestNodeImageVersion: { + serializedName: "properties.latestNodeImageVersion", + type: { + name: "String" + } } } } diff --git a/sdk/containerservice/arm-containerservice/src/models/openShiftManagedClustersMappers.ts b/sdk/containerservice/arm-containerservice/src/models/openShiftManagedClustersMappers.ts index 7458a1ef58ae..4d82d68f9632 100644 --- a/sdk/containerservice/arm-containerservice/src/models/openShiftManagedClustersMappers.ts +++ b/sdk/containerservice/arm-containerservice/src/models/openShiftManagedClustersMappers.ts @@ -9,6 +9,7 @@ export { discriminators, AgentPool, + AgentPoolUpgradeSettings, BaseResource, CloudError, ContainerService, @@ -41,6 +42,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..aebcf0f7508d 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-04-01', type: { name: "String" } diff --git a/sdk/containerservice/arm-containerservice/src/operations/managedClusters.ts b/sdk/containerservice/arm-containerservice/src/operations/managedClusters.ts index b012d3152045..f2d04b116621 100644 --- a/sdk/containerservice/arm-containerservice/src/operations/managedClusters.ts +++ b/sdk/containerservice/arm-containerservice/src/operations/managedClusters.ts @@ -119,12 +119,17 @@ export class ManagedClusters { /** * Gets the accessProfile for the specified role name of the managed cluster with a specified - * resource group and name. + * resource group and name. **WARNING**: This API will be deprecated. Instead use + * [ListClusterUserCredentials](https://docs.microsoft.com/en-us/rest/api/aks/managedclusters/listclusterusercredentials) + * or + * [ListClusterAdminCredentials](https://docs.microsoft.com/en-us/rest/api/aks/managedclusters/listclusteradmincredentials) + * . * @summary Gets an access profile of a managed cluster. * @param resourceGroupName The name of the resource group. * @param resourceName The name of the managed cluster resource. * @param roleName The name of the role for managed cluster accessProfile resource. * @param [options] The optional parameters + * @deprecated This operation is deprecated. Please do not use it any longer. * @returns Promise */ getAccessProfile(resourceGroupName: string, resourceName: string, roleName: string, options?: msRest.RequestOptionsBase): Promise; @@ -133,6 +138,7 @@ export class ManagedClusters { * @param resourceName The name of the managed cluster resource. * @param roleName The name of the role for managed cluster accessProfile resource. * @param callback The callback + * @deprecated This operation is deprecated. Please do not use it any longer. */ getAccessProfile(resourceGroupName: string, resourceName: string, roleName: string, callback: msRest.ServiceCallback): void; /** @@ -141,6 +147,7 @@ export class ManagedClusters { * @param roleName The name of the role for managed cluster accessProfile resource. * @param options The optional parameters * @param callback The callback + * @deprecated This operation is deprecated. Please do not use it any longer. */ getAccessProfile(resourceGroupName: string, resourceName: string, roleName: string, options: msRest.RequestOptionsBase, callback: msRest.ServiceCallback): void; getAccessProfile(resourceGroupName: string, resourceName: string, roleName: string, options?: msRest.RequestOptionsBase | msRest.ServiceCallback, callback?: msRest.ServiceCallback): Promise {