mgmt, local generation for Container Service package-2024-02 (#39584)

mgmt, local generation for Container Service package-2024-02
Azure · Apr 9, 2024 · d0a89b4 · d0a89b4
1 parent 2a669ca
commit d0a89b4
Show file tree

Hide file tree

Showing 83 changed files with 594 additions and 253 deletions.
diff --git a/sdk/resourcemanager/api-specs.json b/sdk/resourcemanager/api-specs.json
@@ -70,7 +70,7 @@
     "dir": "azure-resourcemanager-containerservice",
     "source": "specification/containerservice/resource-manager/Microsoft.ContainerService/aks/readme.md",
     "package": "com.azure.resourcemanager.containerservice",
-    "args": "--tag=package-2024-01 --modelerfour.lenient-model-deduplication --preserve-model=ContainerServiceVMSizeTypes --rename-model=Ossku:OSSku"
+    "args": "--tag=package-2024-02 --modelerfour.lenient-model-deduplication --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
@@ -11,10 +11,14 @@
 
 ### Breaking Changes
 
-### Bugs Fixed
+- `nodeSelector` is removed from `IstioEgressGateway` class.
 
 ### Other Changes
 
+#### Dependency Updates
+
+- Updated `api-version` to `2024-02-01`.
+
 ## 2.37.0 (2024-03-22)
 
 ### Other Changes

diff --git a/sdk/resourcemanager/azure-resourcemanager-containerservice/assets.json b/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_7fafd9ed81"
+  "Tag": "java/resourcemanager/azure-resourcemanager-containerservice_3d3e4d5564"
 }
diff --git a/sdk/resourcemanager/azure-resourcemanager-containerservice/pom.xml b/sdk/resourcemanager/azure-resourcemanager-containerservice/pom.xml
@@ -42,6 +42,7 @@
 
       --add-opens com.azure.core/com.azure.core.implementation.util=ALL-UNNAMED
     </javaModulesSurefireArgLine>
+    <revapi.skip>true</revapi.skip>
   </properties>
 
   <developers>

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
@@ -10,6 +10,7 @@
 import com.azure.resourcemanager.containerservice.models.AgentPoolNetworkProfile;
 import com.azure.resourcemanager.containerservice.models.AgentPoolType;
 import com.azure.resourcemanager.containerservice.models.AgentPoolUpgradeSettings;
+import com.azure.resourcemanager.containerservice.models.AgentPoolWindowsProfile;
 import com.azure.resourcemanager.containerservice.models.CreationData;
 import com.azure.resourcemanager.containerservice.models.GpuInstanceProfile;
 import com.azure.resourcemanager.containerservice.models.KubeletConfig;
@@ -1202,6 +1203,29 @@ public AgentPoolInner withNetworkProfile(AgentPoolNetworkProfile networkProfile)
         return this;
     }
 
+    /**
+     * Get the windowsProfile property: The Windows agent pool's specific profile.
+     * 
+     * @return the windowsProfile value.
+     */
+    public AgentPoolWindowsProfile windowsProfile() {
+        return this.innerProperties() == null ? null : this.innerProperties().windowsProfile();
+    }
+
+    /**
+     * Set the windowsProfile property: The Windows agent pool's specific profile.
+     * 
+     * @param windowsProfile the windowsProfile value to set.
+     * @return the AgentPoolInner object itself.
+     */
+    public AgentPoolInner withWindowsProfile(AgentPoolWindowsProfile windowsProfile) {
+        if (this.innerProperties() == null) {
+            this.innerProperties = new ManagedClusterAgentPoolProfileProperties();
+        }
+        this.innerProperties().withWindowsProfile(windowsProfile);
+        return this;
+    }
+
     /**
      * Validates the instance.
      * 

diff --git a/...ourcemanager/containerservice/fluent/models/ManagedClusterAgentPoolProfileProperties.java b/...ourcemanager/containerservice/fluent/models/ManagedClusterAgentPoolProfileProperties.java
@@ -9,6 +9,7 @@
 import com.azure.resourcemanager.containerservice.models.AgentPoolNetworkProfile;
 import com.azure.resourcemanager.containerservice.models.AgentPoolType;
 import com.azure.resourcemanager.containerservice.models.AgentPoolUpgradeSettings;
+import com.azure.resourcemanager.containerservice.models.AgentPoolWindowsProfile;
 import com.azure.resourcemanager.containerservice.models.CreationData;
 import com.azure.resourcemanager.containerservice.models.GpuInstanceProfile;
 import com.azure.resourcemanager.containerservice.models.KubeletConfig;
@@ -372,6 +373,12 @@ public class ManagedClusterAgentPoolProfileProperties {
     @JsonProperty(value = "networkProfile")
     private AgentPoolNetworkProfile networkProfile;
 
+    /*
+     * The Windows agent pool's specific profile.
+     */
+    @JsonProperty(value = "windowsProfile")
+    private AgentPoolWindowsProfile windowsProfile;
+
     /**
      * Creates an instance of ManagedClusterAgentPoolProfileProperties class.
      */
@@ -1368,6 +1375,26 @@ public ManagedClusterAgentPoolProfileProperties withNetworkProfile(AgentPoolNetw
         return this;
     }
 
+    /**
+     * Get the windowsProfile property: The Windows agent pool's specific profile.
+     * 
+     * @return the windowsProfile value.
+     */
+    public AgentPoolWindowsProfile windowsProfile() {
+        return this.windowsProfile;
+    }
+
+    /**
+     * Set the windowsProfile property: The Windows agent pool's specific profile.
+     * 
+     * @param windowsProfile the windowsProfile value to set.
+     * @return the ManagedClusterAgentPoolProfileProperties object itself.
+     */
+    public ManagedClusterAgentPoolProfileProperties withWindowsProfile(AgentPoolWindowsProfile windowsProfile) {
+        this.windowsProfile = windowsProfile;
+        return this;
+    }
+
     /**
      * Validates the instance.
      * 
@@ -1392,5 +1419,8 @@ public void validate() {
         if (networkProfile() != null) {
             networkProfile().validate();
         }
+        if (windowsProfile() != null) {
+            windowsProfile().validate();
+        }
     }
 }
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.ManagedClusterHttpProxyConfig;
 import com.azure.resourcemanager.containerservice.models.ManagedClusterIdentity;
 import com.azure.resourcemanager.containerservice.models.ManagedClusterIngressProfile;
+import com.azure.resourcemanager.containerservice.models.ManagedClusterMetricsProfile;
 import com.azure.resourcemanager.containerservice.models.ManagedClusterOidcIssuerProfile;
 import com.azure.resourcemanager.containerservice.models.ManagedClusterPodIdentityProfile;
 import com.azure.resourcemanager.containerservice.models.ManagedClusterPropertiesAutoScalerProfile;
@@ -1059,6 +1060,29 @@ public String resourceUid() {
         return this.innerProperties() == null ? null : this.innerProperties().resourceUid();
     }
 
+    /**
+     * Get the metricsProfile property: Optional cluster metrics configuration.
+     * 
+     * @return the metricsProfile value.
+     */
+    public ManagedClusterMetricsProfile metricsProfile() {
+        return this.innerProperties() == null ? null : this.innerProperties().metricsProfile();
+    }
+
+    /**
+     * Set the metricsProfile property: Optional cluster metrics configuration.
+     * 
+     * @param metricsProfile the metricsProfile value to set.
+     * @return the ManagedClusterInner object itself.
+     */
+    public ManagedClusterInner withMetricsProfile(ManagedClusterMetricsProfile metricsProfile) {
+        if (this.innerProperties() == null) {
+            this.innerProperties = new ManagedClusterProperties();
+        }
+        this.innerProperties().withMetricsProfile(metricsProfile);
+        return this;
+    }
+
     /**
      * Validates the instance.
      * 

diff --git a/...va/com/azure/resourcemanager/containerservice/fluent/models/ManagedClusterProperties.java b/...va/com/azure/resourcemanager/containerservice/fluent/models/ManagedClusterProperties.java
@@ -17,6 +17,7 @@
 import com.azure.resourcemanager.containerservice.models.ManagedClusterAzureMonitorProfile;
 import com.azure.resourcemanager.containerservice.models.ManagedClusterHttpProxyConfig;
 import com.azure.resourcemanager.containerservice.models.ManagedClusterIngressProfile;
+import com.azure.resourcemanager.containerservice.models.ManagedClusterMetricsProfile;
 import com.azure.resourcemanager.containerservice.models.ManagedClusterOidcIssuerProfile;
 import com.azure.resourcemanager.containerservice.models.ManagedClusterPodIdentityProfile;
 import com.azure.resourcemanager.containerservice.models.ManagedClusterPropertiesAutoScalerProfile;
@@ -319,6 +320,12 @@ public final class ManagedClusterProperties {
     @JsonProperty(value = "resourceUID", access = JsonProperty.Access.WRITE_ONLY)
     private String resourceUid;
 
+    /*
+     * Optional cluster metrics configuration.
+     */
+    @JsonProperty(value = "metricsProfile")
+    private ManagedClusterMetricsProfile metricsProfile;
+
     /**
      * Creates an instance of ManagedClusterProperties class.
      */
@@ -1114,6 +1121,26 @@ public String resourceUid() {
         return this.resourceUid;
     }
 
+    /**
+     * Get the metricsProfile property: Optional cluster metrics configuration.
+     * 
+     * @return the metricsProfile value.
+     */
+    public ManagedClusterMetricsProfile metricsProfile() {
+        return this.metricsProfile;
+    }
+
+    /**
+     * Set the metricsProfile property: Optional cluster metrics configuration.
+     * 
+     * @param metricsProfile the metricsProfile value to set.
+     * @return the ManagedClusterProperties object itself.
+     */
+    public ManagedClusterProperties withMetricsProfile(ManagedClusterMetricsProfile metricsProfile) {
+        this.metricsProfile = metricsProfile;
+        return this;
+    }
+
     /**
      * Validates the instance.
      * 
@@ -1197,5 +1224,8 @@ public void validate() {
         if (serviceMeshProfile() != null) {
             serviceMeshProfile().validate();
         }
+        if (metricsProfile() != null) {
+            metricsProfile().validate();
+        }
     }
 }
diff --git a/.../java/com/azure/resourcemanager/containerservice/implementation/AgentPoolsClientImpl.java b/.../java/com/azure/resourcemanager/containerservice/implementation/AgentPoolsClientImpl.java
@@ -191,7 +191,7 @@ public Mono<Response<Flux<ByteBuffer>>> abortLatestOperationWithResponseAsync(St
         if (agentPoolName == null) {
             return Mono.error(new IllegalArgumentException("Parameter agentPoolName is required and cannot be null."));
         }
-        final String apiVersion = "2024-01-01";
+        final String apiVersion = "2024-02-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.abortLatestOperation(this.client.getEndpoint(), apiVersion,
@@ -236,7 +236,7 @@ private Mono<Response<Flux<ByteBuffer>>> abortLatestOperationWithResponseAsync(S
         if (agentPoolName == null) {
             return Mono.error(new IllegalArgumentException("Parameter agentPoolName is required and cannot be null."));
         }
-        final String apiVersion = "2024-01-01";
+        final String apiVersion = "2024-02-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.abortLatestOperation(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -449,7 +449,7 @@ private Mono<PagedResponse<AgentPoolInner>> listSinglePageAsync(String resourceG
         if (resourceName == null) {
             return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
         }
-        final String apiVersion = "2024-01-01";
+        final String apiVersion = "2024-02-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.list(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -489,7 +489,7 @@ private Mono<PagedResponse<AgentPoolInner>> listSinglePageAsync(String resourceG
         if (resourceName == null) {
             return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
         }
-        final String apiVersion = "2024-01-01";
+        final String apiVersion = "2024-02-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service
@@ -596,7 +596,7 @@ public Mono<Response<AgentPoolInner>> getWithResponseAsync(String resourceGroupN
         if (agentPoolName == null) {
             return Mono.error(new IllegalArgumentException("Parameter agentPoolName is required and cannot be null."));
         }
-        final String apiVersion = "2024-01-01";
+        final String apiVersion = "2024-02-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.get(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -638,7 +638,7 @@ private Mono<Response<AgentPoolInner>> getWithResponseAsync(String resourceGroup
         if (agentPoolName == null) {
             return Mono.error(new IllegalArgumentException("Parameter agentPoolName is required and cannot be null."));
         }
-        final String apiVersion = "2024-01-01";
+        final String apiVersion = "2024-02-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.get(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), resourceGroupName,
@@ -734,7 +734,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String r
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-01-01";
+        final String apiVersion = "2024-02-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.createOrUpdate(this.client.getEndpoint(), apiVersion,
@@ -782,7 +782,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(String
         } else {
             parameters.validate();
         }
-        final String apiVersion = "2024-01-01";
+        final String apiVersion = "2024-02-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.createOrUpdate(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -980,7 +980,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resourceG
         if (agentPoolName == null) {
             return Mono.error(new IllegalArgumentException("Parameter agentPoolName is required and cannot be null."));
         }
-        final String apiVersion = "2024-01-01";
+        final String apiVersion = "2024-02-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.delete(this.client.getEndpoint(), apiVersion,
@@ -1021,7 +1021,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(String resource
         if (agentPoolName == null) {
             return Mono.error(new IllegalArgumentException("Parameter agentPoolName is required and cannot be null."));
         }
-        final String apiVersion = "2024-01-01";
+        final String apiVersion = "2024-02-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.delete(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(), resourceGroupName,
@@ -1204,7 +1204,7 @@ public Mono<Response<AgentPoolUpgradeProfileInner>> getUpgradeProfileWithRespons
         if (agentPoolName == null) {
             return Mono.error(new IllegalArgumentException("Parameter agentPoolName is required and cannot be null."));
         }
-        final String apiVersion = "2024-01-01";
+        final String apiVersion = "2024-02-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getUpgradeProfile(this.client.getEndpoint(), apiVersion,
@@ -1246,7 +1246,7 @@ private Mono<Response<AgentPoolUpgradeProfileInner>> getUpgradeProfileWithRespon
         if (agentPoolName == null) {
             return Mono.error(new IllegalArgumentException("Parameter agentPoolName is required and cannot be null."));
         }
-        final String apiVersion = "2024-01-01";
+        final String apiVersion = "2024-02-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getUpgradeProfile(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),
@@ -1338,7 +1338,7 @@ public AgentPoolUpgradeProfileInner getUpgradeProfile(String resourceGroupName,
         if (resourceName == null) {
             return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
         }
-        final String apiVersion = "2024-01-01";
+        final String apiVersion = "2024-02-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.getAvailableAgentPoolVersions(this.client.getEndpoint(), apiVersion,
@@ -1379,7 +1379,7 @@ public AgentPoolUpgradeProfileInner getUpgradeProfile(String resourceGroupName,
         if (resourceName == null) {
             return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
         }
-        final String apiVersion = "2024-01-01";
+        final String apiVersion = "2024-02-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.getAvailableAgentPoolVersions(this.client.getEndpoint(), apiVersion,
@@ -1481,7 +1481,7 @@ public Mono<Response<Flux<ByteBuffer>>> upgradeNodeImageVersionWithResponseAsync
         if (agentPoolName == null) {
             return Mono.error(new IllegalArgumentException("Parameter agentPoolName is required and cannot be null."));
         }
-        final String apiVersion = "2024-01-01";
+        final String apiVersion = "2024-02-01";
         final String accept = "application/json";
         return FluxUtil
             .withContext(context -> service.upgradeNodeImageVersion(this.client.getEndpoint(), apiVersion,
@@ -1526,7 +1526,7 @@ private Mono<Response<Flux<ByteBuffer>>> upgradeNodeImageVersionWithResponseAsyn
         if (agentPoolName == null) {
             return Mono.error(new IllegalArgumentException("Parameter agentPoolName is required and cannot be null."));
         }
-        final String apiVersion = "2024-01-01";
+        final String apiVersion = "2024-02-01";
         final String accept = "application/json";
         context = this.client.mergeContext(context);
         return service.upgradeNodeImageVersion(this.client.getEndpoint(), apiVersion, this.client.getSubscriptionId(),

diff --git a/...azure/resourcemanager/containerservice/implementation/KubernetesClusterAgentPoolImpl.java b/...azure/resourcemanager/containerservice/implementation/KubernetesClusterAgentPoolImpl.java
@@ -319,6 +319,7 @@ AgentPoolInner getAgentPoolInner() {
         agentPoolInner.withHostGroupId(innerModel().hostGroupId());
         agentPoolInner.withCapacityReservationGroupId(innerModel().capacityReservationGroupId());
         agentPoolInner.withNetworkProfile(innerModel().networkProfile());
+        agentPoolInner.withWindowsProfile(innerModel().windowsProfile());
         return agentPoolInner;
     }