mgmt, upgrade aks (Azure#22136)

YijunXieMS · Jun 8, 2021 · 0cebceb · 0cebceb
1 parent e2afc2c
commit 0cebceb
Show file tree

Hide file tree

Showing 29 changed files with 1,189 additions and 228 deletions.
diff --git a/sdk/resourcemanager/api-specs.json b/sdk/resourcemanager/api-specs.json
@@ -102,7 +102,7 @@
     "dir": "azure-resourcemanager-containerservice",
     "source": "specification/containerservice/resource-manager/readme.md",
     "package": "com.azure.resourcemanager.containerservice",
-    "args": "--payload-flattening-threshold=1 --tag=package-2021-03 --title=ContainerServiceManagementClient --description=\"Container Service Client\" --remove-model=BaseManagedCluster --rename-model=ManagedClusterIdentityUserAssignedIdentitiesValue:ManagedClusterIdentityUserAssignedIdentities,ManagedClusterPropertiesIdentityProfile:ManagedClusterPropertiesIdentityProfileValue",
+    "args": "--payload-flattening-threshold=1 --tag=package-2021-05 --title=ContainerServiceManagementClient --description=\"Container Service Client\" --remove-model=BaseManagedCluster --rename-model=ManagedClusterIdentityUserAssignedIdentitiesValue:ManagedClusterIdentityUserAssignedIdentities,ManagedClusterPropertiesIdentityProfile:ManagedClusterPropertiesIdentityProfileValue",
     "note": "Remove 'final' from 'ManagedClusterAgentPoolProfile'"
   },
   "cosmos": {

diff --git a/sdk/resourcemanager/azure-resourcemanager-containerservice/CHANGELOG.md b/sdk/resourcemanager/azure-resourcemanager-containerservice/CHANGELOG.md
@@ -2,6 +2,7 @@
 
 ## 2.6.0-beta.1 (Unreleased)
 
+- Updated `api-version` to `2021-05-01`
 - Supported spot virtual machine for agent pool of `KubernetesCluster`.
 
 ## 2.5.0 (2021-05-28)

diff --git a/sdk/resourcemanager/azure-resourcemanager-containerservice/pom.xml b/sdk/resourcemanager/azure-resourcemanager-containerservice/pom.xml
@@ -148,6 +148,8 @@
         <artifactId>revapi-maven-plugin</artifactId>
         <version>0.11.2</version> <!-- {x-version-update;org.revapi:revapi-maven-plugin;external_dependency} -->
         <configuration>
+          <skip>true</skip>
+
           <analysisConfiguration>
             <revapi.ignore>
               <item>

diff --git a/...a/com/azure/resourcemanager/containerservice/fluent/ContainerServiceManagementClient.java b/...a/com/azure/resourcemanager/containerservice/fluent/ContainerServiceManagementClient.java
@@ -38,6 +38,20 @@ public interface ContainerServiceManagementClient {
      */
     Duration getDefaultPollInterval();
 
+    /**
+     * Gets the OpenShiftManagedClustersClient object to access its operations.
+     *
+     * @return the OpenShiftManagedClustersClient object.
+     */
+    OpenShiftManagedClustersClient getOpenShiftManagedClusters();
+
+    /**
+     * Gets the ContainerServicesClient object to access its operations.
+     *
+     * @return the ContainerServicesClient object.
+     */
+    ContainerServicesClient getContainerServices();
+
     /**
      * Gets the OperationsClient object to access its operations.
      *
@@ -86,18 +100,4 @@ public interface ContainerServiceManagementClient {
      * @return the ResolvePrivateLinkServiceIdsClient object.
      */
     ResolvePrivateLinkServiceIdsClient getResolvePrivateLinkServiceIds();
-
-    /**
-     * Gets the OpenShiftManagedClustersClient object to access its operations.
-     *
-     * @return the OpenShiftManagedClustersClient object.
-     */
-    OpenShiftManagedClustersClient getOpenShiftManagedClusters();
-
-    /**
-     * Gets the ContainerServicesClient object to access its operations.
-     *
-     * @return the ContainerServicesClient object.
-     */
-    ContainerServicesClient getContainerServices();
 }
diff --git a/...rc/main/java/com/azure/resourcemanager/containerservice/fluent/ManagedClustersClient.java b/...rc/main/java/com/azure/resourcemanager/containerservice/fluent/ManagedClustersClient.java
@@ -18,6 +18,7 @@
 import com.azure.resourcemanager.containerservice.fluent.models.ManagedClusterInner;
 import com.azure.resourcemanager.containerservice.fluent.models.ManagedClusterUpgradeProfileInner;
 import com.azure.resourcemanager.containerservice.fluent.models.OSOptionProfileInner;
+import com.azure.resourcemanager.containerservice.fluent.models.OutboundEnvironmentEndpointInner;
 import com.azure.resourcemanager.containerservice.fluent.models.RunCommandResultInner;
 import com.azure.resourcemanager.containerservice.models.ManagedClusterAadProfile;
 import com.azure.resourcemanager.containerservice.models.ManagedClusterServicePrincipalProfile;
@@ -318,14 +319,30 @@ Response<ManagedClusterAccessProfileInner> getAccessProfileWithResponse(
      *
      * @param resourceGroupName The name of the resource group.
      * @param resourceName The name of the managed cluster resource.
+     * @param serverFqdn server fqdn type for credentials to be returned.
      * @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 cluster admin credential of the managed cluster with a specified resource group and name.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     Mono<Response<CredentialResultsInner>> listClusterAdminCredentialsWithResponseAsync(
-        String resourceGroupName, String resourceName);
+        String resourceGroupName, String resourceName, String serverFqdn);
+
+    /**
+     * Gets cluster admin credential of the managed cluster with a specified resource group and name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param serverFqdn server fqdn type for credentials to be returned.
+     * @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 cluster admin credential of the managed cluster with a specified resource group and name.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<CredentialResultsInner> listClusterAdminCredentialsAsync(
+        String resourceGroupName, String resourceName, String serverFqdn);
 
     /**
      * Gets cluster admin credential of the managed cluster with a specified resource group and name.
@@ -358,6 +375,7 @@ Mono<Response<CredentialResultsInner>> listClusterAdminCredentialsWithResponseAs
      *
      * @param resourceGroupName The name of the resource group.
      * @param resourceName The name of the managed cluster resource.
+     * @param serverFqdn server fqdn type for credentials to be returned.
      * @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.
@@ -366,21 +384,37 @@ Mono<Response<CredentialResultsInner>> listClusterAdminCredentialsWithResponseAs
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     Response<CredentialResultsInner> listClusterAdminCredentialsWithResponse(
-        String resourceGroupName, String resourceName, Context context);
+        String resourceGroupName, String resourceName, String serverFqdn, Context context);
 
     /**
      * Gets cluster user credential of the managed cluster with a specified resource group and name.
      *
      * @param resourceGroupName The name of the resource group.
      * @param resourceName The name of the managed cluster resource.
+     * @param serverFqdn server fqdn type for credentials to be returned.
      * @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 cluster user credential of the managed cluster with a specified resource group and name.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     Mono<Response<CredentialResultsInner>> listClusterUserCredentialsWithResponseAsync(
-        String resourceGroupName, String resourceName);
+        String resourceGroupName, String resourceName, String serverFqdn);
+
+    /**
+     * Gets cluster user credential of the managed cluster with a specified resource group and name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param serverFqdn server fqdn type for credentials to be returned.
+     * @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 cluster user credential of the managed cluster with a specified resource group and name.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<CredentialResultsInner> listClusterUserCredentialsAsync(
+        String resourceGroupName, String resourceName, String serverFqdn);
 
     /**
      * Gets cluster user credential of the managed cluster with a specified resource group and name.
@@ -413,6 +447,7 @@ Mono<Response<CredentialResultsInner>> listClusterUserCredentialsWithResponseAsy
      *
      * @param resourceGroupName The name of the resource group.
      * @param resourceName The name of the managed cluster resource.
+     * @param serverFqdn server fqdn type for credentials to be returned.
      * @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.
@@ -421,21 +456,37 @@ Mono<Response<CredentialResultsInner>> listClusterUserCredentialsWithResponseAsy
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     Response<CredentialResultsInner> listClusterUserCredentialsWithResponse(
-        String resourceGroupName, String resourceName, Context context);
+        String resourceGroupName, String resourceName, String serverFqdn, Context context);
 
     /**
      * Gets cluster monitoring user credential of the managed cluster with a specified resource group and name.
      *
      * @param resourceGroupName The name of the resource group.
      * @param resourceName The name of the managed cluster resource.
+     * @param serverFqdn server fqdn type for credentials to be returned.
      * @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 cluster monitoring user credential of the managed cluster with a specified resource group and name.
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     Mono<Response<CredentialResultsInner>> listClusterMonitoringUserCredentialsWithResponseAsync(
-        String resourceGroupName, String resourceName);
+        String resourceGroupName, String resourceName, String serverFqdn);
+
+    /**
+     * Gets cluster monitoring user credential of the managed cluster with a specified resource group and name.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @param resourceName The name of the managed cluster resource.
+     * @param serverFqdn server fqdn type for credentials to be returned.
+     * @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 cluster monitoring user credential of the managed cluster with a specified resource group and name.
+     */
+    @ServiceMethod(returns = ReturnType.SINGLE)
+    Mono<CredentialResultsInner> listClusterMonitoringUserCredentialsAsync(
+        String resourceGroupName, String resourceName, String serverFqdn);
 
     /**
      * Gets cluster monitoring user credential of the managed cluster with a specified resource group and name.
@@ -469,6 +520,7 @@ Mono<CredentialResultsInner> listClusterMonitoringUserCredentialsAsync(
      *
      * @param resourceGroupName The name of the resource group.
      * @param resourceName The name of the managed cluster resource.
+     * @param serverFqdn server fqdn type for credentials to be returned.
      * @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.
@@ -477,7 +529,7 @@ Mono<CredentialResultsInner> listClusterMonitoringUserCredentialsAsync(
      */
     @ServiceMethod(returns = ReturnType.SINGLE)
     Response<CredentialResultsInner> listClusterMonitoringUserCredentialsWithResponse(
-        String resourceGroupName, String resourceName, Context context);
+        String resourceGroupName, String resourceName, String serverFqdn, Context context);
 
     /**
      * Gets the details of the managed cluster with a specified resource group and name.
@@ -1516,4 +1568,53 @@ Mono<Response<RunCommandResultInner>> getCommandResultWithResponseAsync(
     @ServiceMethod(returns = ReturnType.SINGLE)
     Response<RunCommandResultInner> getCommandResultWithResponse(
         String resourceGroupName, String resourceName, String commandId, Context context);
+
+    /**
+     * Gets a list of egress endpoints (network endpoints of all outbound dependencies) in the specified managed
+     * cluster. The operation returns properties of each egress endpoint.
+     *
+     * @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.
+     * @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 a list of egress endpoints (network endpoints of all outbound dependencies) in the specified managed
+     *     cluster.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedFlux<OutboundEnvironmentEndpointInner> listOutboundNetworkDependenciesEndpointsAsync(
+        String resourceGroupName, String resourceName);
+
+    /**
+     * Gets a list of egress endpoints (network endpoints of all outbound dependencies) in the specified managed
+     * cluster. The operation returns properties of each egress endpoint.
+     *
+     * @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.
+     * @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 a list of egress endpoints (network endpoints of all outbound dependencies) in the specified managed
+     *     cluster.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedIterable<OutboundEnvironmentEndpointInner> listOutboundNetworkDependenciesEndpoints(
+        String resourceGroupName, String resourceName);
+
+    /**
+     * Gets a list of egress endpoints (network endpoints of all outbound dependencies) in the specified managed
+     * cluster. The operation returns properties of each egress endpoint.
+     *
+     * @param resourceGroupName The name of the resource group.
+     * @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 a list of egress endpoints (network endpoints of all outbound dependencies) in the specified managed
+     *     cluster.
+     */
+    @ServiceMethod(returns = ReturnType.COLLECTION)
+    PagedIterable<OutboundEnvironmentEndpointInner> listOutboundNetworkDependenciesEndpoints(
+        String resourceGroupName, String resourceName, Context context);
 }
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
@@ -34,8 +34,8 @@ public class AgentPoolInner extends SubResource {
 
     /*
      * Number of agents (VMs) to host docker containers. Allowed values must be
-     * in the range of 0 to 100 (inclusive) for user pools and in the range of
-     * 1 to 100 (inclusive) for system pools. The default value is 1.
+     * in the range of 0 to 1000 (inclusive) for user pools and in the range of
+     * 1 to 1000 (inclusive) for system pools. The default value is 1.
      */
     @JsonProperty(value = "properties.count")
     private Integer count;
@@ -252,6 +252,12 @@ public class AgentPoolInner extends SubResource {
     @JsonProperty(value = "properties.enableEncryptionAtHost")
     private Boolean enableEncryptionAtHost;
 
+    /*
+     * Whether to enable UltraSSD
+     */
+    @JsonProperty(value = "properties.enableUltraSSD")
+    private Boolean enableUltraSsd;
+
     /*
      * Whether to use FIPS enabled OS
      */
@@ -281,8 +287,8 @@ public class AgentPoolInner extends SubResource {
 
     /**
      * Get the count property: Number of agents (VMs) to host docker containers. Allowed values must be in the range of
-     * 0 to 100 (inclusive) for user pools and in the range of 1 to 100 (inclusive) for system pools. The default value
-     * is 1.
+     * 0 to 1000 (inclusive) for user pools and in the range of 1 to 1000 (inclusive) for system pools. The default
+     * value is 1.
      *
      * @return the count value.
      */
@@ -292,8 +298,8 @@ public Integer count() {
 
     /**
      * Set the count property: Number of agents (VMs) to host docker containers. Allowed values must be in the range of
-     * 0 to 100 (inclusive) for user pools and in the range of 1 to 100 (inclusive) for system pools. The default value
-     * is 1.
+     * 0 to 1000 (inclusive) for user pools and in the range of 1 to 1000 (inclusive) for system pools. The default
+     * value is 1.
      *
      * @param count the count value to set.
      * @return the AgentPoolInner object itself.
@@ -935,6 +941,26 @@ public AgentPoolInner withEnableEncryptionAtHost(Boolean enableEncryptionAtHost)
         return this;
     }
 
+    /**
+     * Get the enableUltraSsd property: Whether to enable UltraSSD.
+     *
+     * @return the enableUltraSsd value.
+     */
+    public Boolean enableUltraSsd() {
+        return this.enableUltraSsd;
+    }
+
+    /**
+     * Set the enableUltraSsd property: Whether to enable UltraSSD.
+     *
+     * @param enableUltraSsd the enableUltraSsd value to set.
+     * @return the AgentPoolInner object itself.
+     */
+    public AgentPoolInner withEnableUltraSsd(Boolean enableUltraSsd) {
+        this.enableUltraSsd = enableUltraSsd;
+        return this;
+    }
+
     /**
      * Get the enableFips property: Whether to use FIPS enabled OS.
      *