Skip to content

Commit df57c04

Browse files
author
SDKAuto
committed
CodeGen from PR 16529 in Azure/azure-rest-api-specs
Merge c28d33293b5baffc44ad772799e4f1a841e33c10 into 11f5ca6d6d851a18db4ebaa0b2618420dd661d00
1 parent 107d25f commit df57c04

File tree

6 files changed

+122
-31
lines changed

6 files changed

+122
-31
lines changed

‎sdk/containerservice/arm-containerservice/package.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
"rollup-plugin-sourcemaps": "^0.4.2",
2828
"uglify-js": "^3.6.0"
2929
},
30-
"homepage": "https://github.com/Azure/azure-sdk-for-js/tree/feature/v4/sdk/containerservice/arm-containerservice",
30+
"homepage": "https://github.com/Azure/azure-sdk-for-js/tree/master/sdk/containerservice/arm-containerservice",
3131
"repository": {
3232
"type": "git",
3333
"url": "https://github.com/Azure/azure-sdk-for-js.git"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ export class ContainerServiceClientContext extends msRestAzure.AzureServiceClien
5050

5151
super(credentials, options);
5252

53-
this.apiVersion = '2021-09-01';
53+
this.apiVersion = '2021-10-01';
5454
this.acceptLanguage = 'en-US';
5555
this.longRunningOperationRetryTimeout = 30;
5656
this.baseUri = options.baseUri || this.baseUri || "https://management.azure.com";

‎sdk/containerservice/arm-containerservice/src/models/agentPoolsMappers.ts

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ export {
1111
AgentPoolAvailableVersions,
1212
AgentPoolAvailableVersionsPropertiesAgentPoolVersionsItem,
1313
AgentPoolListResult,
14+
AgentPoolsUpgradeNodeImageVersionHeaders,
1415
AgentPoolUpgradeProfile,
1516
AgentPoolUpgradeProfilePropertiesUpgradesItem,
1617
AgentPoolUpgradeSettings,

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

Lines changed: 52 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -965,11 +965,17 @@ export interface ContainerServiceLinuxProfile {
965965
*/
966966
export interface ManagedClusterLoadBalancerProfileManagedOutboundIPs {
967967
/**
968-
* The desired number of outbound IPs created/managed by Azure for the cluster load balancer.
969-
* Allowed values must be in the range of 1 to 100 (inclusive). The default value is 1. Default
970-
* value: 1.
968+
* The desired number of IPv4 outbound IPs created/managed by Azure for the cluster load
969+
* balancer. Allowed values must be in the range of 1 to 100 (inclusive). The default value is 1.
970+
* Default value: 1.
971971
*/
972972
count?: number;
973+
/**
974+
* The desired number of IPv6 outbound IPs created/managed by Azure for the cluster load
975+
* balancer. Allowed values must be in the range of 1 to 100 (inclusive). The default value is 0
976+
* for single-stack and 1 for dual-stack. Default value: 0.
977+
*/
978+
countIPv6?: number;
973979
}
974980

975981
/**
@@ -1130,6 +1136,24 @@ export interface ContainerServiceNetworkProfile {
11301136
* Profile of the cluster NAT gateway.
11311137
*/
11321138
natGatewayProfile?: ManagedClusterNATGatewayProfile;
1139+
/**
1140+
* The CIDR notation IP ranges from which to assign pod IPs. One IPv4 CIDR is expected for
1141+
* single-stack networking. Two CIDRs, one for each IP family (IPv4/IPv6), is expected for
1142+
* dual-stack networking.
1143+
*/
1144+
podCidrs?: string[];
1145+
/**
1146+
* The CIDR notation IP ranges from which to assign service cluster IPs. One IPv4 CIDR is
1147+
* expected for single-stack networking. Two CIDRs, one for each IP family (IPv4/IPv6), is
1148+
* expected for dual-stack networking. They must not overlap with any Subnet IP ranges.
1149+
*/
1150+
serviceCidrs?: string[];
1151+
/**
1152+
* The IP families used to specify IP versions available to the cluster. IP families are used to
1153+
* determine single-stack or dual-stack clusters. For single-stack, the expected value is IPv4.
1154+
* For dual-stack, the expected values are IPv4 and IPv6.
1155+
*/
1156+
ipFamilies?: IpFamily[];
11331157
}
11341158

11351159
/**
@@ -1971,9 +1995,8 @@ export interface ManagedCluster extends Resource {
19711995
*/
19721996
securityProfile?: ManagedClusterSecurityProfile;
19731997
/**
1974-
* Whether the cluster can be accessed through public network or not. Default value is 'Enabled'
1975-
* (case insensitive). Could be set to 'Disabled' to enable private cluster. Possible values
1976-
* include: 'Enabled', 'Disabled'
1998+
* PublicNetworkAccess of the managedCluster. Allow or deny public network access for AKS.
1999+
* Possible values include: 'Enabled', 'Disabled'
19772000
*/
19782001
publicNetworkAccess?: PublicNetworkAccess;
19792002
}
@@ -2442,6 +2465,16 @@ export interface ContainerServiceClientOptions extends AzureServiceClientOptions
24422465
baseUri?: string;
24432466
}
24442467

2468+
/**
2469+
* Defines headers for UpgradeNodeImageVersion operation.
2470+
*/
2471+
export interface AgentPoolsUpgradeNodeImageVersionHeaders {
2472+
/**
2473+
* URL to query for status of the operation.
2474+
*/
2475+
azureAsyncOperation: string;
2476+
}
2477+
24452478
/**
24462479
* @interface
24472480
* The List Operation response.
@@ -2713,6 +2746,14 @@ export type OutboundType = 'loadBalancer' | 'userDefinedRouting' | 'managedNATGa
27132746
*/
27142747
export type LoadBalancerSku = 'standard' | 'basic';
27152748

2749+
/**
2750+
* Defines values for IpFamily.
2751+
* Possible values include: 'IPv4', 'IPv6'
2752+
* @readonly
2753+
* @enum {string}
2754+
*/
2755+
export type IpFamily = 'IPv4' | 'IPv6';
2756+
27162757
/**
27172758
* Defines values for CreatedByType.
27182759
* Possible values include: 'User', 'Application', 'ManagedIdentity', 'Key'
@@ -3421,31 +3462,16 @@ export type AgentPoolsGetAvailableAgentPoolVersionsResponse = AgentPoolAvailable
34213462
/**
34223463
* Contains response data for the upgradeNodeImageVersion operation.
34233464
*/
3424-
export type AgentPoolsUpgradeNodeImageVersionResponse = AgentPool & {
3465+
export type AgentPoolsUpgradeNodeImageVersionResponse = AgentPool & AgentPoolsUpgradeNodeImageVersionHeaders & {
34253466
/**
34263467
* The underlying HTTP response.
34273468
*/
34283469
_response: msRest.HttpResponse & {
34293470
/**
3430-
* The response body as text (string format)
3471+
* The parsed HTTP response headers.
34313472
*/
3432-
bodyAsText: string;
3473+
parsedHeaders: AgentPoolsUpgradeNodeImageVersionHeaders;
34333474

3434-
/**
3435-
* The response body as parsed JSON or XML
3436-
*/
3437-
parsedBody: AgentPool;
3438-
};
3439-
};
3440-
3441-
/**
3442-
* Contains response data for the beginCreateOrUpdate operation.
3443-
*/
3444-
export type AgentPoolsBeginCreateOrUpdateResponse = AgentPool & {
3445-
/**
3446-
* The underlying HTTP response.
3447-
*/
3448-
_response: msRest.HttpResponse & {
34493475
/**
34503476
* The response body as text (string format)
34513477
*/
@@ -3459,9 +3485,9 @@ export type AgentPoolsBeginCreateOrUpdateResponse = AgentPool & {
34593485
};
34603486

34613487
/**
3462-
* Contains response data for the beginUpgradeNodeImageVersion operation.
3488+
* Contains response data for the beginCreateOrUpdate operation.
34633489
*/
3464-
export type AgentPoolsBeginUpgradeNodeImageVersionResponse = AgentPool & {
3490+
export type AgentPoolsBeginCreateOrUpdateResponse = AgentPool & {
34653491
/**
34663492
* The underlying HTTP response.
34673493
*/

‎sdk/containerservice/arm-containerservice/src/models/mappers.ts

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1320,6 +1320,17 @@ export const ManagedClusterLoadBalancerProfileManagedOutboundIPs: msRest.Composi
13201320
type: {
13211321
name: "Number"
13221322
}
1323+
},
1324+
countIPv6: {
1325+
serializedName: "countIPv6",
1326+
defaultValue: 0,
1327+
constraints: {
1328+
InclusiveMaximum: 100,
1329+
InclusiveMinimum: 0
1330+
},
1331+
type: {
1332+
name: "Number"
1333+
}
13231334
}
13241335
}
13251336
}
@@ -1608,6 +1619,39 @@ export const ContainerServiceNetworkProfile: msRest.CompositeMapper = {
16081619
name: "Composite",
16091620
className: "ManagedClusterNATGatewayProfile"
16101621
}
1622+
},
1623+
podCidrs: {
1624+
serializedName: "podCidrs",
1625+
type: {
1626+
name: "Sequence",
1627+
element: {
1628+
type: {
1629+
name: "String"
1630+
}
1631+
}
1632+
}
1633+
},
1634+
serviceCidrs: {
1635+
serializedName: "serviceCidrs",
1636+
type: {
1637+
name: "Sequence",
1638+
element: {
1639+
type: {
1640+
name: "String"
1641+
}
1642+
}
1643+
}
1644+
},
1645+
ipFamilies: {
1646+
serializedName: "ipFamilies",
1647+
type: {
1648+
name: "Sequence",
1649+
element: {
1650+
type: {
1651+
name: "String"
1652+
}
1653+
}
1654+
}
16111655
}
16121656
}
16131657
}
@@ -3601,6 +3645,22 @@ export const Snapshot: msRest.CompositeMapper = {
36013645
}
36023646
};
36033647

3648+
export const AgentPoolsUpgradeNodeImageVersionHeaders: msRest.CompositeMapper = {
3649+
serializedName: "agentpools-upgradenodeimageversion-headers",
3650+
type: {
3651+
name: "Composite",
3652+
className: "AgentPoolsUpgradeNodeImageVersionHeaders",
3653+
modelProperties: {
3654+
azureAsyncOperation: {
3655+
serializedName: "azure-asyncoperation",
3656+
type: {
3657+
name: "String"
3658+
}
3659+
}
3660+
}
3661+
}
3662+
};
3663+
36043664
export const OperationListResult: msRest.CompositeMapper = {
36053665
serializedName: "OperationListResult",
36063666
type: {

‎sdk/containerservice/arm-containerservice/src/operations/agentPools.ts

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -483,12 +483,16 @@ const beginUpgradeNodeImageVersionOperationSpec: msRest.OperationSpec = {
483483
Parameters.acceptLanguage
484484
],
485485
responses: {
486-
200: {},
486+
200: {
487+
headersMapper: Mappers.AgentPoolsUpgradeNodeImageVersionHeaders
488+
},
487489
202: {
488-
bodyMapper: Mappers.AgentPool
490+
bodyMapper: Mappers.AgentPool,
491+
headersMapper: Mappers.AgentPoolsUpgradeNodeImageVersionHeaders
489492
},
490493
default: {
491-
bodyMapper: Mappers.CloudError
494+
bodyMapper: Mappers.CloudError,
495+
headersMapper: Mappers.AgentPoolsUpgradeNodeImageVersionHeaders
492496
}
493497
},
494498
serializer

0 commit comments

Comments
 (0)