Skip to content

Commit

Permalink
CodeGen from PR 16215 in Azure/azure-rest-api-specs
Browse files Browse the repository at this point in the history
Merge db0150dca340dbcaad3e8abb7492c6dffbe81fbb into 5ae66380818550c5d9a79c45c704e2ab8f46e63f
  • Loading branch information
SDKAuto committed Oct 8, 2021
1 parent bedb5a1 commit a6d3e0d
Show file tree
Hide file tree
Showing 9 changed files with 156 additions and 15 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-08-01';
this.apiVersion = '2021-09-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 @@ -68,5 +68,6 @@ export {
SystemData,
TimeInWeek,
TimeSpan,
UserAssignedIdentity
UserAssignedIdentity,
WindowsGmsaProfile
} from "../models/mappers";
72 changes: 66 additions & 6 deletions sdk/containerservice/arm-containerservice/src/models/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -554,10 +554,12 @@ export interface ManagedClusterAgentPoolProfileProperties {
*/
readonly provisioningState?: string;
/**
* Describes whether the Agent Pool is Running or Stopped
* **NOTE: This property will not be serialized. It can only be populated by the server.**
* Whether the Agent Pool is running or stopped. When an Agent Pool is first created it is
* initially Running. The Agent Pool can be stopped by setting this field to Stopped. A stopped
* Agent Pool stops all of its VMs and does not accrue billing charges. An Agent Pool can only be
* stopped if it is Running and provisioning state is Succeeded
*/
readonly powerState?: PowerState;
powerState?: PowerState;
/**
* The list of Availability zones to use for nodes. This can only be specified if the
* AgentPoolType property is 'VirtualMachineScaleSets'.
Expand Down Expand Up @@ -765,10 +767,12 @@ export interface AgentPool extends SubResource {
*/
readonly provisioningState?: string;
/**
* Describes whether the Agent Pool is Running or Stopped
* **NOTE: This property will not be serialized. It can only be populated by the server.**
* Whether the Agent Pool is running or stopped. When an Agent Pool is first created it is
* initially Running. The Agent Pool can be stopped by setting this field to Stopped. A stopped
* Agent Pool stops all of its VMs and does not accrue billing charges. An Agent Pool can only be
* stopped if it is Running and provisioning state is Succeeded
*/
readonly powerState?: PowerState;
powerState?: PowerState;
/**
* The list of Availability zones to use for nodes. This can only be specified if the
* AgentPoolType property is 'VirtualMachineScaleSets'.
Expand Down Expand Up @@ -860,6 +864,27 @@ export interface AgentPool extends SubResource {
creationData?: CreationData;
}

/**
* Windows gMSA Profile in the managed cluster.
*/
export interface WindowsGmsaProfile {
/**
* Whether to enable Windows gMSA. Specifies whether to enable Windows gMSA in the managed
* cluster.
*/
enabled?: boolean;
/**
* Specifies the DNS server for Windows gMSA. <br><br> Set it to empty if you have configured the
* DNS server in the vnet which is used to create the managed cluster.
*/
dnsServer?: string;
/**
* Specifies the root domain name for Windows gMSA. <br><br> Set it to empty if you have
* configured the DNS server in the vnet which is used to create the managed cluster.
*/
rootDomainName?: string;
}

/**
* Profile for Windows VMs in the managed cluster.
*/
Expand Down Expand Up @@ -893,6 +918,10 @@ export interface ManagedClusterWindowsProfile {
* repo](https://github.com/kubernetes-csi/csi-proxy).
*/
enableCSIProxy?: boolean;
/**
* The Windows gMSA Profile in the Managed Cluster.
*/
gmsaProfile?: WindowsGmsaProfile;
}

/**
Expand Down Expand Up @@ -2333,6 +2362,37 @@ export interface Snapshot extends Resource {
* Possible values include: 'NodePool'. Default value: 'NodePool'.
*/
snapshotType?: SnapshotType;
/**
* The version of Kubernetes.
* **NOTE: This property will not be serialized. It can only be populated by the server.**
*/
readonly kubernetesVersion?: string;
/**
* The version of node image.
* **NOTE: This property will not be serialized. It can only be populated by the server.**
*/
readonly nodeImageVersion?: string;
/**
* Possible values include: 'Linux', 'Windows'
* **NOTE: This property will not be serialized. It can only be populated by the server.**.
* Default value: 'Linux'.
*/
readonly osType?: OSType;
/**
* Possible values include: 'Ubuntu', 'CBLMariner'
* **NOTE: This property will not be serialized. It can only be populated by the server.**
*/
readonly osSku?: OSSKU;
/**
* The size of the VM.
* **NOTE: This property will not be serialized. It can only be populated by the server.**
*/
readonly vmSize?: string;
/**
* Whether to use a FIPS-enabled OS.
* **NOTE: This property will not be serialized. It can only be populated by the server.**
*/
readonly enableFIPS?: boolean;
}

/**
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,5 +64,6 @@ export {
SystemData,
TimeInWeek,
TimeSpan,
UserAssignedIdentity
UserAssignedIdentity,
WindowsGmsaProfile
} from "../models/mappers";
Original file line number Diff line number Diff line change
Expand Up @@ -78,5 +78,6 @@ export {
TagsObject,
TimeInWeek,
TimeSpan,
UserAssignedIdentity
UserAssignedIdentity,
WindowsGmsaProfile
} from "../models/mappers";
80 changes: 78 additions & 2 deletions sdk/containerservice/arm-containerservice/src/models/mappers.ts
Original file line number Diff line number Diff line change
Expand Up @@ -733,7 +733,6 @@ export const ManagedClusterAgentPoolProfileProperties: msRest.CompositeMapper =
}
},
powerState: {
readOnly: true,
serializedName: "powerState",
type: {
name: "Composite",
Expand Down Expand Up @@ -1030,7 +1029,6 @@ export const AgentPool: msRest.CompositeMapper = {
}
},
powerState: {
readOnly: true,
serializedName: "properties.powerState",
type: {
name: "Composite",
Expand Down Expand Up @@ -1168,6 +1166,34 @@ export const AgentPool: msRest.CompositeMapper = {
}
};

export const WindowsGmsaProfile: msRest.CompositeMapper = {
serializedName: "WindowsGmsaProfile",
type: {
name: "Composite",
className: "WindowsGmsaProfile",
modelProperties: {
enabled: {
serializedName: "enabled",
type: {
name: "Boolean"
}
},
dnsServer: {
serializedName: "dnsServer",
type: {
name: "String"
}
},
rootDomainName: {
serializedName: "rootDomainName",
type: {
name: "String"
}
}
}
}
};

export const ManagedClusterWindowsProfile: msRest.CompositeMapper = {
serializedName: "ManagedClusterWindowsProfile",
type: {
Expand Down Expand Up @@ -1198,6 +1224,13 @@ export const ManagedClusterWindowsProfile: msRest.CompositeMapper = {
type: {
name: "Boolean"
}
},
gmsaProfile: {
serializedName: "gmsaProfile",
type: {
name: "Composite",
className: "WindowsGmsaProfile"
}
}
}
}
Expand Down Expand Up @@ -3520,6 +3553,49 @@ export const Snapshot: msRest.CompositeMapper = {
type: {
name: "String"
}
},
kubernetesVersion: {
readOnly: true,
serializedName: "properties.kubernetesVersion",
type: {
name: "String"
}
},
nodeImageVersion: {
readOnly: true,
serializedName: "properties.nodeImageVersion",
type: {
name: "String"
}
},
osType: {
readOnly: true,
serializedName: "properties.osType",
defaultValue: 'Linux',
type: {
name: "String"
}
},
osSku: {
readOnly: true,
serializedName: "properties.osSku",
type: {
name: "String"
}
},
vmSize: {
readOnly: true,
serializedName: "properties.vmSize",
type: {
name: "String"
}
},
enableFIPS: {
readOnly: true,
serializedName: "properties.enableFIPS",
type: {
name: "Boolean"
}
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -64,5 +64,6 @@ export {
SystemData,
TimeInWeek,
TimeSpan,
UserAssignedIdentity
UserAssignedIdentity,
WindowsGmsaProfile
} from "../models/mappers";
Original file line number Diff line number Diff line change
Expand Up @@ -65,5 +65,6 @@ export {
TagsObject,
TimeInWeek,
TimeSpan,
UserAssignedIdentity
UserAssignedIdentity,
WindowsGmsaProfile
} from "../models/mappers";

0 comments on commit a6d3e0d

Please sign in to comment.