Skip to content

Commit 537bf73

Browse files
author
SDKAuto
committed
CodeGen from PR 13331 in Azure/azure-rest-api-specs
Merge bff18e7c2753cfcd130a92fe73b76bc166dbf430 into 921957dfa2228c2062b8d2ef832507339c5562d4
1 parent 924d69d commit 537bf73

File tree

3 files changed

+57
-5
lines changed

3 files changed

+57
-5
lines changed

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

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

4545
super(credentials, options);
4646

47-
this.apiVersion = '2020-12-01';
47+
this.apiVersion = '2021-02-01';
4848
this.acceptLanguage = 'en-US';
4949
this.longRunningOperationRetryTimeout = 30;
5050
this.baseUri = options.baseUri || this.baseUri || "https://management.azure.com";

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

Lines changed: 25 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ export interface ManagedClusterAgentPoolProfileProperties {
482482
/**
483483
* KubeletDiskType determines the placement of emptyDir volumes, container runtime data root, and
484484
* Kubelet ephemeral storage. Currently allows one value, OS, resulting in Kubelet using the OS
485-
* disk for data. Possible values include: 'OS'
485+
* disk for data. Possible values include: 'OS', 'Temporary'
486486
*/
487487
kubeletDiskType?: KubeletDiskType;
488488
/**
@@ -554,6 +554,10 @@ export interface ManagedClusterAgentPoolProfileProperties {
554554
* Enable public IP for nodes
555555
*/
556556
enableNodePublicIP?: boolean;
557+
/**
558+
* Public IP Prefix ID. VM nodes use IPs assigned from this Public IP Prefix.
559+
*/
560+
nodePublicIPPrefixID?: string;
557561
/**
558562
* ScaleSetPriority to be used to specify virtual machine scale set priority. Default to regular.
559563
* Possible values include: 'Spot', 'Regular'. Default value: 'Regular'.
@@ -678,7 +682,7 @@ export interface AgentPool extends SubResource {
678682
/**
679683
* KubeletDiskType determines the placement of emptyDir volumes, container runtime data root, and
680684
* Kubelet ephemeral storage. Currently allows one value, OS, resulting in Kubelet using the OS
681-
* disk for data. Possible values include: 'OS'
685+
* disk for data. Possible values include: 'OS', 'Temporary'
682686
*/
683687
kubeletDiskType?: KubeletDiskType;
684688
/**
@@ -750,6 +754,10 @@ export interface AgentPool extends SubResource {
750754
* Enable public IP for nodes
751755
*/
752756
enableNodePublicIP?: boolean;
757+
/**
758+
* Public IP Prefix ID. VM nodes use IPs assigned from this Public IP Prefix.
759+
*/
760+
nodePublicIPPrefixID?: string;
753761
/**
754762
* ScaleSetPriority to be used to specify virtual machine scale set priority. Default to regular.
755763
* Possible values include: 'Spot', 'Regular'. Default value: 'Regular'.
@@ -1203,6 +1211,10 @@ export interface ManagedClusterPodIdentityProfile {
12031211
* Whether the pod identity addon is enabled.
12041212
*/
12051213
enabled?: boolean;
1214+
/**
1215+
* Customer consent for enabling AAD pod identity addon in cluster using Kubenet network plugin.
1216+
*/
1217+
allowNetworkPluginKubenet?: boolean;
12061218
/**
12071219
* User assigned pod identity settings.
12081220
*/
@@ -1396,6 +1408,10 @@ export interface ManagedCluster extends Resource {
13961408
* DNS prefix specified when creating the managed cluster.
13971409
*/
13981410
dnsPrefix?: string;
1411+
/**
1412+
* FQDN subdomain specified when creating private cluster with custom private dns zone.
1413+
*/
1414+
fqdnSubdomain?: string;
13991415
/**
14001416
* FQDN for the master pool.
14011417
* **NOTE: This property will not be serialized. It can only be populated by the server.**
@@ -1406,6 +1422,11 @@ export interface ManagedCluster extends Resource {
14061422
* **NOTE: This property will not be serialized. It can only be populated by the server.**
14071423
*/
14081424
readonly privateFQDN?: string;
1425+
/**
1426+
* FQDN for the master pool which used by proxy config.
1427+
* **NOTE: This property will not be serialized. It can only be populated by the server.**
1428+
*/
1429+
readonly azurePortalFQDN?: string;
14091430
/**
14101431
* Properties of the agent pool.
14111432
*/
@@ -1909,11 +1930,11 @@ export type OSDiskType = 'Managed' | 'Ephemeral';
19091930

19101931
/**
19111932
* Defines values for KubeletDiskType.
1912-
* Possible values include: 'OS'
1933+
* Possible values include: 'OS', 'Temporary'
19131934
* @readonly
19141935
* @enum {string}
19151936
*/
1916-
export type KubeletDiskType = 'OS';
1937+
export type KubeletDiskType = 'OS' | 'Temporary';
19171938

19181939
/**
19191940
* Defines values for OSType.

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

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -723,6 +723,12 @@ export const ManagedClusterAgentPoolProfileProperties: msRest.CompositeMapper =
723723
name: "Boolean"
724724
}
725725
},
726+
nodePublicIPPrefixID: {
727+
serializedName: "nodePublicIPPrefixID",
728+
type: {
729+
name: "String"
730+
}
731+
},
726732
scaleSetPriority: {
727733
serializedName: "scaleSetPriority",
728734
defaultValue: 'Regular',
@@ -971,6 +977,12 @@ export const AgentPool: msRest.CompositeMapper = {
971977
name: "Boolean"
972978
}
973979
},
980+
nodePublicIPPrefixID: {
981+
serializedName: "properties.nodePublicIPPrefixID",
982+
type: {
983+
name: "String"
984+
}
985+
},
974986
scaleSetPriority: {
975987
serializedName: "properties.scaleSetPriority",
976988
defaultValue: 'Regular',
@@ -1753,6 +1765,12 @@ export const ManagedClusterPodIdentityProfile: msRest.CompositeMapper = {
17531765
name: "Boolean"
17541766
}
17551767
},
1768+
allowNetworkPluginKubenet: {
1769+
serializedName: "allowNetworkPluginKubenet",
1770+
type: {
1771+
name: "Boolean"
1772+
}
1773+
},
17561774
userAssignedIdentities: {
17571775
serializedName: "userAssignedIdentities",
17581776
type: {
@@ -2144,6 +2162,12 @@ export const ManagedCluster: msRest.CompositeMapper = {
21442162
name: "String"
21452163
}
21462164
},
2165+
fqdnSubdomain: {
2166+
serializedName: "properties.fqdnSubdomain",
2167+
type: {
2168+
name: "String"
2169+
}
2170+
},
21472171
fqdn: {
21482172
readOnly: true,
21492173
serializedName: "properties.fqdn",
@@ -2158,6 +2182,13 @@ export const ManagedCluster: msRest.CompositeMapper = {
21582182
name: "String"
21592183
}
21602184
},
2185+
azurePortalFQDN: {
2186+
readOnly: true,
2187+
serializedName: "properties.azurePortalFQDN",
2188+
type: {
2189+
name: "String"
2190+
}
2191+
},
21612192
agentPoolProfiles: {
21622193
serializedName: "properties.agentPoolProfiles",
21632194
type: {

0 commit comments

Comments
 (0)