Skip to content

Commit

Permalink
Generated from 347d3a4e4e14242d09183ae9bc956124942b5144
Browse files Browse the repository at this point in the history
  • Loading branch information
SDK Automation committed Oct 22, 2020
1 parent 89cf240 commit 5abfcd8
Show file tree
Hide file tree
Showing 14 changed files with 302 additions and 86 deletions.
4 changes: 2 additions & 2 deletions sdk/containerservice/mgmt-v2019_08_01/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@
<parent>
<groupId>com.microsoft.azure</groupId>
<artifactId>azure-arm-parent</artifactId>
<version>1.2.0</version>
<relativePath>../../parents/azure-arm-parent</relativePath>
<version>1.1.0</version>
<relativePath>../../../pom.management.xml</relativePath>
</parent>
<artifactId>azure-mgmt-containerservice</artifactId>
<version>1.0.0-beta</version>
Expand Down

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -71,10 +71,9 @@ public interface AgentPools extends SupportsCreating<AgentPool.DefinitionStages.
*
* @param resourceGroupName The name of the resource group.
* @param resourceName The name of the managed cluster resource.
* @param agentPoolName The name of the agent pool.
* @throws IllegalArgumentException thrown if parameters fail the validation
* @return the observable for the request
*/
Observable<AgentPoolAvailableVersions> getAvailableAgentPoolVersionsAsync(String resourceGroupName, String resourceName, String agentPoolName);
Observable<AgentPoolAvailableVersions> getAvailableAgentPoolVersionsAsync(String resourceGroupName, String resourceName);

}
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@ interface WithDnsPrefix {
interface WithEnablePodSecurityPolicy {
/**
* Specifies enablePodSecurityPolicy.
* @param enablePodSecurityPolicy (PREVIEW) Whether to enable Kubernetes Pod security policy
* @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
* @return the next definition stage
*/
WithCreate withEnablePodSecurityPolicy(Boolean enablePodSecurityPolicy);
Expand Down Expand Up @@ -385,7 +385,7 @@ interface WithDnsPrefix {
interface WithEnablePodSecurityPolicy {
/**
* Specifies enablePodSecurityPolicy.
* @param enablePodSecurityPolicy (PREVIEW) Whether to enable Kubernetes Pod security policy
* @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
* @return the next update stage
*/
Update withEnablePodSecurityPolicy(Boolean enablePodSecurityPolicy);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ public class ManagedClusterAgentPoolProfileProperties {
* Number of agents (VMs) to host docker containers. Allowed values must be
* in the range of 1 to 100 (inclusive). The default value is 1.
*/
@JsonProperty(value = "count", required = true)
private int count;
@JsonProperty(value = "count")
private Integer count;

/**
* Size of agent VMs. Possible values include: 'Standard_A1',
Expand Down Expand Up @@ -76,7 +76,7 @@ public class ManagedClusterAgentPoolProfileProperties {
* 'Standard_ND24s', 'Standard_ND6s', 'Standard_NV12', 'Standard_NV24',
* 'Standard_NV6'.
*/
@JsonProperty(value = "vmSize", required = true)
@JsonProperty(value = "vmSize")
private ContainerServiceVMSizeTypes vmSize;

/**
Expand Down Expand Up @@ -184,7 +184,7 @@ public class ManagedClusterAgentPoolProfileProperties {
*
* @return the count value
*/
public int count() {
public Integer count() {
return this.count;
}

Expand All @@ -194,7 +194,7 @@ public int count() {
* @param count the count value to set
* @return the ManagedClusterAgentPoolProfileProperties object itself.
*/
public ManagedClusterAgentPoolProfileProperties withCount(int count) {
public ManagedClusterAgentPoolProfileProperties withCount(Integer count) {
this.count = count;
return this;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,34 @@
*/
public class ManagedClusterWindowsProfile {
/**
* The administrator username to use for Windows VMs.
* 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.
*/
@JsonProperty(value = "adminUsername", required = true)
private String adminUsername;

/**
* The administrator password to use for Windows VMs.
* 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!".
*/
@JsonProperty(value = "adminPassword")
private String adminPassword;

/**
* Get the administrator username to use for Windows VMs.
* 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.
*
* @return the adminUsername value
*/
Expand All @@ -36,7 +51,7 @@ public String adminUsername() {
}

/**
* Set the administrator username to use for Windows VMs.
* 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.
*
* @param adminUsername the adminUsername value to set
* @return the ManagedClusterWindowsProfile object itself.
Expand All @@ -47,7 +62,7 @@ public ManagedClusterWindowsProfile withAdminUsername(String adminUsername) {
}

/**
* Get the administrator password to use for Windows VMs.
* 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!".
*
* @return the adminPassword value
*/
Expand All @@ -56,7 +71,7 @@ public String adminPassword() {
}

/**
* Set the administrator password to use for Windows VMs.
* 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!".
*
* @param adminPassword the adminPassword value to set
* @return the ManagedClusterWindowsProfile object itself.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,17 @@ public interface ManagedClusters extends SupportsCreating<ManagedCluster.Definit
*/
Completable resetAADProfileAsync(String resourceGroupName, String resourceName, ManagedClusterAADProfile parameters);

/**
* Rotate certificates of a managed cluster.
* Rotate certificates of a managed cluster.
*
* @param resourceGroupName The name of the resource group.
* @param resourceName The name of the managed cluster resource.
* @throws IllegalArgumentException thrown if parameters fail the validation
* @return the observable for the request
*/
Completable rotateClusterCertificatesAsync(String resourceGroupName, String resourceName);

/**
* Gets upgrade profile for a managed cluster.
* Gets the details of the upgrade profile for a managed cluster with a specified resource group and name.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ public List<String> availabilityZones() {
}

@Override
public int count() {
public Integer count() {
return this.inner().count();
}

Expand Down Expand Up @@ -182,18 +182,6 @@ public AgentPoolImpl withExistingManagedCluster(String resourceGroupName, String
return this;
}

@Override
public AgentPoolImpl withCount(int count) {
this.inner().withCount(count);
return this;
}

@Override
public AgentPoolImpl withVmSize(ContainerServiceVMSizeTypes vmSize) {
this.inner().withVmSize(vmSize);
return this;
}

@Override
public AgentPoolImpl withAgentPoolType(AgentPoolType agentPoolType) {
this.inner().withAgentPoolType(agentPoolType);
Expand All @@ -206,6 +194,12 @@ public AgentPoolImpl withAvailabilityZones(List<String> availabilityZones) {
return this;
}

@Override
public AgentPoolImpl withCount(Integer count) {
this.inner().withCount(count);
return this;
}

@Override
public AgentPoolImpl withEnableAutoScaling(Boolean enableAutoScaling) {
this.inner().withEnableAutoScaling(enableAutoScaling);
Expand Down Expand Up @@ -272,6 +266,12 @@ public AgentPoolImpl withScaleSetPriority(ScaleSetPriority scaleSetPriority) {
return this;
}

@Override
public AgentPoolImpl withVmSize(ContainerServiceVMSizeTypes vmSize) {
this.inner().withVmSize(vmSize);
return this;
}

@Override
public AgentPoolImpl withVnetSubnetID(String vnetSubnetID) {
this.inner().withVnetSubnetID(vnetSubnetID);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ public class AgentPoolInner extends SubResource {
* Number of agents (VMs) to host docker containers. Allowed values must be
* in the range of 1 to 100 (inclusive). The default value is 1.
*/
@JsonProperty(value = "properties.count", required = true)
private int count;
@JsonProperty(value = "properties.count")
private Integer count;

/**
* Size of agent VMs. Possible values include: 'Standard_A1',
Expand Down Expand Up @@ -84,7 +84,7 @@ public class AgentPoolInner extends SubResource {
* 'Standard_ND24s', 'Standard_ND6s', 'Standard_NV12', 'Standard_NV24',
* 'Standard_NV6'.
*/
@JsonProperty(value = "properties.vmSize", required = true)
@JsonProperty(value = "properties.vmSize")
private ContainerServiceVMSizeTypes vmSize;

/**
Expand Down Expand Up @@ -205,7 +205,7 @@ public class AgentPoolInner extends SubResource {
*
* @return the count value
*/
public int count() {
public Integer count() {
return this.count;
}

Expand All @@ -215,7 +215,7 @@ public int count() {
* @param count the count value to set
* @return the AgentPoolInner object itself.
*/
public AgentPoolInner withCount(int count) {
public AgentPoolInner withCount(Integer count) {
this.count = count;
return this;
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,9 +97,9 @@ public AgentPoolUpgradeProfile call(AgentPoolUpgradeProfileInner inner) {
}

@Override
public Observable<AgentPoolAvailableVersions> getAvailableAgentPoolVersionsAsync(String resourceGroupName, String resourceName, String agentPoolName) {
public Observable<AgentPoolAvailableVersions> getAvailableAgentPoolVersionsAsync(String resourceGroupName, String resourceName) {
AgentPoolsInner client = this.inner();
return client.getAvailableAgentPoolVersionsAsync(resourceGroupName, resourceName, agentPoolName)
return client.getAvailableAgentPoolVersionsAsync(resourceGroupName, resourceName)
.map(new Func1<AgentPoolAvailableVersionsInner, AgentPoolAvailableVersions>() {
@Override
public AgentPoolAvailableVersions call(AgentPoolAvailableVersionsInner inner) {
Expand Down
Loading

0 comments on commit 5abfcd8

Please sign in to comment.