Skip to content

Commit 6a1befd

Browse files
author
SDKAuto
committed
CodeGen from PR 14147 in Azure/azure-rest-api-specs
Merge 51426a36b28aa9e384b52e3da46d1cdcb0e7ff4a into 921c96fa572ea1bd28cd6cc471987553c766b172
1 parent cc05f39 commit 6a1befd

File tree

5 files changed

+391
-90
lines changed

5 files changed

+391
-90
lines changed

sdk/containerservice/arm-containerservice/src/containerServiceClientContext.ts

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,25 +37,25 @@ export class ContainerServiceClientContext extends msRestAzure.AzureServiceClien
3737
if (!options) {
3838
options = {};
3939
}
40-
if (!options.userAgent) {
40+
if(!options.userAgent) {
4141
const defaultUserAgent = msRestAzure.getDefaultUserAgentValue();
4242
options.userAgent = `${packageName}/${packageVersion} ${defaultUserAgent}`;
4343
}
4444

4545
super(credentials, options);
4646

47-
this.apiVersion = '2021-03-01';
47+
this.apiVersion = '2021-05-01';
4848
this.acceptLanguage = 'en-US';
4949
this.longRunningOperationRetryTimeout = 30;
5050
this.baseUri = options.baseUri || this.baseUri || "https://management.azure.com";
5151
this.requestContentType = "application/json; charset=utf-8";
5252
this.credentials = credentials;
5353
this.subscriptionId = subscriptionId;
5454

55-
if (options.acceptLanguage !== null && options.acceptLanguage !== undefined) {
55+
if(options.acceptLanguage !== null && options.acceptLanguage !== undefined) {
5656
this.acceptLanguage = options.acceptLanguage;
5757
}
58-
if (options.longRunningOperationRetryTimeout !== null && options.longRunningOperationRetryTimeout !== undefined) {
58+
if(options.longRunningOperationRetryTimeout !== null && options.longRunningOperationRetryTimeout !== undefined) {
5959
this.longRunningOperationRetryTimeout = options.longRunningOperationRetryTimeout;
6060
}
6161
}

sdk/containerservice/arm-containerservice/src/models/index.ts

Lines changed: 130 additions & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -422,51 +422,14 @@ export interface LinuxOSConfig {
422422
export interface ManagedClusterAgentPoolProfileProperties {
423423
/**
424424
* Number of agents (VMs) to host docker containers. Allowed values must be in the range of 0 to
425-
* 100 (inclusive) for user pools and in the range of 1 to 100 (inclusive) for system pools. The
426-
* default value is 1.
425+
* 1000 (inclusive) for user pools and in the range of 1 to 1000 (inclusive) for system pools.
426+
* The default value is 1.
427427
*/
428428
count?: number;
429429
/**
430-
* Size of agent VMs. Possible values include: 'Standard_A1', 'Standard_A10', 'Standard_A11',
431-
* 'Standard_A1_v2', 'Standard_A2', 'Standard_A2_v2', 'Standard_A2m_v2', 'Standard_A3',
432-
* 'Standard_A4', 'Standard_A4_v2', 'Standard_A4m_v2', 'Standard_A5', 'Standard_A6',
433-
* 'Standard_A7', 'Standard_A8', 'Standard_A8_v2', 'Standard_A8m_v2', 'Standard_A9',
434-
* 'Standard_B2ms', 'Standard_B2s', 'Standard_B4ms', 'Standard_B8ms', 'Standard_D1',
435-
* 'Standard_D11', 'Standard_D11_v2', 'Standard_D11_v2_Promo', 'Standard_D12', 'Standard_D12_v2',
436-
* 'Standard_D12_v2_Promo', 'Standard_D13', 'Standard_D13_v2', 'Standard_D13_v2_Promo',
437-
* 'Standard_D14', 'Standard_D14_v2', 'Standard_D14_v2_Promo', 'Standard_D15_v2',
438-
* 'Standard_D16_v3', 'Standard_D16s_v3', 'Standard_D1_v2', 'Standard_D2', 'Standard_D2_v2',
439-
* 'Standard_D2_v2_Promo', 'Standard_D2_v3', 'Standard_D2s_v3', 'Standard_D3', 'Standard_D32_v3',
440-
* 'Standard_D32s_v3', 'Standard_D3_v2', 'Standard_D3_v2_Promo', 'Standard_D4', 'Standard_D4_v2',
441-
* 'Standard_D4_v2_Promo', 'Standard_D4_v3', 'Standard_D4s_v3', 'Standard_D5_v2',
442-
* 'Standard_D5_v2_Promo', 'Standard_D64_v3', 'Standard_D64s_v3', 'Standard_D8_v3',
443-
* 'Standard_D8s_v3', 'Standard_DS1', 'Standard_DS11', 'Standard_DS11_v2',
444-
* 'Standard_DS11_v2_Promo', 'Standard_DS12', 'Standard_DS12_v2', 'Standard_DS12_v2_Promo',
445-
* 'Standard_DS13', 'Standard_DS13-2_v2', 'Standard_DS13-4_v2', 'Standard_DS13_v2',
446-
* 'Standard_DS13_v2_Promo', 'Standard_DS14', 'Standard_DS14-4_v2', 'Standard_DS14-8_v2',
447-
* 'Standard_DS14_v2', 'Standard_DS14_v2_Promo', 'Standard_DS15_v2', 'Standard_DS1_v2',
448-
* 'Standard_DS2', 'Standard_DS2_v2', 'Standard_DS2_v2_Promo', 'Standard_DS3', 'Standard_DS3_v2',
449-
* 'Standard_DS3_v2_Promo', 'Standard_DS4', 'Standard_DS4_v2', 'Standard_DS4_v2_Promo',
450-
* 'Standard_DS5_v2', 'Standard_DS5_v2_Promo', 'Standard_E16_v3', 'Standard_E16s_v3',
451-
* 'Standard_E2_v3', 'Standard_E2s_v3', 'Standard_E32-16s_v3', 'Standard_E32-8s_v3',
452-
* 'Standard_E32_v3', 'Standard_E32s_v3', 'Standard_E4_v3', 'Standard_E4s_v3',
453-
* 'Standard_E64-16s_v3', 'Standard_E64-32s_v3', 'Standard_E64_v3', 'Standard_E64s_v3',
454-
* 'Standard_E8_v3', 'Standard_E8s_v3', 'Standard_F1', 'Standard_F16', 'Standard_F16s',
455-
* 'Standard_F16s_v2', 'Standard_F1s', 'Standard_F2', 'Standard_F2s', 'Standard_F2s_v2',
456-
* 'Standard_F32s_v2', 'Standard_F4', 'Standard_F4s', 'Standard_F4s_v2', 'Standard_F64s_v2',
457-
* 'Standard_F72s_v2', 'Standard_F8', 'Standard_F8s', 'Standard_F8s_v2', 'Standard_G1',
458-
* 'Standard_G2', 'Standard_G3', 'Standard_G4', 'Standard_G5', 'Standard_GS1', 'Standard_GS2',
459-
* 'Standard_GS3', 'Standard_GS4', 'Standard_GS4-4', 'Standard_GS4-8', 'Standard_GS5',
460-
* 'Standard_GS5-16', 'Standard_GS5-8', 'Standard_H16', 'Standard_H16m', 'Standard_H16mr',
461-
* 'Standard_H16r', 'Standard_H8', 'Standard_H8m', 'Standard_L16s', 'Standard_L32s',
462-
* 'Standard_L4s', 'Standard_L8s', 'Standard_M128-32ms', 'Standard_M128-64ms', 'Standard_M128ms',
463-
* 'Standard_M128s', 'Standard_M64-16ms', 'Standard_M64-32ms', 'Standard_M64ms', 'Standard_M64s',
464-
* 'Standard_NC12', 'Standard_NC12s_v2', 'Standard_NC12s_v3', 'Standard_NC24', 'Standard_NC24r',
465-
* 'Standard_NC24rs_v2', 'Standard_NC24rs_v3', 'Standard_NC24s_v2', 'Standard_NC24s_v3',
466-
* 'Standard_NC6', 'Standard_NC6s_v2', 'Standard_NC6s_v3', 'Standard_ND12s', 'Standard_ND24rs',
467-
* 'Standard_ND24s', 'Standard_ND6s', 'Standard_NV12', 'Standard_NV24', 'Standard_NV6'
430+
* Size of agent VMs.
468431
*/
469-
vmSize?: ContainerServiceVMSizeTypes;
432+
vmSize?: string;
470433
/**
471434
* OS Disk Size in GB to be used to specify the disk size for every machine in this master/agent
472435
* pool. If you specify 0, it will apply the default osDisk size according to the vmSize
@@ -475,8 +438,9 @@ export interface ManagedClusterAgentPoolProfileProperties {
475438
osDiskSizeGB?: number;
476439
/**
477440
* OS disk type to be used for machines in a given agent pool. Allowed values are 'Ephemeral' and
478-
* 'Managed'. Defaults to 'Managed'. May not be changed after creation. Possible values include:
479-
* 'Managed', 'Ephemeral'
441+
* 'Managed'. If unspecified, defaults to 'Ephemeral' when the VM supports ephemeral OS and has a
442+
* cache disk larger than the requested OSDiskSizeGB. Otherwise, defaults to 'Managed'. May not
443+
* be changed after creation. Possible values include: 'Managed', 'Ephemeral'
480444
*/
481445
osDiskType?: OSDiskType;
482446
/**
@@ -609,6 +573,10 @@ export interface ManagedClusterAgentPoolProfileProperties {
609573
* Whether to enable EncryptionAtHost
610574
*/
611575
enableEncryptionAtHost?: boolean;
576+
/**
577+
* Whether to enable UltraSSD
578+
*/
579+
enableUltraSSD?: boolean;
612580
/**
613581
* Whether to use FIPS enabled OS
614582
*/
@@ -637,51 +605,14 @@ export interface ManagedClusterAgentPoolProfile extends ManagedClusterAgentPoolP
637605
export interface AgentPool extends SubResource {
638606
/**
639607
* Number of agents (VMs) to host docker containers. Allowed values must be in the range of 0 to
640-
* 100 (inclusive) for user pools and in the range of 1 to 100 (inclusive) for system pools. The
641-
* default value is 1.
608+
* 1000 (inclusive) for user pools and in the range of 1 to 1000 (inclusive) for system pools.
609+
* The default value is 1.
642610
*/
643611
count?: number;
644612
/**
645-
* Size of agent VMs. Possible values include: 'Standard_A1', 'Standard_A10', 'Standard_A11',
646-
* 'Standard_A1_v2', 'Standard_A2', 'Standard_A2_v2', 'Standard_A2m_v2', 'Standard_A3',
647-
* 'Standard_A4', 'Standard_A4_v2', 'Standard_A4m_v2', 'Standard_A5', 'Standard_A6',
648-
* 'Standard_A7', 'Standard_A8', 'Standard_A8_v2', 'Standard_A8m_v2', 'Standard_A9',
649-
* 'Standard_B2ms', 'Standard_B2s', 'Standard_B4ms', 'Standard_B8ms', 'Standard_D1',
650-
* 'Standard_D11', 'Standard_D11_v2', 'Standard_D11_v2_Promo', 'Standard_D12', 'Standard_D12_v2',
651-
* 'Standard_D12_v2_Promo', 'Standard_D13', 'Standard_D13_v2', 'Standard_D13_v2_Promo',
652-
* 'Standard_D14', 'Standard_D14_v2', 'Standard_D14_v2_Promo', 'Standard_D15_v2',
653-
* 'Standard_D16_v3', 'Standard_D16s_v3', 'Standard_D1_v2', 'Standard_D2', 'Standard_D2_v2',
654-
* 'Standard_D2_v2_Promo', 'Standard_D2_v3', 'Standard_D2s_v3', 'Standard_D3', 'Standard_D32_v3',
655-
* 'Standard_D32s_v3', 'Standard_D3_v2', 'Standard_D3_v2_Promo', 'Standard_D4', 'Standard_D4_v2',
656-
* 'Standard_D4_v2_Promo', 'Standard_D4_v3', 'Standard_D4s_v3', 'Standard_D5_v2',
657-
* 'Standard_D5_v2_Promo', 'Standard_D64_v3', 'Standard_D64s_v3', 'Standard_D8_v3',
658-
* 'Standard_D8s_v3', 'Standard_DS1', 'Standard_DS11', 'Standard_DS11_v2',
659-
* 'Standard_DS11_v2_Promo', 'Standard_DS12', 'Standard_DS12_v2', 'Standard_DS12_v2_Promo',
660-
* 'Standard_DS13', 'Standard_DS13-2_v2', 'Standard_DS13-4_v2', 'Standard_DS13_v2',
661-
* 'Standard_DS13_v2_Promo', 'Standard_DS14', 'Standard_DS14-4_v2', 'Standard_DS14-8_v2',
662-
* 'Standard_DS14_v2', 'Standard_DS14_v2_Promo', 'Standard_DS15_v2', 'Standard_DS1_v2',
663-
* 'Standard_DS2', 'Standard_DS2_v2', 'Standard_DS2_v2_Promo', 'Standard_DS3', 'Standard_DS3_v2',
664-
* 'Standard_DS3_v2_Promo', 'Standard_DS4', 'Standard_DS4_v2', 'Standard_DS4_v2_Promo',
665-
* 'Standard_DS5_v2', 'Standard_DS5_v2_Promo', 'Standard_E16_v3', 'Standard_E16s_v3',
666-
* 'Standard_E2_v3', 'Standard_E2s_v3', 'Standard_E32-16s_v3', 'Standard_E32-8s_v3',
667-
* 'Standard_E32_v3', 'Standard_E32s_v3', 'Standard_E4_v3', 'Standard_E4s_v3',
668-
* 'Standard_E64-16s_v3', 'Standard_E64-32s_v3', 'Standard_E64_v3', 'Standard_E64s_v3',
669-
* 'Standard_E8_v3', 'Standard_E8s_v3', 'Standard_F1', 'Standard_F16', 'Standard_F16s',
670-
* 'Standard_F16s_v2', 'Standard_F1s', 'Standard_F2', 'Standard_F2s', 'Standard_F2s_v2',
671-
* 'Standard_F32s_v2', 'Standard_F4', 'Standard_F4s', 'Standard_F4s_v2', 'Standard_F64s_v2',
672-
* 'Standard_F72s_v2', 'Standard_F8', 'Standard_F8s', 'Standard_F8s_v2', 'Standard_G1',
673-
* 'Standard_G2', 'Standard_G3', 'Standard_G4', 'Standard_G5', 'Standard_GS1', 'Standard_GS2',
674-
* 'Standard_GS3', 'Standard_GS4', 'Standard_GS4-4', 'Standard_GS4-8', 'Standard_GS5',
675-
* 'Standard_GS5-16', 'Standard_GS5-8', 'Standard_H16', 'Standard_H16m', 'Standard_H16mr',
676-
* 'Standard_H16r', 'Standard_H8', 'Standard_H8m', 'Standard_L16s', 'Standard_L32s',
677-
* 'Standard_L4s', 'Standard_L8s', 'Standard_M128-32ms', 'Standard_M128-64ms', 'Standard_M128ms',
678-
* 'Standard_M128s', 'Standard_M64-16ms', 'Standard_M64-32ms', 'Standard_M64ms', 'Standard_M64s',
679-
* 'Standard_NC12', 'Standard_NC12s_v2', 'Standard_NC12s_v3', 'Standard_NC24', 'Standard_NC24r',
680-
* 'Standard_NC24rs_v2', 'Standard_NC24rs_v3', 'Standard_NC24s_v2', 'Standard_NC24s_v3',
681-
* 'Standard_NC6', 'Standard_NC6s_v2', 'Standard_NC6s_v3', 'Standard_ND12s', 'Standard_ND24rs',
682-
* 'Standard_ND24s', 'Standard_ND6s', 'Standard_NV12', 'Standard_NV24', 'Standard_NV6'
613+
* Size of agent VMs.
683614
*/
684-
vmSize?: ContainerServiceVMSizeTypes;
615+
vmSize?: string;
685616
/**
686617
* OS Disk Size in GB to be used to specify the disk size for every machine in this master/agent
687618
* pool. If you specify 0, it will apply the default osDisk size according to the vmSize
@@ -690,8 +621,9 @@ export interface AgentPool extends SubResource {
690621
osDiskSizeGB?: number;
691622
/**
692623
* OS disk type to be used for machines in a given agent pool. Allowed values are 'Ephemeral' and
693-
* 'Managed'. Defaults to 'Managed'. May not be changed after creation. Possible values include:
694-
* 'Managed', 'Ephemeral'
624+
* 'Managed'. If unspecified, defaults to 'Ephemeral' when the VM supports ephemeral OS and has a
625+
* cache disk larger than the requested OSDiskSizeGB. Otherwise, defaults to 'Managed'. May not
626+
* be changed after creation. Possible values include: 'Managed', 'Ephemeral'
695627
*/
696628
osDiskType?: OSDiskType;
697629
/**
@@ -824,6 +756,10 @@ export interface AgentPool extends SubResource {
824756
* Whether to enable EncryptionAtHost
825757
*/
826758
enableEncryptionAtHost?: boolean;
759+
/**
760+
* Whether to enable UltraSSD
761+
*/
762+
enableUltraSSD?: boolean;
827763
/**
828764
* Whether to use FIPS enabled OS
829765
*/
@@ -1410,6 +1346,10 @@ export interface ManagedClusterAPIServerAccessProfile {
14101346
* Private dns zone mode for private cluster.
14111347
*/
14121348
privateDNSZone?: string;
1349+
/**
1350+
* Whether to create additional public FQDN for private cluster or not.
1351+
*/
1352+
enablePrivateClusterPublicFQDN?: boolean;
14131353
}
14141354

14151355
/**
@@ -2003,6 +1943,57 @@ export interface OSOptionProfile {
20031943
osOptionPropertyList: OSOptionProperty[];
20041944
}
20051945

1946+
/**
1947+
* connect information from the AKS agent nodes to a single endpoint.
1948+
*/
1949+
export interface EndpointDetail {
1950+
/**
1951+
* An IP Address that Domain Name currently resolves to.
1952+
*/
1953+
ipAddress?: string;
1954+
/**
1955+
* The port an endpoint is connected to.
1956+
*/
1957+
port?: number;
1958+
/**
1959+
* The protocol used for connection
1960+
*/
1961+
protocol?: string;
1962+
/**
1963+
* Description of the detail
1964+
*/
1965+
description?: string;
1966+
}
1967+
1968+
/**
1969+
* A domain name that AKS agent nodes are reaching at.
1970+
*/
1971+
export interface EndpointDependency {
1972+
/**
1973+
* The domain name of the dependency.
1974+
*/
1975+
domainName?: string;
1976+
/**
1977+
* The Ports and Protocols used when connecting to domainName.
1978+
*/
1979+
endpointDetails?: EndpointDetail[];
1980+
}
1981+
1982+
/**
1983+
* Egress endpoints which AKS agent nodes connect to for common purpose.
1984+
*/
1985+
export interface OutboundEnvironmentEndpoint {
1986+
/**
1987+
* The category of endpoints accessed by the AKS agent node, e.g. azure-resource-management,
1988+
* apiserver, etc.
1989+
*/
1990+
category?: string;
1991+
/**
1992+
* The endpoints that AKS agent nodes connect to
1993+
*/
1994+
endpoints?: EndpointDependency[];
1995+
}
1996+
20061997
/**
20071998
* Optional Parameters.
20081999
*/
@@ -2041,6 +2032,19 @@ export interface ManagedClusterListResult extends Array<ManagedCluster> {
20412032
readonly nextLink?: string;
20422033
}
20432034

2035+
/**
2036+
* @interface
2037+
* Collection of OutboundEnvironmentEndpoint
2038+
* @extends Array<OutboundEnvironmentEndpoint>
2039+
*/
2040+
export interface OutboundEnvironmentEndpointCollection extends Array<OutboundEnvironmentEndpoint> {
2041+
/**
2042+
* Link to next page of resources.
2043+
* **NOTE: This property will not be serialized. It can only be populated by the server.**
2044+
*/
2045+
readonly nextLink?: string;
2046+
}
2047+
20442048
/**
20452049
* @interface
20462050
* The response from the List maintenance configurations operation.
@@ -2617,6 +2621,26 @@ export type ManagedClustersGetCommandResultResponse = RunCommandResult & {
26172621
};
26182622
};
26192623

2624+
/**
2625+
* Contains response data for the listOutboundNetworkDependenciesEndpoints operation.
2626+
*/
2627+
export type ManagedClustersListOutboundNetworkDependenciesEndpointsResponse = OutboundEnvironmentEndpointCollection & {
2628+
/**
2629+
* The underlying HTTP response.
2630+
*/
2631+
_response: msRest.HttpResponse & {
2632+
/**
2633+
* The response body as text (string format)
2634+
*/
2635+
bodyAsText: string;
2636+
2637+
/**
2638+
* The response body as parsed JSON or XML
2639+
*/
2640+
parsedBody: OutboundEnvironmentEndpointCollection;
2641+
};
2642+
};
2643+
26202644
/**
26212645
* Contains response data for the beginCreateOrUpdate operation.
26222646
*/
@@ -2717,6 +2741,26 @@ export type ManagedClustersListByResourceGroupNextResponse = ManagedClusterListR
27172741
};
27182742
};
27192743

2744+
/**
2745+
* Contains response data for the listOutboundNetworkDependenciesEndpointsNext operation.
2746+
*/
2747+
export type ManagedClustersListOutboundNetworkDependenciesEndpointsNextResponse = OutboundEnvironmentEndpointCollection & {
2748+
/**
2749+
* The underlying HTTP response.
2750+
*/
2751+
_response: msRest.HttpResponse & {
2752+
/**
2753+
* The response body as text (string format)
2754+
*/
2755+
bodyAsText: string;
2756+
2757+
/**
2758+
* The response body as parsed JSON or XML
2759+
*/
2760+
parsedBody: OutboundEnvironmentEndpointCollection;
2761+
};
2762+
};
2763+
27202764
/**
27212765
* Contains response data for the listByManagedCluster operation.
27222766
*/

sdk/containerservice/arm-containerservice/src/models/managedClustersMappers.ts

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@ export {
1717
ContainerServiceSshPublicKey,
1818
CredentialResult,
1919
CredentialResults,
20+
EndpointDependency,
21+
EndpointDetail,
2022
ExtendedLocation,
2123
KubeletConfig,
2224
LinuxOSConfig,
@@ -52,6 +54,8 @@ export {
5254
ManagedClusterWindowsProfile,
5355
OSOptionProfile,
5456
OSOptionProperty,
57+
OutboundEnvironmentEndpoint,
58+
OutboundEnvironmentEndpointCollection,
5559
PowerState,
5660
PrivateEndpoint,
5761
PrivateEndpointConnection,

0 commit comments

Comments
 (0)