Skip to content

Commit

Permalink
CodeGen from PR 16857 in Azure/azure-rest-api-specs
Browse files Browse the repository at this point in the history
Merge c901dc8432afd5d3ba9c1766ccec9e9ae736f7e9 into 47b551f58ee1b24f4783c2e927b1673b39d87348
  • Loading branch information
SDKAuto committed Nov 23, 2021
1 parent 94c7e2f commit b717c6c
Show file tree
Hide file tree
Showing 6 changed files with 122 additions and 31 deletions.
2 changes: 1 addition & 1 deletion sdk/containerservice/arm-containerservice/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
"rollup-plugin-sourcemaps": "^0.4.2",
"uglify-js": "^3.6.0"
},
"homepage": "https://github.com/Azure/azure-sdk-for-js/tree/feature/v4/sdk/containerservice/arm-containerservice",
"homepage": "https://github.com/Azure/azure-sdk-for-js/tree/master/sdk/containerservice/arm-containerservice",
"repository": {
"type": "git",
"url": "https://github.com/Azure/azure-sdk-for-js.git"
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ export class ContainerServiceClientContext extends msRestAzure.AzureServiceClien

super(credentials, options);

this.apiVersion = '2021-09-01';
this.apiVersion = '2021-10-01';
this.acceptLanguage = 'en-US';
this.longRunningOperationRetryTimeout = 30;
this.baseUri = options.baseUri || this.baseUri || "https://management.azure.com";
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ export {
AgentPoolAvailableVersions,
AgentPoolAvailableVersionsPropertiesAgentPoolVersionsItem,
AgentPoolListResult,
AgentPoolsUpgradeNodeImageVersionHeaders,
AgentPoolUpgradeProfile,
AgentPoolUpgradeProfilePropertiesUpgradesItem,
AgentPoolUpgradeSettings,
Expand Down
78 changes: 52 additions & 26 deletions sdk/containerservice/arm-containerservice/src/models/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -965,11 +965,17 @@ export interface ContainerServiceLinuxProfile {
*/
export interface ManagedClusterLoadBalancerProfileManagedOutboundIPs {
/**
* The desired number of outbound IPs created/managed by Azure for the cluster load balancer.
* Allowed values must be in the range of 1 to 100 (inclusive). The default value is 1. Default
* value: 1.
* The desired number of IPv4 outbound IPs created/managed by Azure for the cluster load
* balancer. Allowed values must be in the range of 1 to 100 (inclusive). The default value is 1.
* Default value: 1.
*/
count?: number;
/**
* The desired number of IPv6 outbound IPs created/managed by Azure for the cluster load
* balancer. Allowed values must be in the range of 1 to 100 (inclusive). The default value is 0
* for single-stack and 1 for dual-stack. Default value: 0.
*/
countIPv6?: number;
}

/**
Expand Down Expand Up @@ -1130,6 +1136,24 @@ export interface ContainerServiceNetworkProfile {
* Profile of the cluster NAT gateway.
*/
natGatewayProfile?: ManagedClusterNATGatewayProfile;
/**
* The CIDR notation IP ranges from which to assign pod IPs. One IPv4 CIDR is expected for
* single-stack networking. Two CIDRs, one for each IP family (IPv4/IPv6), is expected for
* dual-stack networking.
*/
podCidrs?: string[];
/**
* The CIDR notation IP ranges from which to assign service cluster IPs. One IPv4 CIDR is
* expected for single-stack networking. Two CIDRs, one for each IP family (IPv4/IPv6), is
* expected for dual-stack networking. They must not overlap with any Subnet IP ranges.
*/
serviceCidrs?: string[];
/**
* The IP families used to specify IP versions available to the cluster. IP families are used to
* determine single-stack or dual-stack clusters. For single-stack, the expected value is IPv4.
* For dual-stack, the expected values are IPv4 and IPv6.
*/
ipFamilies?: IpFamily[];
}

/**
Expand Down Expand Up @@ -1971,9 +1995,8 @@ export interface ManagedCluster extends Resource {
*/
securityProfile?: ManagedClusterSecurityProfile;
/**
* Whether the cluster can be accessed through public network or not. Default value is 'Enabled'
* (case insensitive). Could be set to 'Disabled' to enable private cluster. Possible values
* include: 'Enabled', 'Disabled'
* PublicNetworkAccess of the managedCluster. Allow or deny public network access for AKS.
* Possible values include: 'Enabled', 'Disabled'
*/
publicNetworkAccess?: PublicNetworkAccess;
}
Expand Down Expand Up @@ -2442,6 +2465,16 @@ export interface ContainerServiceClientOptions extends AzureServiceClientOptions
baseUri?: string;
}

/**
* Defines headers for UpgradeNodeImageVersion operation.
*/
export interface AgentPoolsUpgradeNodeImageVersionHeaders {
/**
* URL to query for status of the operation.
*/
azureAsyncOperation: string;
}

/**
* @interface
* The List Operation response.
Expand Down Expand Up @@ -2713,6 +2746,14 @@ export type OutboundType = 'loadBalancer' | 'userDefinedRouting' | 'managedNATGa
*/
export type LoadBalancerSku = 'standard' | 'basic';

/**
* Defines values for IpFamily.
* Possible values include: 'IPv4', 'IPv6'
* @readonly
* @enum {string}
*/
export type IpFamily = 'IPv4' | 'IPv6';

/**
* Defines values for CreatedByType.
* Possible values include: 'User', 'Application', 'ManagedIdentity', 'Key'
Expand Down Expand Up @@ -3421,31 +3462,16 @@ export type AgentPoolsGetAvailableAgentPoolVersionsResponse = AgentPoolAvailable
/**
* Contains response data for the upgradeNodeImageVersion operation.
*/
export type AgentPoolsUpgradeNodeImageVersionResponse = AgentPool & {
export type AgentPoolsUpgradeNodeImageVersionResponse = AgentPool & AgentPoolsUpgradeNodeImageVersionHeaders & {
/**
* The underlying HTTP response.
*/
_response: msRest.HttpResponse & {
/**
* The response body as text (string format)
* The parsed HTTP response headers.
*/
bodyAsText: string;
parsedHeaders: AgentPoolsUpgradeNodeImageVersionHeaders;

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

/**
* Contains response data for the beginCreateOrUpdate operation.
*/
export type AgentPoolsBeginCreateOrUpdateResponse = AgentPool & {
/**
* The underlying HTTP response.
*/
_response: msRest.HttpResponse & {
/**
* The response body as text (string format)
*/
Expand All @@ -3459,9 +3485,9 @@ export type AgentPoolsBeginCreateOrUpdateResponse = AgentPool & {
};

/**
* Contains response data for the beginUpgradeNodeImageVersion operation.
* Contains response data for the beginCreateOrUpdate operation.
*/
export type AgentPoolsBeginUpgradeNodeImageVersionResponse = AgentPool & {
export type AgentPoolsBeginCreateOrUpdateResponse = AgentPool & {
/**
* The underlying HTTP response.
*/
Expand Down
60 changes: 60 additions & 0 deletions sdk/containerservice/arm-containerservice/src/models/mappers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1320,6 +1320,17 @@ export const ManagedClusterLoadBalancerProfileManagedOutboundIPs: msRest.Composi
type: {
name: "Number"
}
},
countIPv6: {
serializedName: "countIPv6",
defaultValue: 0,
constraints: {
InclusiveMaximum: 100,
InclusiveMinimum: 0
},
type: {
name: "Number"
}
}
}
}
Expand Down Expand Up @@ -1608,6 +1619,39 @@ export const ContainerServiceNetworkProfile: msRest.CompositeMapper = {
name: "Composite",
className: "ManagedClusterNATGatewayProfile"
}
},
podCidrs: {
serializedName: "podCidrs",
type: {
name: "Sequence",
element: {
type: {
name: "String"
}
}
}
},
serviceCidrs: {
serializedName: "serviceCidrs",
type: {
name: "Sequence",
element: {
type: {
name: "String"
}
}
}
},
ipFamilies: {
serializedName: "ipFamilies",
type: {
name: "Sequence",
element: {
type: {
name: "String"
}
}
}
}
}
}
Expand Down Expand Up @@ -3601,6 +3645,22 @@ export const Snapshot: msRest.CompositeMapper = {
}
};

export const AgentPoolsUpgradeNodeImageVersionHeaders: msRest.CompositeMapper = {
serializedName: "agentpools-upgradenodeimageversion-headers",
type: {
name: "Composite",
className: "AgentPoolsUpgradeNodeImageVersionHeaders",
modelProperties: {
azureAsyncOperation: {
serializedName: "azure-asyncoperation",
type: {
name: "String"
}
}
}
}
};

export const OperationListResult: msRest.CompositeMapper = {
serializedName: "OperationListResult",
type: {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -483,12 +483,16 @@ const beginUpgradeNodeImageVersionOperationSpec: msRest.OperationSpec = {
Parameters.acceptLanguage
],
responses: {
200: {},
200: {
headersMapper: Mappers.AgentPoolsUpgradeNodeImageVersionHeaders
},
202: {
bodyMapper: Mappers.AgentPool
bodyMapper: Mappers.AgentPool,
headersMapper: Mappers.AgentPoolsUpgradeNodeImageVersionHeaders
},
default: {
bodyMapper: Mappers.CloudError
bodyMapper: Mappers.CloudError,
headersMapper: Mappers.AgentPoolsUpgradeNodeImageVersionHeaders
}
},
serializer
Expand Down

0 comments on commit b717c6c

Please sign in to comment.