Update from master

AzureSDKAutomation · Aug 26, 2020 · 8099dce · 8099dce
1 parent 361f94d
commit 8099dce
Show file tree

Hide file tree

Showing 7 changed files with 85 additions and 59 deletions.
diff --git a/sdk/containerservice/mgmt-v2020_02_01/pom.xml b/sdk/containerservice/mgmt-v2020_02_01/pom.xml
@@ -11,8 +11,8 @@
     <parent>
         <groupId>com.microsoft.azure</groupId>
         <artifactId>azure-arm-parent</artifactId>
-        <version>1.3.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>

diff --git a/.../src/main/java/com/microsoft/azure/management/containerservice/v2020_02_01/AgentPool.java b/.../src/main/java/com/microsoft/azure/management/containerservice/v2020_02_01/AgentPool.java
diff --git a/...main/java/com/microsoft/azure/management/containerservice/v2020_02_01/ManagedCluster.java b/...main/java/com/microsoft/azure/management/containerservice/v2020_02_01/ManagedCluster.java
@@ -243,7 +243,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);
@@ -465,7 +465,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);

diff --git a/...ure/management/containerservice/v2020_02_01/ManagedClusterAgentPoolProfileProperties.java b/...ure/management/containerservice/v2020_02_01/ManagedClusterAgentPoolProfileProperties.java
@@ -20,8 +20,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',
@@ -77,7 +77,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;
 
     /**
@@ -207,7 +207,7 @@ public class ManagedClusterAgentPoolProfileProperties {
      *
      * @return the count value
      */
-    public int count() {
+    public Integer count() {
         return this.count;
     }
 
@@ -217,7 +217,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;
     }

diff --git a/...microsoft/azure/management/containerservice/v2020_02_01/implementation/AgentPoolImpl.java b/...microsoft/azure/management/containerservice/v2020_02_01/implementation/AgentPoolImpl.java
@@ -87,7 +87,7 @@ public List<String> availabilityZones() {
     }
 
     @Override
-    public int count() {
+    public Integer count() {
         return this.inner().count();
     }
 
@@ -198,18 +198,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);
@@ -222,6 +210,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);
@@ -306,6 +300,12 @@ public AgentPoolImpl withTags(Map<String, String> tags) {
         return this;
     }
 
+    @Override
+    public AgentPoolImpl withVmSize(ContainerServiceVMSizeTypes vmSize) {
+        this.inner().withVmSize(vmSize);
+        return this;
+    }
+
     @Override
     public AgentPoolImpl withVnetSubnetID(String vnetSubnetID) {
         this.inner().withVnetSubnetID(vnetSubnetID);

diff --git a/...icrosoft/azure/management/containerservice/v2020_02_01/implementation/AgentPoolInner.java b/...icrosoft/azure/management/containerservice/v2020_02_01/implementation/AgentPoolInner.java
@@ -28,8 +28,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',
@@ -85,7 +85,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;
 
     /**
@@ -228,7 +228,7 @@ public class AgentPoolInner extends SubResource {
      *
      * @return the count value
      */
-    public int count() {
+    public Integer count() {
         return this.count;
     }
 
@@ -238,7 +238,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;
     }

diff --git a/...oft/azure/management/containerservice/v2020_02_01/implementation/ManagedClusterInner.java b/...oft/azure/management/containerservice/v2020_02_01/implementation/ManagedClusterInner.java
@@ -111,7 +111,9 @@ public class ManagedClusterInner extends Resource {
     private Boolean enableRBAC;
 
     /**
-     * (PREVIEW) Whether to enable Kubernetes Pod security policy.
+     * (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.
      */
     @JsonProperty(value = "properties.enablePodSecurityPolicy")
     private Boolean enablePodSecurityPolicy;
@@ -376,7 +378,7 @@ public ManagedClusterInner withEnableRBAC(Boolean enableRBAC) {
     }
 
     /**
-     * Get (PREVIEW) Whether to enable Kubernetes Pod security policy.
+     * 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.
      *
      * @return the enablePodSecurityPolicy value
      */
@@ -385,7 +387,7 @@ public Boolean enablePodSecurityPolicy() {
     }
 
     /**
-     * Set (PREVIEW) Whether to enable Kubernetes Pod security policy.
+     * 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.
      *
      * @param enablePodSecurityPolicy the enablePodSecurityPolicy value to set
      * @return the ManagedClusterInner object itself.