Skip to content

Commit

Permalink
CodeGen from PR 14147 in Azure/azure-rest-api-specs
Browse files Browse the repository at this point in the history 
Merge 51426a36b28aa9e384b52e3da46d1cdcb0e7ff4a into 921c96fa572ea1bd28cd6cc471987553c766b172
  • Loading branch information
SDKAuto committed Jun 2, 2021
1 parent cc05f39 commit 6a1befd
Show file tree
Hide file tree
Showing 5 changed files with 391 additions and 90 deletions.
8 changes: 4 additions & 4 deletions sdk/containerservice/arm-containerservice/src/containerServiceClientContext.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -37,25 +37,25 @@ export class ContainerServiceClientContext extends msRestAzure.AzureServiceClien
if (!options) {
options = {};
}
if (!options.userAgent) {
if(!options.userAgent) {
const defaultUserAgent = msRestAzure.getDefaultUserAgentValue();
options.userAgent = `${packageName}/${packageVersion} ${defaultUserAgent}`;
}

super(credentials, options);

this.apiVersion = '2021-03-01';
this.apiVersion = '2021-05-01';
this.acceptLanguage = 'en-US';
this.longRunningOperationRetryTimeout = 30;
this.baseUri = options.baseUri || this.baseUri || "https://management.azure.com";
this.requestContentType = "application/json; charset=utf-8";
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;
}
}
Expand Down
216 changes: 130 additions & 86 deletions sdk/containerservice/arm-containerservice/src/models/index.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -422,51 +422,14 @@ export interface LinuxOSConfig {
export interface ManagedClusterAgentPoolProfileProperties {
/**
* Number of agents (VMs) to host docker containers. Allowed values must be in the range of 0 to
* 100 (inclusive) for user pools and in the range of 1 to 100 (inclusive) for system pools. The
* default value is 1.
* 1000 (inclusive) for user pools and in the range of 1 to 1000 (inclusive) for system pools.
* The default value is 1.
*/
count?: number;
/**
* Size of agent VMs. Possible values include: 'Standard_A1', 'Standard_A10', 'Standard_A11',
* 'Standard_A1_v2', 'Standard_A2', 'Standard_A2_v2', 'Standard_A2m_v2', 'Standard_A3',
* 'Standard_A4', 'Standard_A4_v2', 'Standard_A4m_v2', 'Standard_A5', 'Standard_A6',
* 'Standard_A7', 'Standard_A8', 'Standard_A8_v2', 'Standard_A8m_v2', 'Standard_A9',
* 'Standard_B2ms', 'Standard_B2s', 'Standard_B4ms', 'Standard_B8ms', 'Standard_D1',
* 'Standard_D11', 'Standard_D11_v2', 'Standard_D11_v2_Promo', 'Standard_D12', 'Standard_D12_v2',
* 'Standard_D12_v2_Promo', 'Standard_D13', 'Standard_D13_v2', 'Standard_D13_v2_Promo',
* 'Standard_D14', 'Standard_D14_v2', 'Standard_D14_v2_Promo', 'Standard_D15_v2',
* 'Standard_D16_v3', 'Standard_D16s_v3', 'Standard_D1_v2', 'Standard_D2', 'Standard_D2_v2',
* 'Standard_D2_v2_Promo', 'Standard_D2_v3', 'Standard_D2s_v3', 'Standard_D3', 'Standard_D32_v3',
* 'Standard_D32s_v3', 'Standard_D3_v2', 'Standard_D3_v2_Promo', 'Standard_D4', 'Standard_D4_v2',
* 'Standard_D4_v2_Promo', 'Standard_D4_v3', 'Standard_D4s_v3', 'Standard_D5_v2',
* 'Standard_D5_v2_Promo', 'Standard_D64_v3', 'Standard_D64s_v3', 'Standard_D8_v3',
* 'Standard_D8s_v3', 'Standard_DS1', 'Standard_DS11', 'Standard_DS11_v2',
* 'Standard_DS11_v2_Promo', 'Standard_DS12', 'Standard_DS12_v2', 'Standard_DS12_v2_Promo',
* 'Standard_DS13', 'Standard_DS13-2_v2', 'Standard_DS13-4_v2', 'Standard_DS13_v2',
* 'Standard_DS13_v2_Promo', 'Standard_DS14', 'Standard_DS14-4_v2', 'Standard_DS14-8_v2',
* 'Standard_DS14_v2', 'Standard_DS14_v2_Promo', 'Standard_DS15_v2', 'Standard_DS1_v2',
* 'Standard_DS2', 'Standard_DS2_v2', 'Standard_DS2_v2_Promo', 'Standard_DS3', 'Standard_DS3_v2',
* 'Standard_DS3_v2_Promo', 'Standard_DS4', 'Standard_DS4_v2', 'Standard_DS4_v2_Promo',
* 'Standard_DS5_v2', 'Standard_DS5_v2_Promo', 'Standard_E16_v3', 'Standard_E16s_v3',
* 'Standard_E2_v3', 'Standard_E2s_v3', 'Standard_E32-16s_v3', 'Standard_E32-8s_v3',
* 'Standard_E32_v3', 'Standard_E32s_v3', 'Standard_E4_v3', 'Standard_E4s_v3',
* 'Standard_E64-16s_v3', 'Standard_E64-32s_v3', 'Standard_E64_v3', 'Standard_E64s_v3',
* 'Standard_E8_v3', 'Standard_E8s_v3', 'Standard_F1', 'Standard_F16', 'Standard_F16s',
* 'Standard_F16s_v2', 'Standard_F1s', 'Standard_F2', 'Standard_F2s', 'Standard_F2s_v2',
* 'Standard_F32s_v2', 'Standard_F4', 'Standard_F4s', 'Standard_F4s_v2', 'Standard_F64s_v2',
* 'Standard_F72s_v2', 'Standard_F8', 'Standard_F8s', 'Standard_F8s_v2', 'Standard_G1',
* 'Standard_G2', 'Standard_G3', 'Standard_G4', 'Standard_G5', 'Standard_GS1', 'Standard_GS2',
* 'Standard_GS3', 'Standard_GS4', 'Standard_GS4-4', 'Standard_GS4-8', 'Standard_GS5',
* 'Standard_GS5-16', 'Standard_GS5-8', 'Standard_H16', 'Standard_H16m', 'Standard_H16mr',
* 'Standard_H16r', 'Standard_H8', 'Standard_H8m', 'Standard_L16s', 'Standard_L32s',
* 'Standard_L4s', 'Standard_L8s', 'Standard_M128-32ms', 'Standard_M128-64ms', 'Standard_M128ms',
* 'Standard_M128s', 'Standard_M64-16ms', 'Standard_M64-32ms', 'Standard_M64ms', 'Standard_M64s',
* 'Standard_NC12', 'Standard_NC12s_v2', 'Standard_NC12s_v3', 'Standard_NC24', 'Standard_NC24r',
* 'Standard_NC24rs_v2', 'Standard_NC24rs_v3', 'Standard_NC24s_v2', 'Standard_NC24s_v3',
* 'Standard_NC6', 'Standard_NC6s_v2', 'Standard_NC6s_v3', 'Standard_ND12s', 'Standard_ND24rs',
* 'Standard_ND24s', 'Standard_ND6s', 'Standard_NV12', 'Standard_NV24', 'Standard_NV6'
* Size of agent VMs.
*/
vmSize?: ContainerServiceVMSizeTypes;
vmSize?: string;
/**
* OS Disk Size in GB to be used to specify the disk size for every machine in this master/agent
* pool. If you specify 0, it will apply the default osDisk size according to the vmSize
Expand All @@ -475,8 +438,9 @@ export interface ManagedClusterAgentPoolProfileProperties {
osDiskSizeGB?: number;
/**
* OS disk type to be used for machines in a given agent pool. Allowed values are 'Ephemeral' and
* 'Managed'. Defaults to 'Managed'. May not be changed after creation. Possible values include:
* 'Managed', 'Ephemeral'
* 'Managed'. If unspecified, defaults to 'Ephemeral' when the VM supports ephemeral OS and has a
* cache disk larger than the requested OSDiskSizeGB. Otherwise, defaults to 'Managed'. May not
* be changed after creation. Possible values include: 'Managed', 'Ephemeral'
*/
osDiskType?: OSDiskType;
/**
Expand Down Expand Up @@ -609,6 +573,10 @@ export interface ManagedClusterAgentPoolProfileProperties {
* Whether to enable EncryptionAtHost
*/
enableEncryptionAtHost?: boolean;
/**
* Whether to enable UltraSSD
*/
enableUltraSSD?: boolean;
/**
* Whether to use FIPS enabled OS
*/
Expand Down Expand Up @@ -637,51 +605,14 @@ 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 0 to
* 100 (inclusive) for user pools and in the range of 1 to 100 (inclusive) for system pools. The
* default value is 1.
* 1000 (inclusive) for user pools and in the range of 1 to 1000 (inclusive) for system pools.
* The default value is 1.
*/
count?: number;
/**
* Size of agent VMs. Possible values include: 'Standard_A1', 'Standard_A10', 'Standard_A11',
* 'Standard_A1_v2', 'Standard_A2', 'Standard_A2_v2', 'Standard_A2m_v2', 'Standard_A3',
* 'Standard_A4', 'Standard_A4_v2', 'Standard_A4m_v2', 'Standard_A5', 'Standard_A6',
* 'Standard_A7', 'Standard_A8', 'Standard_A8_v2', 'Standard_A8m_v2', 'Standard_A9',
* 'Standard_B2ms', 'Standard_B2s', 'Standard_B4ms', 'Standard_B8ms', 'Standard_D1',
* 'Standard_D11', 'Standard_D11_v2', 'Standard_D11_v2_Promo', 'Standard_D12', 'Standard_D12_v2',
* 'Standard_D12_v2_Promo', 'Standard_D13', 'Standard_D13_v2', 'Standard_D13_v2_Promo',
* 'Standard_D14', 'Standard_D14_v2', 'Standard_D14_v2_Promo', 'Standard_D15_v2',
* 'Standard_D16_v3', 'Standard_D16s_v3', 'Standard_D1_v2', 'Standard_D2', 'Standard_D2_v2',
* 'Standard_D2_v2_Promo', 'Standard_D2_v3', 'Standard_D2s_v3', 'Standard_D3', 'Standard_D32_v3',
* 'Standard_D32s_v3', 'Standard_D3_v2', 'Standard_D3_v2_Promo', 'Standard_D4', 'Standard_D4_v2',
* 'Standard_D4_v2_Promo', 'Standard_D4_v3', 'Standard_D4s_v3', 'Standard_D5_v2',
* 'Standard_D5_v2_Promo', 'Standard_D64_v3', 'Standard_D64s_v3', 'Standard_D8_v3',
* 'Standard_D8s_v3', 'Standard_DS1', 'Standard_DS11', 'Standard_DS11_v2',
* 'Standard_DS11_v2_Promo', 'Standard_DS12', 'Standard_DS12_v2', 'Standard_DS12_v2_Promo',
* 'Standard_DS13', 'Standard_DS13-2_v2', 'Standard_DS13-4_v2', 'Standard_DS13_v2',
* 'Standard_DS13_v2_Promo', 'Standard_DS14', 'Standard_DS14-4_v2', 'Standard_DS14-8_v2',
* 'Standard_DS14_v2', 'Standard_DS14_v2_Promo', 'Standard_DS15_v2', 'Standard_DS1_v2',
* 'Standard_DS2', 'Standard_DS2_v2', 'Standard_DS2_v2_Promo', 'Standard_DS3', 'Standard_DS3_v2',
* 'Standard_DS3_v2_Promo', 'Standard_DS4', 'Standard_DS4_v2', 'Standard_DS4_v2_Promo',
* 'Standard_DS5_v2', 'Standard_DS5_v2_Promo', 'Standard_E16_v3', 'Standard_E16s_v3',
* 'Standard_E2_v3', 'Standard_E2s_v3', 'Standard_E32-16s_v3', 'Standard_E32-8s_v3',
* 'Standard_E32_v3', 'Standard_E32s_v3', 'Standard_E4_v3', 'Standard_E4s_v3',
* 'Standard_E64-16s_v3', 'Standard_E64-32s_v3', 'Standard_E64_v3', 'Standard_E64s_v3',
* 'Standard_E8_v3', 'Standard_E8s_v3', 'Standard_F1', 'Standard_F16', 'Standard_F16s',
* 'Standard_F16s_v2', 'Standard_F1s', 'Standard_F2', 'Standard_F2s', 'Standard_F2s_v2',
* 'Standard_F32s_v2', 'Standard_F4', 'Standard_F4s', 'Standard_F4s_v2', 'Standard_F64s_v2',
* 'Standard_F72s_v2', 'Standard_F8', 'Standard_F8s', 'Standard_F8s_v2', 'Standard_G1',
* 'Standard_G2', 'Standard_G3', 'Standard_G4', 'Standard_G5', 'Standard_GS1', 'Standard_GS2',
* 'Standard_GS3', 'Standard_GS4', 'Standard_GS4-4', 'Standard_GS4-8', 'Standard_GS5',
* 'Standard_GS5-16', 'Standard_GS5-8', 'Standard_H16', 'Standard_H16m', 'Standard_H16mr',
* 'Standard_H16r', 'Standard_H8', 'Standard_H8m', 'Standard_L16s', 'Standard_L32s',
* 'Standard_L4s', 'Standard_L8s', 'Standard_M128-32ms', 'Standard_M128-64ms', 'Standard_M128ms',
* 'Standard_M128s', 'Standard_M64-16ms', 'Standard_M64-32ms', 'Standard_M64ms', 'Standard_M64s',
* 'Standard_NC12', 'Standard_NC12s_v2', 'Standard_NC12s_v3', 'Standard_NC24', 'Standard_NC24r',
* 'Standard_NC24rs_v2', 'Standard_NC24rs_v3', 'Standard_NC24s_v2', 'Standard_NC24s_v3',
* 'Standard_NC6', 'Standard_NC6s_v2', 'Standard_NC6s_v3', 'Standard_ND12s', 'Standard_ND24rs',
* 'Standard_ND24s', 'Standard_ND6s', 'Standard_NV12', 'Standard_NV24', 'Standard_NV6'
* Size of agent VMs.
*/
vmSize?: ContainerServiceVMSizeTypes;
vmSize?: string;
/**
* OS Disk Size in GB to be used to specify the disk size for every machine in this master/agent
* pool. If you specify 0, it will apply the default osDisk size according to the vmSize
Expand All @@ -690,8 +621,9 @@ export interface AgentPool extends SubResource {
osDiskSizeGB?: number;
/**
* OS disk type to be used for machines in a given agent pool. Allowed values are 'Ephemeral' and
* 'Managed'. Defaults to 'Managed'. May not be changed after creation. Possible values include:
* 'Managed', 'Ephemeral'
* 'Managed'. If unspecified, defaults to 'Ephemeral' when the VM supports ephemeral OS and has a
* cache disk larger than the requested OSDiskSizeGB. Otherwise, defaults to 'Managed'. May not
* be changed after creation. Possible values include: 'Managed', 'Ephemeral'
*/
osDiskType?: OSDiskType;
/**
Expand Down Expand Up @@ -824,6 +756,10 @@ export interface AgentPool extends SubResource {
* Whether to enable EncryptionAtHost
*/
enableEncryptionAtHost?: boolean;
/**
* Whether to enable UltraSSD
*/
enableUltraSSD?: boolean;
/**
* Whether to use FIPS enabled OS
*/
Expand Down Expand Up @@ -1410,6 +1346,10 @@ export interface ManagedClusterAPIServerAccessProfile {
* Private dns zone mode for private cluster.
*/
privateDNSZone?: string;
/**
* Whether to create additional public FQDN for private cluster or not.
*/
enablePrivateClusterPublicFQDN?: boolean;
}

/**
Expand Down Expand Up @@ -2003,6 +1943,57 @@ export interface OSOptionProfile {
osOptionPropertyList: OSOptionProperty[];
}

/**
* connect information from the AKS agent nodes to a single endpoint.
*/
export interface EndpointDetail {
/**
* An IP Address that Domain Name currently resolves to.
*/
ipAddress?: string;
/**
* The port an endpoint is connected to.
*/
port?: number;
/**
* The protocol used for connection
*/
protocol?: string;
/**
* Description of the detail
*/
description?: string;
}

/**
* A domain name that AKS agent nodes are reaching at.
*/
export interface EndpointDependency {
/**
* The domain name of the dependency.
*/
domainName?: string;
/**
* The Ports and Protocols used when connecting to domainName.
*/
endpointDetails?: EndpointDetail[];
}

/**
* Egress endpoints which AKS agent nodes connect to for common purpose.
*/
export interface OutboundEnvironmentEndpoint {
/**
* The category of endpoints accessed by the AKS agent node, e.g. azure-resource-management,
* apiserver, etc.
*/
category?: string;
/**
* The endpoints that AKS agent nodes connect to
*/
endpoints?: EndpointDependency[];
}

/**
* Optional Parameters.
*/
Expand Down Expand Up @@ -2041,6 +2032,19 @@ export interface ManagedClusterListResult extends Array<ManagedCluster> {
readonly nextLink?: string;
}

/**
* @interface
* Collection of OutboundEnvironmentEndpoint
* @extends Array<OutboundEnvironmentEndpoint>
*/
export interface OutboundEnvironmentEndpointCollection extends Array<OutboundEnvironmentEndpoint> {
/**
* Link to next page of resources.
* **NOTE: This property will not be serialized. It can only be populated by the server.**
*/
readonly nextLink?: string;
}

/**
* @interface
* The response from the List maintenance configurations operation.
Expand Down Expand Up @@ -2617,6 +2621,26 @@ export type ManagedClustersGetCommandResultResponse = RunCommandResult & {
};
};

/**
* Contains response data for the listOutboundNetworkDependenciesEndpoints operation.
*/
export type ManagedClustersListOutboundNetworkDependenciesEndpointsResponse = OutboundEnvironmentEndpointCollection & {
/**
* The underlying HTTP response.
*/
_response: msRest.HttpResponse & {
/**
* The response body as text (string format)
*/
bodyAsText: string;

/**
* The response body as parsed JSON or XML
*/
parsedBody: OutboundEnvironmentEndpointCollection;
};
};

/**
* Contains response data for the beginCreateOrUpdate operation.
*/
Expand Down Expand Up @@ -2717,6 +2741,26 @@ export type ManagedClustersListByResourceGroupNextResponse = ManagedClusterListR
};
};

/**
* Contains response data for the listOutboundNetworkDependenciesEndpointsNext operation.
*/
export type ManagedClustersListOutboundNetworkDependenciesEndpointsNextResponse = OutboundEnvironmentEndpointCollection & {
/**
* The underlying HTTP response.
*/
_response: msRest.HttpResponse & {
/**
* The response body as text (string format)
*/
bodyAsText: string;

/**
* The response body as parsed JSON or XML
*/
parsedBody: OutboundEnvironmentEndpointCollection;
};
};

/**
* Contains response data for the listByManagedCluster operation.
*/
Expand Down
4 changes: 4 additions & 0 deletions sdk/containerservice/arm-containerservice/src/models/managedClustersMappers.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,8 @@ export {
ContainerServiceSshPublicKey,
CredentialResult,
CredentialResults,
EndpointDependency,
EndpointDetail,
ExtendedLocation,
KubeletConfig,
LinuxOSConfig,
Expand Down Expand Up @@ -52,6 +54,8 @@ export {
ManagedClusterWindowsProfile,
OSOptionProfile,
OSOptionProperty,
OutboundEnvironmentEndpoint,
OutboundEnvironmentEndpointCollection,
PowerState,
PrivateEndpoint,
PrivateEndpointConnection,
Expand Down
Loading

0 comments on commit 6a1befd

Please sign in to comment.