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/agentPoolsMappers.ts b/sdk/containerservice/arm-containerservice/src/models/agentPoolsMappers.ts index 6c85a191b95f..22e6726ce610 100644 --- a/sdk/containerservice/arm-containerservice/src/models/agentPoolsMappers.ts +++ b/sdk/containerservice/arm-containerservice/src/models/agentPoolsMappers.ts @@ -32,6 +32,7 @@ export { ManagedClusterAgentPoolProfileProperties, ManagedClusterAPIServerAccessProfile, ManagedClusterAutoUpgradeProfile, + ManagedClusterHTTPProxyConfig, ManagedClusterIdentity, ManagedClusterIdentityUserAssignedIdentitiesValue, ManagedClusterLoadBalancerProfile, @@ -50,6 +51,7 @@ export { PowerState, PrivateEndpoint, PrivateEndpointConnection, + PrivateLinkResource, PrivateLinkServiceConnectionState, Resource, ResourceReference, diff --git a/sdk/containerservice/arm-containerservice/src/models/index.ts b/sdk/containerservice/arm-containerservice/src/models/index.ts index 5cbe991194d2..0d9790ee4df0 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; } /** @@ -825,6 +841,10 @@ export interface ManagedClusterWindowsProfile { * Benefits for Windows VMs. Possible values include: 'None', 'Windows_Server' */ licenseType?: LicenseType; + /** + * Whether to enable CSI proxy. + */ + enableCSIProxy?: boolean; } /** @@ -1203,6 +1223,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. */ @@ -1253,7 +1277,8 @@ export interface ManagedClusterAADProfile { */ export interface ManagedClusterAutoUpgradeProfile { /** - * upgrade channel for auto upgrade. Possible values include: 'rapid', 'stable', 'patch', 'none' + * upgrade channel for auto upgrade. Possible values include: 'rapid', 'stable', 'patch', + * 'node-image', 'none' */ upgradeChannel?: UpgradeChannel; } @@ -1308,6 +1333,59 @@ export interface ManagedClusterAPIServerAccessProfile { export interface ManagedClusterPropertiesIdentityProfileValue extends UserAssignedIdentity { } +/** + * A private link resource + */ +export interface PrivateLinkResource { + /** + * The ID of the private link resource. + */ + id?: string; + /** + * The name of the private link resource. + */ + name?: string; + /** + * The resource type. + */ + type?: string; + /** + * The group ID of the resource. + */ + groupId?: string; + /** + * RequiredMembers of the resource + */ + requiredMembers?: string[]; + /** + * The private link service ID of the resource, this field is exposed only to NRP internally. + * **NOTE: This property will not be serialized. It can only be populated by the server.** + */ + readonly privateLinkServiceID?: string; +} + +/** + * Configurations for provisioning the cluster with HTTP proxy servers. + */ +export interface ManagedClusterHTTPProxyConfig { + /** + * HTTP proxy server endpoint to use. + */ + httpProxy?: string; + /** + * HTTPS proxy server endpoint to use. + */ + httpsProxy?: string; + /** + * Endpoints that should not go through proxy. + */ + noProxy?: string[]; + /** + * Alternative CA cert to use for connecting to proxy servers. + */ + trustedCa?: string; +} + /** * An interface representing ManagedClusterIdentityUserAssignedIdentitiesValue. */ @@ -1396,6 +1474,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 +1488,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. */ @@ -1472,6 +1559,14 @@ export interface ManagedCluster extends Resource { * Identities associated with the cluster. */ identityProfile?: { [propertyName: string]: ManagedClusterPropertiesIdentityProfileValue }; + /** + * Private link resources associated with the cluster. + */ + privateLinkResources?: PrivateLinkResource[]; + /** + * Configurations for provisioning the cluster with HTTP proxy servers. + */ + httpProxyConfig?: ManagedClusterHTTPProxyConfig; /** * The identity of the managed cluster, if configured. */ @@ -1751,37 +1846,6 @@ export interface PrivateEndpointConnectionListResult { value?: PrivateEndpointConnection[]; } -/** - * A private link resource - */ -export interface PrivateLinkResource { - /** - * The ID of the private link resource. - */ - id?: string; - /** - * The name of the private link resource. - */ - name?: string; - /** - * The resource type. - */ - type?: string; - /** - * The group ID of the resource. - */ - groupId?: string; - /** - * RequiredMembers of the resource - */ - requiredMembers?: string[]; - /** - * The private link service ID of the resource, this field is exposed only to NRP internally. - * **NOTE: This property will not be serialized. It can only be populated by the server.** - */ - readonly privateLinkServiceID?: string; -} - /** * A list of private link resources */ @@ -1909,11 +1973,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. @@ -2038,11 +2102,11 @@ export type ManagedClusterPodIdentityProvisioningState = 'Assigned' | 'Updating' /** * Defines values for UpgradeChannel. - * Possible values include: 'rapid', 'stable', 'patch', 'none' + * Possible values include: 'rapid', 'stable', 'patch', 'node-image', 'none' * @readonly * @enum {string} */ -export type UpgradeChannel = 'rapid' | 'stable' | 'patch' | 'none'; +export type UpgradeChannel = 'rapid' | 'stable' | 'patch' | 'node-image' | 'none'; /** * Defines values for Expander. diff --git a/sdk/containerservice/arm-containerservice/src/models/maintenanceConfigurationsMappers.ts b/sdk/containerservice/arm-containerservice/src/models/maintenanceConfigurationsMappers.ts index cb88910b32f3..29b0fd9fd93e 100644 --- a/sdk/containerservice/arm-containerservice/src/models/maintenanceConfigurationsMappers.ts +++ b/sdk/containerservice/arm-containerservice/src/models/maintenanceConfigurationsMappers.ts @@ -28,6 +28,7 @@ export { ManagedClusterAgentPoolProfileProperties, ManagedClusterAPIServerAccessProfile, ManagedClusterAutoUpgradeProfile, + ManagedClusterHTTPProxyConfig, ManagedClusterIdentity, ManagedClusterIdentityUserAssignedIdentitiesValue, ManagedClusterLoadBalancerProfile, @@ -46,6 +47,7 @@ export { PowerState, PrivateEndpoint, PrivateEndpointConnection, + PrivateLinkResource, PrivateLinkServiceConnectionState, Resource, ResourceReference, diff --git a/sdk/containerservice/arm-containerservice/src/models/managedClustersMappers.ts b/sdk/containerservice/arm-containerservice/src/models/managedClustersMappers.ts index 3128db3eaae9..8597b67544a2 100644 --- a/sdk/containerservice/arm-containerservice/src/models/managedClustersMappers.ts +++ b/sdk/containerservice/arm-containerservice/src/models/managedClustersMappers.ts @@ -29,6 +29,7 @@ export { ManagedClusterAgentPoolProfileProperties, ManagedClusterAPIServerAccessProfile, ManagedClusterAutoUpgradeProfile, + ManagedClusterHTTPProxyConfig, ManagedClusterIdentity, ManagedClusterIdentityUserAssignedIdentitiesValue, ManagedClusterListResult, @@ -51,6 +52,7 @@ export { PowerState, PrivateEndpoint, PrivateEndpointConnection, + PrivateLinkResource, PrivateLinkServiceConnectionState, Resource, ResourceReference, diff --git a/sdk/containerservice/arm-containerservice/src/models/mappers.ts b/sdk/containerservice/arm-containerservice/src/models/mappers.ts index 7d38494880bb..d58d031b540b 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" + } } } } @@ -1078,6 +1102,12 @@ export const ManagedClusterWindowsProfile: msRest.CompositeMapper = { type: { name: "String" } + }, + enableCSIProxy: { + serializedName: "enableCSIProxy", + type: { + name: "Boolean" + } } } } @@ -1753,6 +1783,12 @@ export const ManagedClusterPodIdentityProfile: msRest.CompositeMapper = { name: "Boolean" } }, + allowNetworkPluginKubenet: { + serializedName: "allowNetworkPluginKubenet", + type: { + name: "Boolean" + } + }, userAssignedIdentities: { serializedName: "userAssignedIdentities", type: { @@ -2010,6 +2046,97 @@ export const ManagedClusterPropertiesIdentityProfileValue: msRest.CompositeMappe } }; +export const PrivateLinkResource: msRest.CompositeMapper = { + serializedName: "PrivateLinkResource", + type: { + name: "Composite", + className: "PrivateLinkResource", + modelProperties: { + id: { + serializedName: "id", + type: { + name: "String" + } + }, + name: { + serializedName: "name", + type: { + name: "String" + } + }, + type: { + serializedName: "type", + type: { + name: "String" + } + }, + groupId: { + serializedName: "groupId", + type: { + name: "String" + } + }, + requiredMembers: { + serializedName: "requiredMembers", + type: { + name: "Sequence", + element: { + type: { + name: "String" + } + } + } + }, + privateLinkServiceID: { + readOnly: true, + serializedName: "privateLinkServiceID", + type: { + name: "String" + } + } + } + } +}; + +export const ManagedClusterHTTPProxyConfig: msRest.CompositeMapper = { + serializedName: "ManagedClusterHTTPProxyConfig", + type: { + name: "Composite", + className: "ManagedClusterHTTPProxyConfig", + modelProperties: { + httpProxy: { + serializedName: "httpProxy", + type: { + name: "String" + } + }, + httpsProxy: { + serializedName: "httpsProxy", + type: { + name: "String" + } + }, + noProxy: { + serializedName: "noProxy", + type: { + name: "Sequence", + element: { + type: { + name: "String" + } + } + } + }, + trustedCa: { + serializedName: "trustedCa", + type: { + name: "String" + } + } + } + } +}; + export const ManagedClusterIdentityUserAssignedIdentitiesValue: msRest.CompositeMapper = { serializedName: "ManagedClusterIdentity_userAssignedIdentitiesValue", type: { @@ -2144,6 +2271,12 @@ export const ManagedCluster: msRest.CompositeMapper = { name: "String" } }, + fqdnSubdomain: { + serializedName: "properties.fqdnSubdomain", + type: { + name: "String" + } + }, fqdn: { readOnly: true, serializedName: "properties.fqdn", @@ -2158,6 +2291,13 @@ export const ManagedCluster: msRest.CompositeMapper = { name: "String" } }, + azurePortalFQDN: { + readOnly: true, + serializedName: "properties.azurePortalFQDN", + type: { + name: "String" + } + }, agentPoolProfiles: { serializedName: "properties.agentPoolProfiles", type: { @@ -2281,6 +2421,25 @@ export const ManagedCluster: msRest.CompositeMapper = { } } }, + privateLinkResources: { + serializedName: "properties.privateLinkResources", + type: { + name: "Sequence", + element: { + type: { + name: "Composite", + className: "PrivateLinkResource" + } + } + } + }, + httpProxyConfig: { + serializedName: "properties.httpProxyConfig", + type: { + name: "Composite", + className: "ManagedClusterHTTPProxyConfig" + } + }, identity: { serializedName: "identity", type: { @@ -2750,58 +2909,6 @@ export const PrivateEndpointConnectionListResult: msRest.CompositeMapper = { } }; -export const PrivateLinkResource: msRest.CompositeMapper = { - serializedName: "PrivateLinkResource", - type: { - name: "Composite", - className: "PrivateLinkResource", - modelProperties: { - id: { - serializedName: "id", - type: { - name: "String" - } - }, - name: { - serializedName: "name", - type: { - name: "String" - } - }, - type: { - serializedName: "type", - type: { - name: "String" - } - }, - groupId: { - serializedName: "groupId", - type: { - name: "String" - } - }, - requiredMembers: { - serializedName: "requiredMembers", - type: { - name: "Sequence", - element: { - type: { - name: "String" - } - } - } - }, - privateLinkServiceID: { - readOnly: true, - serializedName: "privateLinkServiceID", - type: { - name: "String" - } - } - } - } -}; - export const PrivateLinkResourcesListResult: msRest.CompositeMapper = { serializedName: "PrivateLinkResourcesListResult", type: { diff --git a/sdk/containerservice/arm-containerservice/src/models/privateEndpointConnectionsMappers.ts b/sdk/containerservice/arm-containerservice/src/models/privateEndpointConnectionsMappers.ts index b507c48ec66e..ac982ea08620 100644 --- a/sdk/containerservice/arm-containerservice/src/models/privateEndpointConnectionsMappers.ts +++ b/sdk/containerservice/arm-containerservice/src/models/privateEndpointConnectionsMappers.ts @@ -27,6 +27,7 @@ export { ManagedClusterAgentPoolProfileProperties, ManagedClusterAPIServerAccessProfile, ManagedClusterAutoUpgradeProfile, + ManagedClusterHTTPProxyConfig, ManagedClusterIdentity, ManagedClusterIdentityUserAssignedIdentitiesValue, ManagedClusterLoadBalancerProfile, @@ -46,6 +47,7 @@ export { PrivateEndpoint, PrivateEndpointConnection, PrivateEndpointConnectionListResult, + PrivateLinkResource, PrivateLinkServiceConnectionState, Resource, ResourceReference,