Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

mgmt, upgrade containerservice to 2021-10 #25723

Merged
merged 1 commit into from
Nov 29, 2021
Merged

mgmt, upgrade containerservice to 2021-10 #25723

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sdk/resourcemanager/api-specs.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@
"dir": "azure-resourcemanager-containerservice",
"source": "specification/containerservice/resource-manager/readme.md",
"package": "com.azure.resourcemanager.containerservice",
"args": "--tag=package-2021-09 --preserve-model=ContainerServiceVMSizeTypes"
"args": "--tag=package-2021-10 --preserve-model=ContainerServiceVMSizeTypes"
},
"containerservice-hybrid": {
"dir": "../resourcemanagerhybrid/azure-resourcemanager-containerservice",
Expand Down
8 changes: 4 additions & 4 deletions ...in/java/com/azure/resourcemanager/containerservice/fluent/models/ManagedClusterInner.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -763,8 +763,8 @@ public ManagedClusterInner withSecurityProfile(ManagedClusterSecurityProfile sec
}

/**
* Get the publicNetworkAccess property: Whether the cluster can be accessed through public network or not Default
* value is 'Enabled' (case insensitive). Could be set to 'Disabled' to enable private cluster.
* Get the publicNetworkAccess property: PublicNetworkAccess of the managedCluster Allow or deny public network
* access for AKS.
*
* @return the publicNetworkAccess value.
*/
Expand All @@ -773,8 +773,8 @@ public PublicNetworkAccess publicNetworkAccess() {
}

/**
* Set the publicNetworkAccess property: Whether the cluster can be accessed through public network or not Default
* value is 'Enabled' (case insensitive). Could be set to 'Disabled' to enable private cluster.
* Set the publicNetworkAccess property: PublicNetworkAccess of the managedCluster Allow or deny public network
* access for AKS.
*
* @param publicNetworkAccess the publicNetworkAccess value to set.
* @return the ManagedClusterInner object itself.
Expand Down
13 changes: 6 additions & 7 deletions ...va/com/azure/resourcemanager/containerservice/fluent/models/ManagedClusterProperties.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -236,9 +236,8 @@ public final class ManagedClusterProperties {
private ManagedClusterSecurityProfile securityProfile;

/*
* Whether the cluster can be accessed through public network or not
* Default value is 'Enabled' (case insensitive). Could be set to
* 'Disabled' to enable private cluster
* PublicNetworkAccess of the managedCluster Allow or deny public network
* access for AKS
*/
@JsonProperty(value = "publicNetworkAccess")
private PublicNetworkAccess publicNetworkAccess;
Expand Down Expand Up @@ -795,8 +794,8 @@ public ManagedClusterProperties withSecurityProfile(ManagedClusterSecurityProfil
}

/**
* Get the publicNetworkAccess property: Whether the cluster can be accessed through public network or not Default
* value is 'Enabled' (case insensitive). Could be set to 'Disabled' to enable private cluster.
* Get the publicNetworkAccess property: PublicNetworkAccess of the managedCluster Allow or deny public network
* access for AKS.
*
* @return the publicNetworkAccess value.
*/
Expand All @@ -805,8 +804,8 @@ public PublicNetworkAccess publicNetworkAccess() {
}

/**
* Set the publicNetworkAccess property: Whether the cluster can be accessed through public network or not Default
* value is 'Enabled' (case insensitive). Could be set to 'Disabled' to enable private cluster.
* Set the publicNetworkAccess property: PublicNetworkAccess of the managedCluster Allow or deny public network
* access for AKS.
*
* @param publicNetworkAccess the publicNetworkAccess value to set.
* @return the ManagedClusterProperties object itself.
Expand Down
43 changes: 26 additions & 17 deletions .../java/com/azure/resourcemanager/containerservice/implementation/AgentPoolsClientImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -223,7 +223,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 = "2021-09-01";
final String apiVersion = "2021-10-01";
final String accept = "application/json";
return FluxUtil
.withContext(
Expand Down Expand Up @@ -282,7 +282,7 @@ private Mono<PagedResponse<AgentPoolInner>> listSinglePageAsync(
if (resourceName == null) {
return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
}
final String apiVersion = "2021-09-01";
final String apiVersion = "2021-10-01";
final String accept = "application/json";
context = this.client.mergeContext(context);
return service
Expand Down Expand Up @@ -406,7 +406,7 @@ public Mono<Response<AgentPoolInner>> getWithResponseAsync(
if (agentPoolName == null) {
return Mono.error(new IllegalArgumentException("Parameter agentPoolName is required and cannot be null."));
}
final String apiVersion = "2021-09-01";
final String apiVersion = "2021-10-01";
final String accept = "application/json";
return FluxUtil
.withContext(
Expand Down Expand Up @@ -461,7 +461,7 @@ private Mono<Response<AgentPoolInner>> getWithResponseAsync(
if (agentPoolName == null) {
return Mono.error(new IllegalArgumentException("Parameter agentPoolName is required and cannot be null."));
}
final String apiVersion = "2021-09-01";
final String apiVersion = "2021-10-01";
final String accept = "application/json";
context = this.client.mergeContext(context);
return service
Expand Down Expand Up @@ -576,7 +576,7 @@ public Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(
} else {
parameters.validate();
}
final String apiVersion = "2021-09-01";
final String apiVersion = "2021-10-01";
final String accept = "application/json";
return FluxUtil
.withContext(
Expand Down Expand Up @@ -642,7 +642,7 @@ private Mono<Response<Flux<ByteBuffer>>> createOrUpdateWithResponseAsync(
} else {
parameters.validate();
}
final String apiVersion = "2021-09-01";
final String apiVersion = "2021-10-01";
final String accept = "application/json";
context = this.client.mergeContext(context);
return service
Expand Down Expand Up @@ -678,7 +678,11 @@ public PollerFlux<PollResult<AgentPoolInner>, AgentPoolInner> beginCreateOrUpdat
return this
.client
.<AgentPoolInner, AgentPoolInner>getLroResult(
mono, this.client.getHttpPipeline(), AgentPoolInner.class, AgentPoolInner.class, this.client.getContext());
mono,
this.client.getHttpPipeline(),
AgentPoolInner.class,
AgentPoolInner.class,
this.client.getContext());
}

/**
Expand Down Expand Up @@ -874,7 +878,7 @@ public Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(
if (agentPoolName == null) {
return Mono.error(new IllegalArgumentException("Parameter agentPoolName is required and cannot be null."));
}
final String apiVersion = "2021-09-01";
final String apiVersion = "2021-10-01";
final String accept = "application/json";
return FluxUtil
.withContext(
Expand Down Expand Up @@ -929,7 +933,7 @@ private Mono<Response<Flux<ByteBuffer>>> deleteWithResponseAsync(
if (agentPoolName == null) {
return Mono.error(new IllegalArgumentException("Parameter agentPoolName is required and cannot be null."));
}
final String apiVersion = "2021-09-01";
final String apiVersion = "2021-10-01";
final String accept = "application/json";
context = this.client.mergeContext(context);
return service
Expand Down Expand Up @@ -961,7 +965,8 @@ public PollerFlux<PollResult<Void>, Void> beginDeleteAsync(
Mono<Response<Flux<ByteBuffer>>> mono = deleteWithResponseAsync(resourceGroupName, resourceName, agentPoolName);
return this
.client
.<Void, Void>getLroResult(mono, this.client.getHttpPipeline(), Void.class, Void.class, this.client.getContext());
.<Void, Void>getLroResult(
mono, this.client.getHttpPipeline(), Void.class, Void.class, this.client.getContext());
}

/**
Expand Down Expand Up @@ -1127,7 +1132,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 = "2021-09-01";
final String apiVersion = "2021-10-01";
final String accept = "application/json";
return FluxUtil
.withContext(
Expand Down Expand Up @@ -1182,7 +1187,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 = "2021-09-01";
final String apiVersion = "2021-10-01";
final String accept = "application/json";
context = this.client.mergeContext(context);
return service
Expand Down Expand Up @@ -1290,7 +1295,7 @@ public Mono<Response<AgentPoolAvailableVersionsInner>> getAvailableAgentPoolVers
if (resourceName == null) {
return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
}
final String apiVersion = "2021-09-01";
final String apiVersion = "2021-10-01";
final String accept = "application/json";
return FluxUtil
.withContext(
Expand Down Expand Up @@ -1341,7 +1346,7 @@ private Mono<Response<AgentPoolAvailableVersionsInner>> getAvailableAgentPoolVer
if (resourceName == null) {
return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
}
final String apiVersion = "2021-09-01";
final String apiVersion = "2021-10-01";
final String accept = "application/json";
context = this.client.mergeContext(context);
return service
Expand Down Expand Up @@ -1453,7 +1458,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 = "2021-09-01";
final String apiVersion = "2021-10-01";
final String accept = "application/json";
return FluxUtil
.withContext(
Expand Down Expand Up @@ -1510,7 +1515,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 = "2021-09-01";
final String apiVersion = "2021-10-01";
final String accept = "application/json";
context = this.client.mergeContext(context);
return service
Expand Down Expand Up @@ -1546,7 +1551,11 @@ public PollerFlux<PollResult<AgentPoolInner>, AgentPoolInner> beginUpgradeNodeIm
return this
.client
.<AgentPoolInner, AgentPoolInner>getLroResult(
mono, this.client.getHttpPipeline(), AgentPoolInner.class, AgentPoolInner.class, this.client.getContext());
mono,
this.client.getHttpPipeline(),
AgentPoolInner.class,
AgentPoolInner.class,
this.client.getContext());
}

/**
Expand Down
16 changes: 8 additions & 8 deletions .../resourcemanager/containerservice/implementation/MaintenanceConfigurationsClientImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -171,7 +171,7 @@ private Mono<PagedResponse<MaintenanceConfigurationInner>> listByManagedClusterS
if (resourceName == null) {
return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
}
final String apiVersion = "2021-09-01";
final String apiVersion = "2021-10-01";
final String accept = "application/json";
return FluxUtil
.withContext(
Expand Down Expand Up @@ -230,7 +230,7 @@ private Mono<PagedResponse<MaintenanceConfigurationInner>> listByManagedClusterS
if (resourceName == null) {
return Mono.error(new IllegalArgumentException("Parameter resourceName is required and cannot be null."));
}
final String apiVersion = "2021-09-01";
final String apiVersion = "2021-10-01";
final String accept = "application/json";
context = this.client.mergeContext(context);
return service
Expand Down Expand Up @@ -359,7 +359,7 @@ public Mono<Response<MaintenanceConfigurationInner>> getWithResponseAsync(
if (configName == null) {
return Mono.error(new IllegalArgumentException("Parameter configName is required and cannot be null."));
}
final String apiVersion = "2021-09-01";
final String apiVersion = "2021-10-01";
final String accept = "application/json";
return FluxUtil
.withContext(
Expand Down Expand Up @@ -414,7 +414,7 @@ private Mono<Response<MaintenanceConfigurationInner>> getWithResponseAsync(
if (configName == null) {
return Mono.error(new IllegalArgumentException("Parameter configName is required and cannot be null."));
}
final String apiVersion = "2021-09-01";
final String apiVersion = "2021-10-01";
final String accept = "application/json";
context = this.client.mergeContext(context);
return service
Expand Down Expand Up @@ -530,7 +530,7 @@ public Mono<Response<MaintenanceConfigurationInner>> createOrUpdateWithResponseA
} else {
parameters.validate();
}
final String apiVersion = "2021-09-01";
final String apiVersion = "2021-10-01";
final String accept = "application/json";
return FluxUtil
.withContext(
Expand Down Expand Up @@ -596,7 +596,7 @@ private Mono<Response<MaintenanceConfigurationInner>> createOrUpdateWithResponse
} else {
parameters.validate();
}
final String apiVersion = "2021-09-01";
final String apiVersion = "2021-10-01";
final String accept = "application/json";
context = this.client.mergeContext(context);
return service
Expand Down Expand Up @@ -716,7 +716,7 @@ public Mono<Response<Void>> deleteWithResponseAsync(
if (configName == null) {
return Mono.error(new IllegalArgumentException("Parameter configName is required and cannot be null."));
}
final String apiVersion = "2021-09-01";
final String apiVersion = "2021-10-01";
final String accept = "application/json";
return FluxUtil
.withContext(
Expand Down Expand Up @@ -771,7 +771,7 @@ private Mono<Response<Void>> deleteWithResponseAsync(
if (configName == null) {
return Mono.error(new IllegalArgumentException("Parameter configName is required and cannot be null."));
}
final String apiVersion = "2021-09-01";
final String apiVersion = "2021-10-01";
final String accept = "application/json";
context = this.client.mergeContext(context);
return service
Expand Down
Loading