mgmt, upgrade AKS to 2022-04-01 (#28985)

Azure · May 20, 2022 · 893882e · 893882e
1 parent c13cfc0
commit 893882e
Show file tree

Hide file tree

Showing 116 changed files with 932 additions and 619 deletions.
diff --git a/sdk/resourcemanager/api-specs.json b/sdk/resourcemanager/api-specs.json
@@ -71,7 +71,7 @@
     "dir": "azure-resourcemanager-containerservice",
     "source": "specification/containerservice/resource-manager/readme.md",
     "package": "com.azure.resourcemanager.containerservice",
-    "args": "--tag=package-2022-03 --preserve-model=ContainerServiceVMSizeTypes --rename-model=Ossku:OSSku"
+    "args": "--tag=package-2022-04 --preserve-model=ContainerServiceVMSizeTypes --rename-model=Ossku:OSSku"
   },
   "containerservice-hybrid": {
     "dir": "../resourcemanagerhybrid/azure-resourcemanager-containerservice",

diff --git a/sdk/resourcemanager/azure-resourcemanager-containerservice/CHANGELOG.md b/sdk/resourcemanager/azure-resourcemanager-containerservice/CHANGELOG.md
@@ -10,7 +10,7 @@
 
 #### Dependency Updates
 
-- Updated `api-version` to `2022-03-01`.
+- Updated `api-version` to `2022-04-01`.
 
 ## 2.14.0 (2022-04-11)
 

diff --git a/...rc/main/java/com/azure/resourcemanager/containerservice/fluent/models/AgentPoolInner.java b/...rc/main/java/com/azure/resourcemanager/containerservice/fluent/models/AgentPoolInner.java
@@ -509,11 +509,14 @@ public AgentPoolInner withMode(AgentPoolMode mode) {
     }
 
     /**
-     * Get the orchestratorVersion property: The version of Kubernetes running on the Agent Pool. As a best practice,
-     * you should upgrade all node pools in an AKS cluster to the same Kubernetes version. The node pool version must
-     * have the same major version as the control plane. The node pool minor version must be within two minor versions
-     * of the control plane version. The node pool version cannot be greater than the control plane version. For more
-     * information see [upgrading a node
+     * Get the orchestratorVersion property: The version of Kubernetes specified by the user. Both patch version
+     * &lt;major.minor.patch&gt; (e.g. 1.20.13) and &lt;major.minor&gt; (e.g. 1.20) are supported. When
+     * &lt;major.minor&gt; is specified, the latest supported GA patch version is chosen automatically. Updating the
+     * cluster with the same &lt;major.minor&gt; once it has been created (e.g. 1.14.x -&gt; 1.14) will not trigger an
+     * upgrade, even if a newer patch version is available. As a best practice, you should upgrade all node pools in an
+     * AKS cluster to the same Kubernetes version. The node pool version must have the same major version as the control
+     * plane. The node pool minor version must be within two minor versions of the control plane version. The node pool
+     * version cannot be greater than the control plane version. For more information see [upgrading a node
      * pool](https://docs.microsoft.com/azure/aks/use-multiple-node-pools#upgrade-a-node-pool).
      *
      * @return the orchestratorVersion value.
@@ -523,11 +526,14 @@ public String orchestratorVersion() {
     }
 
     /**
-     * Set the orchestratorVersion property: The version of Kubernetes running on the Agent Pool. As a best practice,
-     * you should upgrade all node pools in an AKS cluster to the same Kubernetes version. The node pool version must
-     * have the same major version as the control plane. The node pool minor version must be within two minor versions
-     * of the control plane version. The node pool version cannot be greater than the control plane version. For more
-     * information see [upgrading a node
+     * Set the orchestratorVersion property: The version of Kubernetes specified by the user. Both patch version
+     * &lt;major.minor.patch&gt; (e.g. 1.20.13) and &lt;major.minor&gt; (e.g. 1.20) are supported. When
+     * &lt;major.minor&gt; is specified, the latest supported GA patch version is chosen automatically. Updating the
+     * cluster with the same &lt;major.minor&gt; once it has been created (e.g. 1.14.x -&gt; 1.14) will not trigger an
+     * upgrade, even if a newer patch version is available. As a best practice, you should upgrade all node pools in an
+     * AKS cluster to the same Kubernetes version. The node pool version must have the same major version as the control
+     * plane. The node pool minor version must be within two minor versions of the control plane version. The node pool
+     * version cannot be greater than the control plane version. For more information see [upgrading a node
      * pool](https://docs.microsoft.com/azure/aks/use-multiple-node-pools#upgrade-a-node-pool).
      *
      * @param orchestratorVersion the orchestratorVersion value to set.
@@ -541,6 +547,18 @@ public AgentPoolInner withOrchestratorVersion(String orchestratorVersion) {
         return this;
     }
 
+    /**
+     * Get the currentOrchestratorVersion property: The version of Kubernetes the Agent Pool is running. If
+     * orchestratorVersion is a fully specified version &lt;major.minor.patch&gt;, this field will be exactly equal to
+     * it. If orchestratorVersion is &lt;major.minor&gt;, this field will contain the full &lt;major.minor.patch&gt;
+     * version being used.
+     *
+     * @return the currentOrchestratorVersion value.
+     */
+    public String currentOrchestratorVersion() {
+        return this.innerProperties() == null ? null : this.innerProperties().currentOrchestratorVersion();
+    }
+
     /**
      * Get the nodeImageVersion property: The version of node image.
      *

diff --git a/...ourcemanager/containerservice/fluent/models/ManagedClusterAgentPoolProfileProperties.java b/...ourcemanager/containerservice/fluent/models/ManagedClusterAgentPoolProfileProperties.java
@@ -157,18 +157,33 @@ public class ManagedClusterAgentPoolProfileProperties {
     private AgentPoolMode mode;
 
     /*
-     * The version of Kubernetes running on the Agent Pool. As a best practice,
-     * you should upgrade all node pools in an AKS cluster to the same
-     * Kubernetes version. The node pool version must have the same major
-     * version as the control plane. The node pool minor version must be within
-     * two minor versions of the control plane version. The node pool version
-     * cannot be greater than the control plane version. For more information
-     * see [upgrading a node
+     * The version of Kubernetes specified by the user. Both patch version
+     * <major.minor.patch> (e.g. 1.20.13) and <major.minor> (e.g. 1.20) are
+     * supported. When <major.minor> is specified, the latest supported GA
+     * patch version is chosen automatically. Updating the cluster with the
+     * same <major.minor> once it has been created (e.g. 1.14.x -> 1.14) will
+     * not trigger an upgrade, even if a newer patch version is available. As a
+     * best practice, you should upgrade all node pools in an AKS cluster to
+     * the same Kubernetes version. The node pool version must have the same
+     * major version as the control plane. The node pool minor version must be
+     * within two minor versions of the control plane version. The node pool
+     * version cannot be greater than the control plane version. For more
+     * information see [upgrading a node
      * pool](https://docs.microsoft.com/azure/aks/use-multiple-node-pools#upgrade-a-node-pool).
      */
     @JsonProperty(value = "orchestratorVersion")
     private String orchestratorVersion;
 
+    /*
+     * The version of Kubernetes the Agent Pool is running. If
+     * orchestratorVersion is a fully specified version <major.minor.patch>,
+     * this field will be exactly equal to it. If orchestratorVersion is
+     * <major.minor>, this field will contain the full <major.minor.patch>
+     * version being used.
+     */
+    @JsonProperty(value = "currentOrchestratorVersion", access = JsonProperty.Access.WRITE_ONLY)
+    private String currentOrchestratorVersion;
+
     /*
      * The version of node image
      */
@@ -703,11 +718,14 @@ public ManagedClusterAgentPoolProfileProperties withMode(AgentPoolMode mode) {
     }
 
     /**
-     * Get the orchestratorVersion property: The version of Kubernetes running on the Agent Pool. As a best practice,
-     * you should upgrade all node pools in an AKS cluster to the same Kubernetes version. The node pool version must
-     * have the same major version as the control plane. The node pool minor version must be within two minor versions
-     * of the control plane version. The node pool version cannot be greater than the control plane version. For more
-     * information see [upgrading a node
+     * Get the orchestratorVersion property: The version of Kubernetes specified by the user. Both patch version
+     * &lt;major.minor.patch&gt; (e.g. 1.20.13) and &lt;major.minor&gt; (e.g. 1.20) are supported. When
+     * &lt;major.minor&gt; is specified, the latest supported GA patch version is chosen automatically. Updating the
+     * cluster with the same &lt;major.minor&gt; once it has been created (e.g. 1.14.x -&gt; 1.14) will not trigger an
+     * upgrade, even if a newer patch version is available. As a best practice, you should upgrade all node pools in an
+     * AKS cluster to the same Kubernetes version. The node pool version must have the same major version as the control
+     * plane. The node pool minor version must be within two minor versions of the control plane version. The node pool
+     * version cannot be greater than the control plane version. For more information see [upgrading a node
      * pool](https://docs.microsoft.com/azure/aks/use-multiple-node-pools#upgrade-a-node-pool).
      *
      * @return the orchestratorVersion value.
@@ -717,11 +735,14 @@ public String orchestratorVersion() {
     }
 
     /**
-     * Set the orchestratorVersion property: The version of Kubernetes running on the Agent Pool. As a best practice,
-     * you should upgrade all node pools in an AKS cluster to the same Kubernetes version. The node pool version must
-     * have the same major version as the control plane. The node pool minor version must be within two minor versions
-     * of the control plane version. The node pool version cannot be greater than the control plane version. For more
-     * information see [upgrading a node
+     * Set the orchestratorVersion property: The version of Kubernetes specified by the user. Both patch version
+     * &lt;major.minor.patch&gt; (e.g. 1.20.13) and &lt;major.minor&gt; (e.g. 1.20) are supported. When
+     * &lt;major.minor&gt; is specified, the latest supported GA patch version is chosen automatically. Updating the
+     * cluster with the same &lt;major.minor&gt; once it has been created (e.g. 1.14.x -&gt; 1.14) will not trigger an
+     * upgrade, even if a newer patch version is available. As a best practice, you should upgrade all node pools in an
+     * AKS cluster to the same Kubernetes version. The node pool version must have the same major version as the control
+     * plane. The node pool minor version must be within two minor versions of the control plane version. The node pool
+     * version cannot be greater than the control plane version. For more information see [upgrading a node
      * pool](https://docs.microsoft.com/azure/aks/use-multiple-node-pools#upgrade-a-node-pool).
      *
      * @param orchestratorVersion the orchestratorVersion value to set.
@@ -732,6 +753,18 @@ public ManagedClusterAgentPoolProfileProperties withOrchestratorVersion(String o
         return this;
     }
 
+    /**
+     * Get the currentOrchestratorVersion property: The version of Kubernetes the Agent Pool is running. If
+     * orchestratorVersion is a fully specified version &lt;major.minor.patch&gt;, this field will be exactly equal to
+     * it. If orchestratorVersion is &lt;major.minor&gt;, this field will contain the full &lt;major.minor.patch&gt;
+     * version being used.
+     *
+     * @return the currentOrchestratorVersion value.
+     */
+    public String currentOrchestratorVersion() {
+        return this.currentOrchestratorVersion;
+    }
+
     /**
      * Get the nodeImageVersion property: The version of node image.
      *

diff --git a/...in/java/com/azure/resourcemanager/containerservice/fluent/models/ManagedClusterInner.java b/...in/java/com/azure/resourcemanager/containerservice/fluent/models/ManagedClusterInner.java
@@ -21,6 +21,7 @@
 import com.azure.resourcemanager.containerservice.models.ManagedClusterSecurityProfile;
 import com.azure.resourcemanager.containerservice.models.ManagedClusterServicePrincipalProfile;
 import com.azure.resourcemanager.containerservice.models.ManagedClusterSku;
+import com.azure.resourcemanager.containerservice.models.ManagedClusterStorageProfile;
 import com.azure.resourcemanager.containerservice.models.ManagedClusterWindowsProfile;
 import com.azure.resourcemanager.containerservice.models.PowerState;
 import com.azure.resourcemanager.containerservice.models.PublicNetworkAccess;
@@ -167,11 +168,14 @@ public Integer maxAgentPools() {
     }
 
     /**
-     * Get the kubernetesVersion property: The version of Kubernetes the Managed Cluster is running. When you upgrade a
-     * supported AKS cluster, Kubernetes minor versions cannot be skipped. All upgrades must be performed sequentially
-     * by major version number. For example, upgrades between 1.14.x -&gt; 1.15.x or 1.15.x -&gt; 1.16.x are allowed,
-     * however 1.14.x -&gt; 1.16.x is not allowed. See [upgrading an AKS
-     * cluster](https://docs.microsoft.com/azure/aks/upgrade-cluster) for more details.
+     * Get the kubernetesVersion property: The version of Kubernetes specified by the user. Both patch version
+     * &lt;major.minor.patch&gt; (e.g. 1.20.13) and &lt;major.minor&gt; (e.g. 1.20) are supported. When
+     * &lt;major.minor&gt; is specified, the latest supported GA patch version is chosen automatically. Updating the
+     * cluster with the same &lt;major.minor&gt; once it has been created (e.g. 1.14.x -&gt; 1.14) will not trigger an
+     * upgrade, even if a newer patch version is available. When you upgrade a supported AKS cluster, Kubernetes minor
+     * versions cannot be skipped. All upgrades must be performed sequentially by major version number. For example,
+     * upgrades between 1.14.x -&gt; 1.15.x or 1.15.x -&gt; 1.16.x are allowed, however 1.14.x -&gt; 1.16.x is not
+     * allowed. See [upgrading an AKS cluster](https://docs.microsoft.com/azure/aks/upgrade-cluster) for more details.
      *
      * @return the kubernetesVersion value.
      */
@@ -180,11 +184,14 @@ public String kubernetesVersion() {
     }
 
     /**
-     * Set the kubernetesVersion property: The version of Kubernetes the Managed Cluster is running. When you upgrade a
-     * supported AKS cluster, Kubernetes minor versions cannot be skipped. All upgrades must be performed sequentially
-     * by major version number. For example, upgrades between 1.14.x -&gt; 1.15.x or 1.15.x -&gt; 1.16.x are allowed,
-     * however 1.14.x -&gt; 1.16.x is not allowed. See [upgrading an AKS
-     * cluster](https://docs.microsoft.com/azure/aks/upgrade-cluster) for more details.
+     * Set the kubernetesVersion property: The version of Kubernetes specified by the user. Both patch version
+     * &lt;major.minor.patch&gt; (e.g. 1.20.13) and &lt;major.minor&gt; (e.g. 1.20) are supported. When
+     * &lt;major.minor&gt; is specified, the latest supported GA patch version is chosen automatically. Updating the
+     * cluster with the same &lt;major.minor&gt; once it has been created (e.g. 1.14.x -&gt; 1.14) will not trigger an
+     * upgrade, even if a newer patch version is available. When you upgrade a supported AKS cluster, Kubernetes minor
+     * versions cannot be skipped. All upgrades must be performed sequentially by major version number. For example,
+     * upgrades between 1.14.x -&gt; 1.15.x or 1.15.x -&gt; 1.16.x are allowed, however 1.14.x -&gt; 1.16.x is not
+     * allowed. See [upgrading an AKS cluster](https://docs.microsoft.com/azure/aks/upgrade-cluster) for more details.
      *
      * @param kubernetesVersion the kubernetesVersion value to set.
      * @return the ManagedClusterInner object itself.
@@ -197,6 +204,18 @@ public ManagedClusterInner withKubernetesVersion(String kubernetesVersion) {
         return this;
     }
 
+    /**
+     * Get the currentKubernetesVersion property: The version of Kubernetes the Managed Cluster is running. If
+     * kubernetesVersion was a fully specified version &lt;major.minor.patch&gt;, this field will be exactly equal to
+     * it. If kubernetesVersion was &lt;major.minor&gt;, this field will contain the full &lt;major.minor.patch&gt;
+     * version being used.
+     *
+     * @return the currentKubernetesVersion value.
+     */
+    public String currentKubernetesVersion() {
+        return this.innerProperties() == null ? null : this.innerProperties().currentKubernetesVersion();
+    }
+
     /**
      * Get the dnsPrefix property: The DNS prefix of the Managed Cluster. This cannot be updated once the Managed
      * Cluster has been created.
@@ -758,6 +777,29 @@ public ManagedClusterInner withSecurityProfile(ManagedClusterSecurityProfile sec
         return this;
     }
 
+    /**
+     * Get the storageProfile property: Storage profile for the managed cluster.
+     *
+     * @return the storageProfile value.
+     */
+    public ManagedClusterStorageProfile storageProfile() {
+        return this.innerProperties() == null ? null : this.innerProperties().storageProfile();
+    }
+
+    /**
+     * Set the storageProfile property: Storage profile for the managed cluster.
+     *
+     * @param storageProfile the storageProfile value to set.
+     * @return the ManagedClusterInner object itself.
+     */
+    public ManagedClusterInner withStorageProfile(ManagedClusterStorageProfile storageProfile) {
+        if (this.innerProperties() == null) {
+            this.innerProperties = new ManagedClusterProperties();
+        }
+        this.innerProperties().withStorageProfile(storageProfile);
+        return this;
+    }
+
     /**
      * Get the publicNetworkAccess property: PublicNetworkAccess of the managedCluster Allow or deny public network
      * access for AKS.