Update from master

AzureSDKAutomation · May 27, 2020 · b0964dd · b0964dd
1 parent 53bdbe6
commit b0964dd
Show file tree

Hide file tree

Showing 9 changed files with 237 additions and 23 deletions.
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -9,6 +9,7 @@
 export {
   discriminators,
   AgentPool,
+  AgentPoolUpgradeSettings,
   BaseResource,
   CloudError,
   ContainerService,
@@ -46,6 +47,7 @@ export {
   ManagedClusterPropertiesAutoScalerProfile,
   ManagedClusterPropertiesIdentityProfileValue,
   ManagedClusterServicePrincipalProfile,
+  ManagedClusterSKU,
   ManagedClusterUpgradeProfile,
   ManagedClusterWindowsProfile,
   NetworkProfile,