Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 16 additions & 6 deletions sdk/containerservice/arm-containerservice/lib/models/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1614,14 +1614,19 @@ export interface CredentialResults {
*/
export interface OrchestratorProfile {
/**
* @member {string} orchestratorType Orchestrator type.
* @member {string} [orchestratorType] Orchestrator type.
*/
orchestratorType: string;
orchestratorType?: string;
/**
* @member {string} orchestratorVersion Orchestrator version (major, minor,
* patch).
*/
orchestratorVersion: string;
/**
* @member {boolean} [isPreview] Whether Kubernetes version is currently in
* preview.
*/
isPreview?: boolean;
}

/**
Expand All @@ -1641,15 +1646,20 @@ export interface OrchestratorVersionProfile {
*/
orchestratorVersion: string;
/**
* @member {boolean} default Installed by default if version is not
* @member {boolean} [default] Installed by default if version is not
* specified.
*/
default: boolean;
default?: boolean;
/**
* @member {boolean} [isPreview] Whether Kubernetes version is currently in
* preview.
*/
isPreview?: boolean;
/**
* @member {OrchestratorProfile[]} upgrades The list of available upgrade
* @member {OrchestratorProfile[]} [upgrades] The list of available upgrade
* versions.
*/
upgrades: OrchestratorProfile[];
upgrades?: OrchestratorProfile[];
}

/**
Expand Down
15 changes: 12 additions & 3 deletions sdk/containerservice/arm-containerservice/lib/models/mappers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -1809,7 +1809,6 @@ export const OrchestratorProfile: msRest.CompositeMapper = {
className: "OrchestratorProfile",
modelProperties: {
orchestratorType: {
required: true,
serializedName: "orchestratorType",
type: {
name: "String"
Expand All @@ -1821,6 +1820,12 @@ export const OrchestratorProfile: msRest.CompositeMapper = {
type: {
name: "String"
}
},
isPreview: {
serializedName: "isPreview",
type: {
name: "Boolean"
}
}
}
}
Expand All @@ -1847,14 +1852,18 @@ export const OrchestratorVersionProfile: msRest.CompositeMapper = {
}
},
default: {
required: true,
serializedName: "default",
type: {
name: "Boolean"
}
},
isPreview: {
serializedName: "isPreview",
type: {
name: "Boolean"
}
},
upgrades: {
required: true,
serializedName: "upgrades",
type: {
name: "Sequence",
Expand Down
12 changes: 0 additions & 12 deletions sdk/containerservice/arm-containerservice/lib/models/parameters.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,18 +55,6 @@ export const apiVersion1: msRest.OperationQueryParameter = {
}
};
export const apiVersion2: msRest.OperationQueryParameter = {
parameterPath: "apiVersion",
mapper: {
required: true,
isConstant: true,
serializedName: "api-version",
defaultValue: '2017-09-30',
type: {
name: "String"
}
}
};
export const apiVersion3: msRest.OperationQueryParameter = {
parameterPath: "apiVersion",
mapper: {
required: true,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,7 @@ const listOperationSpec: msRest.OperationSpec = {
Parameters.managedClusterName
],
queryParameters: [
Parameters.apiVersion3
Parameters.apiVersion2
],
headerParameters: [
Parameters.acceptLanguage
Expand All @@ -239,7 +239,7 @@ const getOperationSpec: msRest.OperationSpec = {
Parameters.agentPoolName
],
queryParameters: [
Parameters.apiVersion3
Parameters.apiVersion2
],
headerParameters: [
Parameters.acceptLanguage
Expand All @@ -265,7 +265,7 @@ const beginCreateOrUpdateOperationSpec: msRest.OperationSpec = {
Parameters.agentPoolName
],
queryParameters: [
Parameters.apiVersion3
Parameters.apiVersion2
],
headerParameters: [
Parameters.acceptLanguage
Expand Down Expand Up @@ -301,7 +301,7 @@ const beginDeleteMethodOperationSpec: msRest.OperationSpec = {
Parameters.agentPoolName
],
queryParameters: [
Parameters.apiVersion3
Parameters.apiVersion2
],
headerParameters: [
Parameters.acceptLanguage
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -167,7 +167,8 @@ export class ContainerServices {

/**
* Gets a list of supported orchestrators in the specified subscription. The operation returns
* properties of each orchestrator including version and available upgrades.
* properties of each orchestrator including version, available upgrades and whether that version
* or upgrades are in preview.
* @summary Gets a list of supported orchestrators in the specified subscription.
* @param location The name of a supported Azure region.
* @param [options] The optional parameters
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -500,7 +500,7 @@ const listOperationSpec: msRest.OperationSpec = {
Parameters.subscriptionId
],
queryParameters: [
Parameters.apiVersion3
Parameters.apiVersion2
],
headerParameters: [
Parameters.acceptLanguage
Expand All @@ -524,7 +524,7 @@ const listByResourceGroupOperationSpec: msRest.OperationSpec = {
Parameters.resourceGroupName0
],
queryParameters: [
Parameters.apiVersion3
Parameters.apiVersion2
],
headerParameters: [
Parameters.acceptLanguage
Expand All @@ -549,7 +549,7 @@ const getUpgradeProfileOperationSpec: msRest.OperationSpec = {
Parameters.resourceName
],
queryParameters: [
Parameters.apiVersion3
Parameters.apiVersion2
],
headerParameters: [
Parameters.acceptLanguage
Expand All @@ -575,7 +575,7 @@ const getAccessProfileOperationSpec: msRest.OperationSpec = {
Parameters.roleName
],
queryParameters: [
Parameters.apiVersion3
Parameters.apiVersion2
],
headerParameters: [
Parameters.acceptLanguage
Expand All @@ -600,7 +600,7 @@ const listClusterAdminCredentialsOperationSpec: msRest.OperationSpec = {
Parameters.resourceName
],
queryParameters: [
Parameters.apiVersion3
Parameters.apiVersion2
],
headerParameters: [
Parameters.acceptLanguage
Expand All @@ -625,7 +625,7 @@ const listClusterUserCredentialsOperationSpec: msRest.OperationSpec = {
Parameters.resourceName
],
queryParameters: [
Parameters.apiVersion3
Parameters.apiVersion2
],
headerParameters: [
Parameters.acceptLanguage
Expand All @@ -650,7 +650,7 @@ const getOperationSpec: msRest.OperationSpec = {
Parameters.resourceName
],
queryParameters: [
Parameters.apiVersion3
Parameters.apiVersion2
],
headerParameters: [
Parameters.acceptLanguage
Expand All @@ -675,7 +675,7 @@ const beginCreateOrUpdateOperationSpec: msRest.OperationSpec = {
Parameters.resourceName
],
queryParameters: [
Parameters.apiVersion3
Parameters.apiVersion2
],
headerParameters: [
Parameters.acceptLanguage
Expand Down Expand Up @@ -710,7 +710,7 @@ const beginUpdateTagsOperationSpec: msRest.OperationSpec = {
Parameters.resourceName
],
queryParameters: [
Parameters.apiVersion3
Parameters.apiVersion2
],
headerParameters: [
Parameters.acceptLanguage
Expand Down Expand Up @@ -742,7 +742,7 @@ const beginDeleteMethodOperationSpec: msRest.OperationSpec = {
Parameters.resourceName
],
queryParameters: [
Parameters.apiVersion3
Parameters.apiVersion2
],
headerParameters: [
Parameters.acceptLanguage
Expand All @@ -766,7 +766,7 @@ const beginResetServicePrincipalProfileOperationSpec: msRest.OperationSpec = {
Parameters.resourceName
],
queryParameters: [
Parameters.apiVersion3
Parameters.apiVersion2
],
headerParameters: [
Parameters.acceptLanguage
Expand Down Expand Up @@ -797,7 +797,7 @@ const beginResetAADProfileOperationSpec: msRest.OperationSpec = {
Parameters.resourceName
],
queryParameters: [
Parameters.apiVersion3
Parameters.apiVersion2
],
headerParameters: [
Parameters.acceptLanguage
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ const listOperationSpec: msRest.OperationSpec = {
httpMethod: "GET",
path: "providers/Microsoft.ContainerService/operations",
queryParameters: [
Parameters.apiVersion3
Parameters.apiVersion2
],
headerParameters: [
Parameters.acceptLanguage
Expand Down