Skip to content

Commit 48fdba8

Browse files
author
SDK Automation
committed
Generated from 347d3a4e4e14242d09183ae9bc956124942b5144
1 parent 89cf240 commit 48fdba8

File tree

8 files changed

+106
-65
lines changed

8 files changed

+106
-65
lines changed

sdk/containerservice/mgmt-v2020_02_01/pom.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
<parent>
1212
<groupId>com.microsoft.azure</groupId>
1313
<artifactId>azure-arm-parent</artifactId>
14-
<version>1.3.0</version>
15-
<relativePath>../../parents/azure-arm-parent</relativePath>
14+
<version>1.1.0</version>
15+
<relativePath>../../../pom.management.xml</relativePath>
1616
</parent>
1717
<artifactId>azure-mgmt-containerservice</artifactId>
1818
<version>1.0.0-beta</version>

sdk/containerservice/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/containerservice/v2020_02_01/AgentPool.java

Lines changed: 53 additions & 29 deletions
Large diffs are not rendered by default.

sdk/containerservice/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/containerservice/v2020_02_01/ManagedCluster.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -243,7 +243,7 @@ interface WithDnsPrefix {
243243
interface WithEnablePodSecurityPolicy {
244244
/**
245245
* Specifies enablePodSecurityPolicy.
246-
* @param enablePodSecurityPolicy (PREVIEW) Whether to enable Kubernetes Pod security policy
246+
* @param enablePodSecurityPolicy (DEPRECATING) Whether to enable Kubernetes pod security policy (preview). This feature is set for removal on October 15th, 2020. Learn more at aka.ms/aks/azpodpolicy
247247
* @return the next definition stage
248248
*/
249249
WithCreate withEnablePodSecurityPolicy(Boolean enablePodSecurityPolicy);
@@ -465,7 +465,7 @@ interface WithDnsPrefix {
465465
interface WithEnablePodSecurityPolicy {
466466
/**
467467
* Specifies enablePodSecurityPolicy.
468-
* @param enablePodSecurityPolicy (PREVIEW) Whether to enable Kubernetes Pod security policy
468+
* @param enablePodSecurityPolicy (DEPRECATING) Whether to enable Kubernetes pod security policy (preview). This feature is set for removal on October 15th, 2020. Learn more at aka.ms/aks/azpodpolicy
469469
* @return the next update stage
470470
*/
471471
Update withEnablePodSecurityPolicy(Boolean enablePodSecurityPolicy);

sdk/containerservice/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/containerservice/v2020_02_01/ManagedClusterAgentPoolProfileProperties.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -20,8 +20,8 @@ public class ManagedClusterAgentPoolProfileProperties {
2020
* Number of agents (VMs) to host docker containers. Allowed values must be
2121
* in the range of 1 to 100 (inclusive). The default value is 1.
2222
*/
23-
@JsonProperty(value = "count", required = true)
24-
private int count;
23+
@JsonProperty(value = "count")
24+
private Integer count;
2525

2626
/**
2727
* Size of agent VMs. Possible values include: 'Standard_A1',
@@ -77,7 +77,7 @@ public class ManagedClusterAgentPoolProfileProperties {
7777
* 'Standard_ND24s', 'Standard_ND6s', 'Standard_NV12', 'Standard_NV24',
7878
* 'Standard_NV6'.
7979
*/
80-
@JsonProperty(value = "vmSize", required = true)
80+
@JsonProperty(value = "vmSize")
8181
private ContainerServiceVMSizeTypes vmSize;
8282

8383
/**
@@ -207,7 +207,7 @@ public class ManagedClusterAgentPoolProfileProperties {
207207
*
208208
* @return the count value
209209
*/
210-
public int count() {
210+
public Integer count() {
211211
return this.count;
212212
}
213213

@@ -217,7 +217,7 @@ public int count() {
217217
* @param count the count value to set
218218
* @return the ManagedClusterAgentPoolProfileProperties object itself.
219219
*/
220-
public ManagedClusterAgentPoolProfileProperties withCount(int count) {
220+
public ManagedClusterAgentPoolProfileProperties withCount(Integer count) {
221221
this.count = count;
222222
return this;
223223
}

sdk/containerservice/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/containerservice/v2020_02_01/ManagedClusterWindowsProfile.java

Lines changed: 21 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,19 +15,34 @@
1515
*/
1616
public class ManagedClusterWindowsProfile {
1717
/**
18-
* The administrator username to use for Windows VMs.
18+
* Specifies the name of the administrator account. &lt;br&gt;&lt;br&gt;
19+
* **restriction:** Cannot end in "." &lt;br&gt;&lt;br&gt; **Disallowed
20+
* values:** "administrator", "admin", "user", "user1", "test", "user2",
21+
* "test1", "user3", "admin1", "1", "123", "a", "actuser", "adm", "admin2",
22+
* "aspnet", "backup", "console", "david", "guest", "john", "owner",
23+
* "root", "server", "sql", "support", "support_388945a0", "sys", "test2",
24+
* "test3", "user4", "user5". &lt;br&gt;&lt;br&gt; **Minimum-length:** 1
25+
* character &lt;br&gt;&lt;br&gt; **Max-length:** 20 characters.
1926
*/
2027
@JsonProperty(value = "adminUsername", required = true)
2128
private String adminUsername;
2229

2330
/**
24-
* The administrator password to use for Windows VMs.
31+
* Specifies the password of the administrator account.
32+
* &lt;br&gt;&lt;br&gt; **Minimum-length:** 8 characters
33+
* &lt;br&gt;&lt;br&gt; **Max-length:** 123 characters &lt;br&gt;&lt;br&gt;
34+
* **Complexity requirements:** 3 out of 4 conditions below need to be
35+
* fulfilled &lt;br&gt; Has lower characters &lt;br&gt;Has upper characters
36+
* &lt;br&gt; Has a digit &lt;br&gt; Has a special character (Regex match
37+
* [\W_]) &lt;br&gt;&lt;br&gt; **Disallowed values:** "abc@123",
38+
* "P@$$w0rd", "P@ssw0rd", "P@ssword123", "Pa$$word", "pass@word1",
39+
* "Password!", "Password1", "Password22", "iloveyou!".
2540
*/
2641
@JsonProperty(value = "adminPassword")
2742
private String adminPassword;
2843

2944
/**
30-
* Get the administrator username to use for Windows VMs.
45+
* Get specifies the name of the administrator account. &lt;br&gt;&lt;br&gt; **restriction:** Cannot end in "." &lt;br&gt;&lt;br&gt; **Disallowed values:** "administrator", "admin", "user", "user1", "test", "user2", "test1", "user3", "admin1", "1", "123", "a", "actuser", "adm", "admin2", "aspnet", "backup", "console", "david", "guest", "john", "owner", "root", "server", "sql", "support", "support_388945a0", "sys", "test2", "test3", "user4", "user5". &lt;br&gt;&lt;br&gt; **Minimum-length:** 1 character &lt;br&gt;&lt;br&gt; **Max-length:** 20 characters.
3146
*
3247
* @return the adminUsername value
3348
*/
@@ -36,7 +51,7 @@ public String adminUsername() {
3651
}
3752

3853
/**
39-
* Set the administrator username to use for Windows VMs.
54+
* Set specifies the name of the administrator account. &lt;br&gt;&lt;br&gt; **restriction:** Cannot end in "." &lt;br&gt;&lt;br&gt; **Disallowed values:** "administrator", "admin", "user", "user1", "test", "user2", "test1", "user3", "admin1", "1", "123", "a", "actuser", "adm", "admin2", "aspnet", "backup", "console", "david", "guest", "john", "owner", "root", "server", "sql", "support", "support_388945a0", "sys", "test2", "test3", "user4", "user5". &lt;br&gt;&lt;br&gt; **Minimum-length:** 1 character &lt;br&gt;&lt;br&gt; **Max-length:** 20 characters.
4055
*
4156
* @param adminUsername the adminUsername value to set
4257
* @return the ManagedClusterWindowsProfile object itself.
@@ -47,7 +62,7 @@ public ManagedClusterWindowsProfile withAdminUsername(String adminUsername) {
4762
}
4863

4964
/**
50-
* Get the administrator password to use for Windows VMs.
65+
* Get specifies the password of the administrator account. &lt;br&gt;&lt;br&gt; **Minimum-length:** 8 characters &lt;br&gt;&lt;br&gt; **Max-length:** 123 characters &lt;br&gt;&lt;br&gt; **Complexity requirements:** 3 out of 4 conditions below need to be fulfilled &lt;br&gt; Has lower characters &lt;br&gt;Has upper characters &lt;br&gt; Has a digit &lt;br&gt; Has a special character (Regex match [\W_]) &lt;br&gt;&lt;br&gt; **Disallowed values:** "abc@123", "P@$$w0rd", "P@ssw0rd", "P@ssword123", "Pa$$word", "pass@word1", "Password!", "Password1", "Password22", "iloveyou!".
5166
*
5267
* @return the adminPassword value
5368
*/
@@ -56,7 +71,7 @@ public String adminPassword() {
5671
}
5772

5873
/**
59-
* Set the administrator password to use for Windows VMs.
74+
* Set specifies the password of the administrator account. &lt;br&gt;&lt;br&gt; **Minimum-length:** 8 characters &lt;br&gt;&lt;br&gt; **Max-length:** 123 characters &lt;br&gt;&lt;br&gt; **Complexity requirements:** 3 out of 4 conditions below need to be fulfilled &lt;br&gt; Has lower characters &lt;br&gt;Has upper characters &lt;br&gt; Has a digit &lt;br&gt; Has a special character (Regex match [\W_]) &lt;br&gt;&lt;br&gt; **Disallowed values:** "abc@123", "P@$$w0rd", "P@ssw0rd", "P@ssword123", "Pa$$word", "pass@word1", "Password!", "Password1", "Password22", "iloveyou!".
6075
*
6176
* @param adminPassword the adminPassword value to set
6277
* @return the ManagedClusterWindowsProfile object itself.

sdk/containerservice/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/containerservice/v2020_02_01/implementation/AgentPoolImpl.java

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ public List<String> availabilityZones() {
8787
}
8888

8989
@Override
90-
public int count() {
90+
public Integer count() {
9191
return this.inner().count();
9292
}
9393

@@ -198,18 +198,6 @@ public AgentPoolImpl withExistingManagedCluster(String resourceGroupName, String
198198
return this;
199199
}
200200

201-
@Override
202-
public AgentPoolImpl withCount(int count) {
203-
this.inner().withCount(count);
204-
return this;
205-
}
206-
207-
@Override
208-
public AgentPoolImpl withVmSize(ContainerServiceVMSizeTypes vmSize) {
209-
this.inner().withVmSize(vmSize);
210-
return this;
211-
}
212-
213201
@Override
214202
public AgentPoolImpl withAgentPoolType(AgentPoolType agentPoolType) {
215203
this.inner().withAgentPoolType(agentPoolType);
@@ -222,6 +210,12 @@ public AgentPoolImpl withAvailabilityZones(List<String> availabilityZones) {
222210
return this;
223211
}
224212

213+
@Override
214+
public AgentPoolImpl withCount(Integer count) {
215+
this.inner().withCount(count);
216+
return this;
217+
}
218+
225219
@Override
226220
public AgentPoolImpl withEnableAutoScaling(Boolean enableAutoScaling) {
227221
this.inner().withEnableAutoScaling(enableAutoScaling);
@@ -306,6 +300,12 @@ public AgentPoolImpl withTags(Map<String, String> tags) {
306300
return this;
307301
}
308302

303+
@Override
304+
public AgentPoolImpl withVmSize(ContainerServiceVMSizeTypes vmSize) {
305+
this.inner().withVmSize(vmSize);
306+
return this;
307+
}
308+
309309
@Override
310310
public AgentPoolImpl withVnetSubnetID(String vnetSubnetID) {
311311
this.inner().withVnetSubnetID(vnetSubnetID);

sdk/containerservice/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/containerservice/v2020_02_01/implementation/AgentPoolInner.java

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ public class AgentPoolInner extends SubResource {
2828
* Number of agents (VMs) to host docker containers. Allowed values must be
2929
* in the range of 1 to 100 (inclusive). The default value is 1.
3030
*/
31-
@JsonProperty(value = "properties.count", required = true)
32-
private int count;
31+
@JsonProperty(value = "properties.count")
32+
private Integer count;
3333

3434
/**
3535
* Size of agent VMs. Possible values include: 'Standard_A1',
@@ -85,7 +85,7 @@ public class AgentPoolInner extends SubResource {
8585
* 'Standard_ND24s', 'Standard_ND6s', 'Standard_NV12', 'Standard_NV24',
8686
* 'Standard_NV6'.
8787
*/
88-
@JsonProperty(value = "properties.vmSize", required = true)
88+
@JsonProperty(value = "properties.vmSize")
8989
private ContainerServiceVMSizeTypes vmSize;
9090

9191
/**
@@ -228,7 +228,7 @@ public class AgentPoolInner extends SubResource {
228228
*
229229
* @return the count value
230230
*/
231-
public int count() {
231+
public Integer count() {
232232
return this.count;
233233
}
234234

@@ -238,7 +238,7 @@ public int count() {
238238
* @param count the count value to set
239239
* @return the AgentPoolInner object itself.
240240
*/
241-
public AgentPoolInner withCount(int count) {
241+
public AgentPoolInner withCount(Integer count) {
242242
this.count = count;
243243
return this;
244244
}

sdk/containerservice/mgmt-v2020_02_01/src/main/java/com/microsoft/azure/management/containerservice/v2020_02_01/implementation/ManagedClusterInner.java

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,9 @@ public class ManagedClusterInner extends Resource {
111111
private Boolean enableRBAC;
112112

113113
/**
114-
* (PREVIEW) Whether to enable Kubernetes Pod security policy.
114+
* (DEPRECATING) Whether to enable Kubernetes pod security policy
115+
* (preview). This feature is set for removal on October 15th, 2020. Learn
116+
* more at aka.ms/aks/azpodpolicy.
115117
*/
116118
@JsonProperty(value = "properties.enablePodSecurityPolicy")
117119
private Boolean enablePodSecurityPolicy;
@@ -376,7 +378,7 @@ public ManagedClusterInner withEnableRBAC(Boolean enableRBAC) {
376378
}
377379

378380
/**
379-
* Get (PREVIEW) Whether to enable Kubernetes Pod security policy.
381+
* Get (DEPRECATING) Whether to enable Kubernetes pod security policy (preview). This feature is set for removal on October 15th, 2020. Learn more at aka.ms/aks/azpodpolicy.
380382
*
381383
* @return the enablePodSecurityPolicy value
382384
*/
@@ -385,7 +387,7 @@ public Boolean enablePodSecurityPolicy() {
385387
}
386388

387389
/**
388-
* Set (PREVIEW) Whether to enable Kubernetes Pod security policy.
390+
* Set (DEPRECATING) Whether to enable Kubernetes pod security policy (preview). This feature is set for removal on October 15th, 2020. Learn more at aka.ms/aks/azpodpolicy.
389391
*
390392
* @param enablePodSecurityPolicy the enablePodSecurityPolicy value to set
391393
* @return the ManagedClusterInner object itself.

0 commit comments

Comments
 (0)