mgmt, upgrade AKS 2023-08-01; support nodeResourceGroup (Azure#36964)

* regen

* support agentPoolResourceGroup

Author: weidongxu-microsoft

sdk/resourcemanager/api-specs.json

@@ -71,7 +71,7 @@
     "dir": "azure-resourcemanager-containerservice",
     "source": "specification/containerservice/resource-manager/Microsoft.ContainerService/aks/readme.md",
     "package": "com.azure.resourcemanager.containerservice",
-    "args": "--tag=package-2023-07 --preserve-model=ContainerServiceVMSizeTypes --rename-model=Ossku:OSSku"
+    "args": "--tag=package-2023-08 --modelerfour.lenient-model-deduplication --preserve-model=ContainerServiceVMSizeTypes --rename-model=Ossku:OSSku"
   },
   "containerservice-hybrid": {
     "dir": "../resourcemanagerhybrid/azure-resourcemanager-containerservice",

sdk/resourcemanager/azure-resourcemanager-containerservice/CHANGELOG.md

@@ -4,12 +4,14 @@
 
 ### Features Added
 
-### Breaking Changes
-
-### Bugs Fixed
+- Supported specifying the resource group for agent pool nodes when creating `KubernetesCluster`.
 
 ### Other Changes
 
+#### Dependency Updates
+
+- Updated `api-version` to `2023-08-01`.
+
 ## 2.30.0 (2023-08-25)
 
 ### Other Changes

sdk/resourcemanager/azure-resourcemanager-containerservice/assets.json

@@ -2,5 +2,5 @@
   "AssetsRepo": "Azure/azure-sdk-assets",
   "AssetsRepoPrefixPath": "java",
   "TagPrefix": "java/resourcemanager/azure-resourcemanager-containerservice",
-  "Tag": "java/resourcemanager/azure-resourcemanager-containerservice_38fae7edd6"
+  "Tag": "java/resourcemanager/azure-resourcemanager-containerservice_7eed2a3ab4"
 }

sdk/resourcemanager/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/ManagedClustersClient.java

@@ -18,6 +18,8 @@
 import com.azure.resourcemanager.containerservice.fluent.models.ManagedClusterAccessProfileInner;
 import com.azure.resourcemanager.containerservice.fluent.models.ManagedClusterInner;
 import com.azure.resourcemanager.containerservice.fluent.models.ManagedClusterUpgradeProfileInner;
+import com.azure.resourcemanager.containerservice.fluent.models.MeshRevisionProfileInner;
+import com.azure.resourcemanager.containerservice.fluent.models.MeshUpgradeProfileInner;
 import com.azure.resourcemanager.containerservice.fluent.models.OSOptionProfileInner;
 import com.azure.resourcemanager.containerservice.fluent.models.OutboundEnvironmentEndpointInner;
 import com.azure.resourcemanager.containerservice.fluent.models.RunCommandResultInner;
@@ -1962,4 +1964,218 @@ PagedIterable<OutboundEnvironmentEndpointInner> listOutboundNetworkDependenciesE
     @ServiceMethod(returns = ReturnType.COLLECTION)
     PagedIterable<OutboundEnvironmentEndpointInner> listOutboundNetworkDependenciesEndpoints(
         String resourceGroupName, String resourceName, Context context);
+
+    /**
+     * Lists mesh revision profiles for all meshes in the specified location.
+     *
+     * <p>Contains extra metadata on each revision, including supported revisions, cluster compatibility and available
+     * upgrades.
+     *
+     * @param location The name of Azure region.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return holds an array of MeshRevisionsProfiles as paginated response with {@link PagedFlux}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedFlux<MeshRevisionProfileInner> listMeshRevisionProfilesAsync(String location);
+
+    /**
+     * Lists mesh revision profiles for all meshes in the specified location.
+     *
+     * <p>Contains extra metadata on each revision, including supported revisions, cluster compatibility and available
+     * upgrades.
+     *
+     * @param location The name of Azure region.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return holds an array of MeshRevisionsProfiles as paginated response with {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedIterable<MeshRevisionProfileInner> listMeshRevisionProfiles(String location);
+
+    /**
+     * Lists mesh revision profiles for all meshes in the specified location.
+     *
+     * <p>Contains extra metadata on each revision, including supported revisions, cluster compatibility and available
+     * upgrades.
+     *
+     * @param location The name of Azure region.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return holds an array of MeshRevisionsProfiles as paginated response with {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedIterable<MeshRevisionProfileInner> listMeshRevisionProfiles(String location, Context context);
+
+    /**
+     * Gets a mesh revision profile for a specified mesh in the specified location.
+     *
+     * <p>Contains extra metadata on the revision, including supported revisions, cluster compatibility and available
+     * upgrades.
+     *
+     * @param location The name of Azure region.
+     * @param mode The mode of the mesh.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return mesh revision profile for a mesh along with {@link Response} on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<Response<MeshRevisionProfileInner>> getMeshRevisionProfileWithResponseAsync(String location, String mode);
+
+    /**
+     * Gets a mesh revision profile for a specified mesh in the specified location.
+     *
+     * <p>Contains extra metadata on the revision, including supported revisions, cluster compatibility and available
+     * upgrades.
+     *
+     * @param location The name of Azure region.
+     * @param mode The mode of the mesh.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return mesh revision profile for a mesh on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<MeshRevisionProfileInner> getMeshRevisionProfileAsync(String location, String mode);
+
+    /**
+     * Gets a mesh revision profile for a specified mesh in the specified location.
+     *
+     * <p>Contains extra metadata on the revision, including supported revisions, cluster compatibility and available
+     * upgrades.
+     *
+     * @param location The name of Azure region.
+     * @param mode The mode of the mesh.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return mesh revision profile for a mesh along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Response<MeshRevisionProfileInner> getMeshRevisionProfileWithResponse(
+        String location, String mode, Context context);
+
+    /**
+     * Gets a mesh revision profile for a specified mesh in the specified location.
+     *
+     * <p>Contains extra metadata on the revision, including supported revisions, cluster compatibility and available
+     * upgrades.
+     *
+     * @param location The name of Azure region.
+     * @param mode The mode of the mesh.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return mesh revision profile for a mesh.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    MeshRevisionProfileInner getMeshRevisionProfile(String location, String mode);
+
+    /**
+     * Lists available upgrades for all service meshes in a specific cluster.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return holds an array of MeshUpgradeProfiles as paginated response with {@link PagedFlux}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedFlux<MeshUpgradeProfileInner> listMeshUpgradeProfilesAsync(String resourceGroupName, String resourceName);
+
+    /**
+     * Lists available upgrades for all service meshes in a specific cluster.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return holds an array of MeshUpgradeProfiles as paginated response with {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedIterable<MeshUpgradeProfileInner> listMeshUpgradeProfiles(String resourceGroupName, String resourceName);
+
+    /**
+     * Lists available upgrades for all service meshes in a specific cluster.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return holds an array of MeshUpgradeProfiles as paginated response with {@link PagedIterable}.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedIterable<MeshUpgradeProfileInner> listMeshUpgradeProfiles(
+        String resourceGroupName, String resourceName, Context context);
+
+    /**
+     * Gets available upgrades for a service mesh in a cluster.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param mode The mode of the mesh.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return available upgrades for a service mesh in a cluster along with {@link Response} on successful completion
+     *     of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<Response<MeshUpgradeProfileInner>> getMeshUpgradeProfileWithResponseAsync(
+        String resourceGroupName, String resourceName, String mode);
+
+    /**
+     * Gets available upgrades for a service mesh in a cluster.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param mode The mode of the mesh.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return available upgrades for a service mesh in a cluster on successful completion of {@link Mono}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<MeshUpgradeProfileInner> getMeshUpgradeProfileAsync(
+        String resourceGroupName, String resourceName, String mode);
+
+    /**
+     * Gets available upgrades for a service mesh in a cluster.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param mode The mode of the mesh.
+     * @param context The context to associate with this operation.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return available upgrades for a service mesh in a cluster along with {@link Response}.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Response<MeshUpgradeProfileInner> getMeshUpgradeProfileWithResponse(
+        String resourceGroupName, String resourceName, String mode, Context context);
+
+    /**
+     * Gets available upgrades for a service mesh in a cluster.
+     *
+     * @param resourceGroupName The name of the resource group. The name is case insensitive.
+     * @param resourceName The name of the managed cluster resource.
+     * @param mode The mode of the mesh.
+     * @throws IllegalArgumentException thrown if parameters fail the validation.
+     * @throws com.azure.core.management.exception.ManagementException thrown if the request is rejected by server.
+     * @throws RuntimeException all other wrapped checked exceptions if the request fails to be sent.
+     * @return available upgrades for a service mesh in a cluster.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    MeshUpgradeProfileInner getMeshUpgradeProfile(String resourceGroupName, String resourceName, String mode);
 }

sdk/resourcemanager/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/ManagedClusterAccessProfileInner.java

@@ -67,7 +67,7 @@ public ManagedClusterAccessProfileInner withTags(Map<String, String> tags) {
      * @return the kubeConfig value.
      */
     public byte[] kubeConfig() {
-        return this.innerProperties() == null ? new byte[0] : this.innerProperties().kubeConfig();
+        return this.innerProperties() == null ? null : this.innerProperties().kubeConfig();
     }
 
     /**

sdk/resourcemanager/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/ManagedClusterInner.java

@@ -31,6 +31,7 @@
 import com.azure.resourcemanager.containerservice.models.ManagedClusterWorkloadAutoScalerProfile;
 import com.azure.resourcemanager.containerservice.models.PowerState;
 import com.azure.resourcemanager.containerservice.models.PublicNetworkAccess;
+import com.azure.resourcemanager.containerservice.models.ServiceMeshProfile;
 import com.azure.resourcemanager.containerservice.models.UserAssignedIdentity;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import java.util.List;
@@ -993,6 +994,39 @@ public ManagedClusterInner withAzureMonitorProfile(ManagedClusterAzureMonitorPro
         return this;
     }
 
+    /**
+     * Get the serviceMeshProfile property: Service mesh profile for a managed cluster.
+     *
+     * @return the serviceMeshProfile value.
+     */
+    public ServiceMeshProfile serviceMeshProfile() {
+        return this.innerProperties() == null ? null : this.innerProperties().serviceMeshProfile();
+    }
+
+    /**
+     * Set the serviceMeshProfile property: Service mesh profile for a managed cluster.
+     *
+     * @param serviceMeshProfile the serviceMeshProfile value to set.
+     * @return the ManagedClusterInner object itself.
+     */
+    public ManagedClusterInner withServiceMeshProfile(ServiceMeshProfile serviceMeshProfile) {
+        if (this.innerProperties() == null) {
+            this.innerProperties = new ManagedClusterProperties();
+        }
+        this.innerProperties().withServiceMeshProfile(serviceMeshProfile);
+        return this;
+    }
+
+    /**
+     * Get the resourceUid property: The resourceUID uniquely identifies ManagedClusters that reuse ARM ResourceIds
+     * (i.e: create, delete, create sequence).
+     *
+     * @return the resourceUid value.
+     */
+    public String resourceUid() {
+        return this.innerProperties() == null ? null : this.innerProperties().resourceUid();
+    }
+
     /**
      * Validates the instance.
      *

sdk/resourcemanager/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/fluent/models/ManagedClusterProperties.java

@@ -26,6 +26,7 @@
 import com.azure.resourcemanager.containerservice.models.ManagedClusterWorkloadAutoScalerProfile;
 import com.azure.resourcemanager.containerservice.models.PowerState;
 import com.azure.resourcemanager.containerservice.models.PublicNetworkAccess;
+import com.azure.resourcemanager.containerservice.models.ServiceMeshProfile;
 import com.azure.resourcemanager.containerservice.models.UserAssignedIdentity;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.annotation.JsonProperty;
@@ -295,6 +296,19 @@ public final class ManagedClusterProperties {
     @JsonProperty(value = "azureMonitorProfile")
     private ManagedClusterAzureMonitorProfile azureMonitorProfile;
 
+    /*
+     * Service mesh profile for a managed cluster.
+     */
+    @JsonProperty(value = "serviceMeshProfile")
+    private ServiceMeshProfile serviceMeshProfile;
+
+    /*
+     * The resourceUID uniquely identifies ManagedClusters that reuse ARM ResourceIds (i.e: create, delete, create
+     * sequence)
+     */
+    @JsonProperty(value = "resourceUID", access = JsonProperty.Access.WRITE_ONLY)
+    private String resourceUid;
+
     /** Creates an instance of ManagedClusterProperties class. */
     public ManagedClusterProperties() {
     }
@@ -1038,6 +1052,36 @@ public ManagedClusterProperties withAzureMonitorProfile(ManagedClusterAzureMonit
         return this;
     }
 
+    /**
+     * Get the serviceMeshProfile property: Service mesh profile for a managed cluster.
+     *
+     * @return the serviceMeshProfile value.
+     */
+    public ServiceMeshProfile serviceMeshProfile() {
+        return this.serviceMeshProfile;
+    }
+
+    /**
+     * Set the serviceMeshProfile property: Service mesh profile for a managed cluster.
+     *
+     * @param serviceMeshProfile the serviceMeshProfile value to set.
+     * @return the ManagedClusterProperties object itself.
+     */
+    public ManagedClusterProperties withServiceMeshProfile(ServiceMeshProfile serviceMeshProfile) {
+        this.serviceMeshProfile = serviceMeshProfile;
+        return this;
+    }
+
+    /**
+     * Get the resourceUid property: The resourceUID uniquely identifies ManagedClusters that reuse ARM ResourceIds
+     * (i.e: create, delete, create sequence).
+     *
+     * @return the resourceUid value.
+     */
+    public String resourceUid() {
+        return this.resourceUid;
+    }
+
     /**
      * Validates the instance.
      *
@@ -1121,5 +1165,8 @@ public void validate() {
         if (azureMonitorProfile() != null) {
             azureMonitorProfile().validate();
         }
+        if (serviceMeshProfile() != null) {
+            serviceMeshProfile().validate();
+        }
     }
 }