From aa4183e84c7ebe6609676276eb9fb96eda6d6213 Mon Sep 17 00:00:00 2001 From: SDKAuto Date: Tue, 9 Mar 2021 23:42:40 +0000 Subject: [PATCH] CodeGen from PR 13359 in Azure/azure-rest-api-specs Merge 698630c04fb85eb4a86e01f93e69e94f834f8219 into 201d083968807bc910eaa7fb7125a0f0c069b30b --- .../src/containerServiceClientContext.ts | 2 +- .../arm-containerservice/src/models/index.ts | 37 ++++++++++++++-- .../src/models/mappers.ts | 43 +++++++++++++++++++ 3 files changed, 77 insertions(+), 5 deletions(-) diff --git a/sdk/containerservice/arm-containerservice/src/containerServiceClientContext.ts b/sdk/containerservice/arm-containerservice/src/containerServiceClientContext.ts index c4696f992968..2f859f9dce91 100644 --- a/sdk/containerservice/arm-containerservice/src/containerServiceClientContext.ts +++ b/sdk/containerservice/arm-containerservice/src/containerServiceClientContext.ts @@ -44,7 +44,7 @@ export class ContainerServiceClientContext extends msRestAzure.AzureServiceClien super(credentials, options); - this.apiVersion = '2020-12-01'; + this.apiVersion = '2021-03-01'; this.acceptLanguage = 'en-US'; this.longRunningOperationRetryTimeout = 30; this.baseUri = options.baseUri || this.baseUri || "https://management.azure.com"; diff --git a/sdk/containerservice/arm-containerservice/src/models/index.ts b/sdk/containerservice/arm-containerservice/src/models/index.ts index 5cbe991194d2..36df377764dd 100644 --- a/sdk/containerservice/arm-containerservice/src/models/index.ts +++ b/sdk/containerservice/arm-containerservice/src/models/index.ts @@ -482,7 +482,7 @@ export interface ManagedClusterAgentPoolProfileProperties { /** * KubeletDiskType determines the placement of emptyDir volumes, container runtime data root, and * Kubelet ephemeral storage. Currently allows one value, OS, resulting in Kubelet using the OS - * disk for data. Possible values include: 'OS' + * disk for data. Possible values include: 'OS', 'Temporary' */ kubeletDiskType?: KubeletDiskType; /** @@ -554,6 +554,10 @@ export interface ManagedClusterAgentPoolProfileProperties { * Enable public IP for nodes */ enableNodePublicIP?: boolean; + /** + * Public IP Prefix ID. VM nodes use IPs assigned from this Public IP Prefix. + */ + nodePublicIPPrefixID?: string; /** * ScaleSetPriority to be used to specify virtual machine scale set priority. Default to regular. * Possible values include: 'Spot', 'Regular'. Default value: 'Regular'. @@ -600,6 +604,10 @@ export interface ManagedClusterAgentPoolProfileProperties { * Whether to enable EncryptionAtHost */ enableEncryptionAtHost?: boolean; + /** + * Whether to use FIPS enabled OS + */ + enableFIPS?: boolean; } /** @@ -678,7 +686,7 @@ export interface AgentPool extends SubResource { /** * KubeletDiskType determines the placement of emptyDir volumes, container runtime data root, and * Kubelet ephemeral storage. Currently allows one value, OS, resulting in Kubelet using the OS - * disk for data. Possible values include: 'OS' + * disk for data. Possible values include: 'OS', 'Temporary' */ kubeletDiskType?: KubeletDiskType; /** @@ -750,6 +758,10 @@ export interface AgentPool extends SubResource { * Enable public IP for nodes */ enableNodePublicIP?: boolean; + /** + * Public IP Prefix ID. VM nodes use IPs assigned from this Public IP Prefix. + */ + nodePublicIPPrefixID?: string; /** * ScaleSetPriority to be used to specify virtual machine scale set priority. Default to regular. * Possible values include: 'Spot', 'Regular'. Default value: 'Regular'. @@ -796,6 +808,10 @@ export interface AgentPool extends SubResource { * Whether to enable EncryptionAtHost */ enableEncryptionAtHost?: boolean; + /** + * Whether to use FIPS enabled OS + */ + enableFIPS?: boolean; } /** @@ -1203,6 +1219,10 @@ export interface ManagedClusterPodIdentityProfile { * Whether the pod identity addon is enabled. */ enabled?: boolean; + /** + * Customer consent for enabling AAD pod identity addon in cluster using Kubenet network plugin. + */ + allowNetworkPluginKubenet?: boolean; /** * User assigned pod identity settings. */ @@ -1396,6 +1416,10 @@ export interface ManagedCluster extends Resource { * DNS prefix specified when creating the managed cluster. */ dnsPrefix?: string; + /** + * FQDN subdomain specified when creating private cluster with custom private dns zone. + */ + fqdnSubdomain?: string; /** * FQDN for the master pool. * **NOTE: This property will not be serialized. It can only be populated by the server.** @@ -1406,6 +1430,11 @@ export interface ManagedCluster extends Resource { * **NOTE: This property will not be serialized. It can only be populated by the server.** */ readonly privateFQDN?: string; + /** + * FQDN for the master pool which used by proxy config. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly azurePortalFQDN?: string; /** * Properties of the agent pool. */ @@ -1909,11 +1938,11 @@ export type OSDiskType = 'Managed' | 'Ephemeral'; /** * Defines values for KubeletDiskType. - * Possible values include: 'OS' + * Possible values include: 'OS', 'Temporary' * @readonly * @enum {string} */ -export type KubeletDiskType = 'OS'; +export type KubeletDiskType = 'OS' | 'Temporary'; /** * Defines values for OSType. diff --git a/sdk/containerservice/arm-containerservice/src/models/mappers.ts b/sdk/containerservice/arm-containerservice/src/models/mappers.ts index 7d38494880bb..41e3b7ae75c9 100644 --- a/sdk/containerservice/arm-containerservice/src/models/mappers.ts +++ b/sdk/containerservice/arm-containerservice/src/models/mappers.ts @@ -723,6 +723,12 @@ export const ManagedClusterAgentPoolProfileProperties: msRest.CompositeMapper = name: "Boolean" } }, + nodePublicIPPrefixID: { + serializedName: "nodePublicIPPrefixID", + type: { + name: "String" + } + }, scaleSetPriority: { serializedName: "scaleSetPriority", defaultValue: 'Regular', @@ -801,6 +807,12 @@ export const ManagedClusterAgentPoolProfileProperties: msRest.CompositeMapper = type: { name: "Boolean" } + }, + enableFIPS: { + serializedName: "enableFIPS", + type: { + name: "Boolean" + } } } } @@ -971,6 +983,12 @@ export const AgentPool: msRest.CompositeMapper = { name: "Boolean" } }, + nodePublicIPPrefixID: { + serializedName: "properties.nodePublicIPPrefixID", + type: { + name: "String" + } + }, scaleSetPriority: { serializedName: "properties.scaleSetPriority", defaultValue: 'Regular', @@ -1049,6 +1067,12 @@ export const AgentPool: msRest.CompositeMapper = { type: { name: "Boolean" } + }, + enableFIPS: { + serializedName: "properties.enableFIPS", + type: { + name: "Boolean" + } } } } @@ -1753,6 +1777,12 @@ export const ManagedClusterPodIdentityProfile: msRest.CompositeMapper = { name: "Boolean" } }, + allowNetworkPluginKubenet: { + serializedName: "allowNetworkPluginKubenet", + type: { + name: "Boolean" + } + }, userAssignedIdentities: { serializedName: "userAssignedIdentities", type: { @@ -2144,6 +2174,12 @@ export const ManagedCluster: msRest.CompositeMapper = { name: "String" } }, + fqdnSubdomain: { + serializedName: "properties.fqdnSubdomain", + type: { + name: "String" + } + }, fqdn: { readOnly: true, serializedName: "properties.fqdn", @@ -2158,6 +2194,13 @@ export const ManagedCluster: msRest.CompositeMapper = { name: "String" } }, + azurePortalFQDN: { + readOnly: true, + serializedName: "properties.azurePortalFQDN", + type: { + name: "String" + } + }, agentPoolProfiles: { serializedName: "properties.agentPoolProfiles", type: {