Skip to content

Commit 2028a28

Browse files
mgmt, update containerservice to 2021-08-01 (Azure#24035)
* mgmt, update containerservice to 2021-08-01 * Update sdk/resourcemanager/azure-resourcemanager-containerservice/CHANGELOG.md Co-authored-by: Weidong Xu <weidxu@microsoft.com> Co-authored-by: Weidong Xu <weidxu@microsoft.com>
1 parent 05c1c57 commit 2028a28

33 files changed

+2404
-149
lines changed

sdk/resourcemanager/api-specs.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@
101101
"dir": "azure-resourcemanager-containerservice",
102102
"source": "specification/containerservice/resource-manager/readme.md",
103103
"package": "com.azure.resourcemanager.containerservice",
104-
"args": "--payload-flattening-threshold=1 --tag=package-2021-07 --preserve-model=ContainerServiceVMSizeTypes"
104+
"args": "--payload-flattening-threshold=1 --tag=package-2021-08 --preserve-model=ContainerServiceVMSizeTypes"
105105
},
106106
"cosmos": {
107107
"dir": "azure-resourcemanager-cosmos",

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

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,9 @@
22

33
## 2.8.0-beta.1 (Unreleased)
44

5+
### Dependency Updates
6+
7+
- Updated `api-version` to `2021-08-01`.
58

69
## 2.7.0 (2021-08-12)
710

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

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -100,4 +100,11 @@ public interface ContainerServiceManagementClient {
100100
* @return the ResolvePrivateLinkServiceIdsClient object.
101101
*/
102102
ResolvePrivateLinkServiceIdsClient getResolvePrivateLinkServiceIds();
103+
104+
/**
105+
* Gets the SnapshotsClient object to access its operations.
106+
*
107+
* @return the SnapshotsClient object.
108+
*/
109+
SnapshotsClient getSnapshots();
103110
}

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

Lines changed: 315 additions & 0 deletions
Large diffs are not rendered by default.

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

Lines changed: 50 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import com.azure.resourcemanager.containerservice.models.AgentPoolMode;
1111
import com.azure.resourcemanager.containerservice.models.AgentPoolType;
1212
import com.azure.resourcemanager.containerservice.models.AgentPoolUpgradeSettings;
13+
import com.azure.resourcemanager.containerservice.models.CreationData;
1314
import com.azure.resourcemanager.containerservice.models.GpuInstanceProfile;
1415
import com.azure.resourcemanager.containerservice.models.KubeletConfig;
1516
import com.azure.resourcemanager.containerservice.models.KubeletDiskType;
@@ -21,6 +22,7 @@
2122
import com.azure.resourcemanager.containerservice.models.ScaleDownMode;
2223
import com.azure.resourcemanager.containerservice.models.ScaleSetEvictionPolicy;
2324
import com.azure.resourcemanager.containerservice.models.ScaleSetPriority;
25+
import com.azure.resourcemanager.containerservice.models.WorkloadRuntime;
2426
import com.fasterxml.jackson.annotation.JsonIgnore;
2527
import com.fasterxml.jackson.annotation.JsonProperty;
2628
import java.util.List;
@@ -218,6 +220,29 @@ public AgentPoolInner withKubeletDiskType(KubeletDiskType kubeletDiskType) {
218220
return this;
219221
}
220222

223+
/**
224+
* Get the workloadRuntime property: Determines the type of workload a node can run.
225+
*
226+
* @return the workloadRuntime value.
227+
*/
228+
public WorkloadRuntime workloadRuntime() {
229+
return this.innerProperties() == null ? null : this.innerProperties().workloadRuntime();
230+
}
231+
232+
/**
233+
* Set the workloadRuntime property: Determines the type of workload a node can run.
234+
*
235+
* @param workloadRuntime the workloadRuntime value to set.
236+
* @return the AgentPoolInner object itself.
237+
*/
238+
public AgentPoolInner withWorkloadRuntime(WorkloadRuntime workloadRuntime) {
239+
if (this.innerProperties() == null) {
240+
this.innerProperties = new ManagedClusterAgentPoolProfileProperties();
241+
}
242+
this.innerProperties().withWorkloadRuntime(workloadRuntime);
243+
return this;
244+
}
245+
221246
/**
222247
* Get the vnetSubnetId property: The ID of the subnet which agent pool nodes and optionally pods will join on
223248
* startup. If this is not specified, a VNET and subnet will be generated and used. If no podSubnetID is specified,
@@ -982,6 +1007,31 @@ public AgentPoolInner withGpuInstanceProfile(GpuInstanceProfile gpuInstanceProfi
9821007
return this;
9831008
}
9841009

1010+
/**
1011+
* Get the creationData property: CreationData to be used to specify the source Snapshot ID if the node pool will be
1012+
* created/upgraded using a snapshot.
1013+
*
1014+
* @return the creationData value.
1015+
*/
1016+
public CreationData creationData() {
1017+
return this.innerProperties() == null ? null : this.innerProperties().creationData();
1018+
}
1019+
1020+
/**
1021+
* Set the creationData property: CreationData to be used to specify the source Snapshot ID if the node pool will be
1022+
* created/upgraded using a snapshot.
1023+
*
1024+
* @param creationData the creationData value to set.
1025+
* @return the AgentPoolInner object itself.
1026+
*/
1027+
public AgentPoolInner withCreationData(CreationData creationData) {
1028+
if (this.innerProperties() == null) {
1029+
this.innerProperties = new ManagedClusterAgentPoolProfileProperties();
1030+
}
1031+
this.innerProperties().withCreationData(creationData);
1032+
return this;
1033+
}
1034+
9851035
/**
9861036
* Validates the instance.
9871037
*

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

Lines changed: 60 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
import com.azure.resourcemanager.containerservice.models.AgentPoolMode;
1010
import com.azure.resourcemanager.containerservice.models.AgentPoolType;
1111
import com.azure.resourcemanager.containerservice.models.AgentPoolUpgradeSettings;
12+
import com.azure.resourcemanager.containerservice.models.CreationData;
1213
import com.azure.resourcemanager.containerservice.models.GpuInstanceProfile;
1314
import com.azure.resourcemanager.containerservice.models.KubeletConfig;
1415
import com.azure.resourcemanager.containerservice.models.KubeletDiskType;
@@ -20,6 +21,7 @@
2021
import com.azure.resourcemanager.containerservice.models.ScaleDownMode;
2122
import com.azure.resourcemanager.containerservice.models.ScaleSetEvictionPolicy;
2223
import com.azure.resourcemanager.containerservice.models.ScaleSetPriority;
24+
import com.azure.resourcemanager.containerservice.models.WorkloadRuntime;
2325
import com.fasterxml.jackson.annotation.JsonIgnore;
2426
import com.fasterxml.jackson.annotation.JsonInclude;
2527
import com.fasterxml.jackson.annotation.JsonProperty;
@@ -73,6 +75,12 @@ public class ManagedClusterAgentPoolProfileProperties {
7375
@JsonProperty(value = "kubeletDiskType")
7476
private KubeletDiskType kubeletDiskType;
7577

78+
/*
79+
* Determines the type of workload a node can run.
80+
*/
81+
@JsonProperty(value = "workloadRuntime")
82+
private WorkloadRuntime workloadRuntime;
83+
7684
/*
7785
* The ID of the subnet which agent pool nodes and optionally pods will
7886
* join on startup. If this is not specified, a VNET and subnet will be
@@ -313,6 +321,13 @@ public class ManagedClusterAgentPoolProfileProperties {
313321
@JsonProperty(value = "gpuInstanceProfile")
314322
private GpuInstanceProfile gpuInstanceProfile;
315323

324+
/*
325+
* CreationData to be used to specify the source Snapshot ID if the node
326+
* pool will be created/upgraded using a snapshot.
327+
*/
328+
@JsonProperty(value = "creationData")
329+
private CreationData creationData;
330+
316331
/**
317332
* Get the count property: Number of agents (VMs) to host docker containers. Allowed values must be in the range of
318333
* 0 to 1000 (inclusive) for user pools and in the range of 1 to 1000 (inclusive) for system pools. The default
@@ -431,6 +446,26 @@ public ManagedClusterAgentPoolProfileProperties withKubeletDiskType(KubeletDiskT
431446
return this;
432447
}
433448

449+
/**
450+
* Get the workloadRuntime property: Determines the type of workload a node can run.
451+
*
452+
* @return the workloadRuntime value.
453+
*/
454+
public WorkloadRuntime workloadRuntime() {
455+
return this.workloadRuntime;
456+
}
457+
458+
/**
459+
* Set the workloadRuntime property: Determines the type of workload a node can run.
460+
*
461+
* @param workloadRuntime the workloadRuntime value to set.
462+
* @return the ManagedClusterAgentPoolProfileProperties object itself.
463+
*/
464+
public ManagedClusterAgentPoolProfileProperties withWorkloadRuntime(WorkloadRuntime workloadRuntime) {
465+
this.workloadRuntime = workloadRuntime;
466+
return this;
467+
}
468+
434469
/**
435470
* Get the vnetSubnetId property: The ID of the subnet which agent pool nodes and optionally pods will join on
436471
* startup. If this is not specified, a VNET and subnet will be generated and used. If no podSubnetID is specified,
@@ -1109,6 +1144,28 @@ public ManagedClusterAgentPoolProfileProperties withGpuInstanceProfile(GpuInstan
11091144
return this;
11101145
}
11111146

1147+
/**
1148+
* Get the creationData property: CreationData to be used to specify the source Snapshot ID if the node pool will be
1149+
* created/upgraded using a snapshot.
1150+
*
1151+
* @return the creationData value.
1152+
*/
1153+
public CreationData creationData() {
1154+
return this.creationData;
1155+
}
1156+
1157+
/**
1158+
* Set the creationData property: CreationData to be used to specify the source Snapshot ID if the node pool will be
1159+
* created/upgraded using a snapshot.
1160+
*
1161+
* @param creationData the creationData value to set.
1162+
* @return the ManagedClusterAgentPoolProfileProperties object itself.
1163+
*/
1164+
public ManagedClusterAgentPoolProfileProperties withCreationData(CreationData creationData) {
1165+
this.creationData = creationData;
1166+
return this;
1167+
}
1168+
11121169
/**
11131170
* Validates the instance.
11141171
*
@@ -1127,5 +1184,8 @@ public void validate() {
11271184
if (linuxOSConfig() != null) {
11281185
linuxOSConfig().validate();
11291186
}
1187+
if (creationData() != null) {
1188+
creationData().validate();
1189+
}
11301190
}
11311191
}

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

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import com.azure.resourcemanager.containerservice.models.ManagedClusterSku;
2525
import com.azure.resourcemanager.containerservice.models.ManagedClusterWindowsProfile;
2626
import com.azure.resourcemanager.containerservice.models.PowerState;
27+
import com.azure.resourcemanager.containerservice.models.PublicNetworkAccess;
2728
import com.azure.resourcemanager.containerservice.models.UserAssignedIdentity;
2829
import com.fasterxml.jackson.annotation.JsonIgnore;
2930
import com.fasterxml.jackson.annotation.JsonProperty;
@@ -761,6 +762,31 @@ public ManagedClusterInner withSecurityProfile(ManagedClusterSecurityProfile sec
761762
return this;
762763
}
763764

765+
/**
766+
* Get the publicNetworkAccess property: Whether the cluster can be accessed through public network or not Default
767+
* value is 'Enabled' (case insensitive). Could be set to 'Disabled' to enable private cluster.
768+
*
769+
* @return the publicNetworkAccess value.
770+
*/
771+
public PublicNetworkAccess publicNetworkAccess() {
772+
return this.innerProperties() == null ? null : this.innerProperties().publicNetworkAccess();
773+
}
774+
775+
/**
776+
* Set the publicNetworkAccess property: Whether the cluster can be accessed through public network or not Default
777+
* value is 'Enabled' (case insensitive). Could be set to 'Disabled' to enable private cluster.
778+
*
779+
* @param publicNetworkAccess the publicNetworkAccess value to set.
780+
* @return the ManagedClusterInner object itself.
781+
*/
782+
public ManagedClusterInner withPublicNetworkAccess(PublicNetworkAccess publicNetworkAccess) {
783+
if (this.innerProperties() == null) {
784+
this.innerProperties = new ManagedClusterProperties();
785+
}
786+
this.innerProperties().withPublicNetworkAccess(publicNetworkAccess);
787+
return this;
788+
}
789+
764790
/**
765791
* Validates the instance.
766792
*

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

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,7 @@
2020
import com.azure.resourcemanager.containerservice.models.ManagedClusterServicePrincipalProfile;
2121
import com.azure.resourcemanager.containerservice.models.ManagedClusterWindowsProfile;
2222
import com.azure.resourcemanager.containerservice.models.PowerState;
23+
import com.azure.resourcemanager.containerservice.models.PublicNetworkAccess;
2324
import com.azure.resourcemanager.containerservice.models.UserAssignedIdentity;
2425
import com.fasterxml.jackson.annotation.JsonIgnore;
2526
import com.fasterxml.jackson.annotation.JsonInclude;
@@ -234,6 +235,14 @@ public final class ManagedClusterProperties {
234235
@JsonProperty(value = "securityProfile")
235236
private ManagedClusterSecurityProfile securityProfile;
236237

238+
/*
239+
* Whether the cluster can be accessed through public network or not
240+
* Default value is 'Enabled' (case insensitive). Could be set to
241+
* 'Disabled' to enable private cluster
242+
*/
243+
@JsonProperty(value = "publicNetworkAccess")
244+
private PublicNetworkAccess publicNetworkAccess;
245+
237246
/**
238247
* Get the provisioningState property: The current provisioning state.
239248
*
@@ -785,6 +794,28 @@ public ManagedClusterProperties withSecurityProfile(ManagedClusterSecurityProfil
785794
return this;
786795
}
787796

797+
/**
798+
* Get the publicNetworkAccess property: Whether the cluster can be accessed through public network or not Default
799+
* value is 'Enabled' (case insensitive). Could be set to 'Disabled' to enable private cluster.
800+
*
801+
* @return the publicNetworkAccess value.
802+
*/
803+
public PublicNetworkAccess publicNetworkAccess() {
804+
return this.publicNetworkAccess;
805+
}
806+
807+
/**
808+
* Set the publicNetworkAccess property: Whether the cluster can be accessed through public network or not Default
809+
* value is 'Enabled' (case insensitive). Could be set to 'Disabled' to enable private cluster.
810+
*
811+
* @param publicNetworkAccess the publicNetworkAccess value to set.
812+
* @return the ManagedClusterProperties object itself.
813+
*/
814+
public ManagedClusterProperties withPublicNetworkAccess(PublicNetworkAccess publicNetworkAccess) {
815+
this.publicNetworkAccess = publicNetworkAccess;
816+
return this;
817+
}
818+
788819
/**
789820
* Validates the instance.
790821
*

0 commit comments

Comments
 (0)