Skip to content

Commit

Permalink
mgmt, update containerservice to 2021-08-01 (#24035)
Browse files Browse the repository at this point in the history
* 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>
  • Loading branch information
haolingdong-msft and weidongxu-microsoft committed Sep 13, 2021
1 parent 05c1c57 commit 2028a28
Show file tree
Hide file tree
Showing 33 changed files with 2,404 additions and 149 deletions.
2 changes: 1 addition & 1 deletion sdk/resourcemanager/api-specs.json
Original file line number Diff line number Diff line change
Expand Up @@ -101,7 +101,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-07 --preserve-model=ContainerServiceVMSizeTypes"
"args": "--payload-flattening-threshold=1 --tag=package-2021-08 --preserve-model=ContainerServiceVMSizeTypes"
},
"cosmos": {
"dir": "azure-resourcemanager-cosmos",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,9 @@

## 2.8.0-beta.1 (Unreleased)

### Dependency Updates

- Updated `api-version` to `2021-08-01`.

## 2.7.0 (2021-08-12)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -100,4 +100,11 @@ public interface ContainerServiceManagementClient {
* @return the ResolvePrivateLinkServiceIdsClient object.
*/
ResolvePrivateLinkServiceIdsClient getResolvePrivateLinkServiceIds();

/**
* Gets the SnapshotsClient object to access its operations.
*
* @return the SnapshotsClient object.
*/
SnapshotsClient getSnapshots();
}

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
import com.azure.resourcemanager.containerservice.models.AgentPoolMode;
import com.azure.resourcemanager.containerservice.models.AgentPoolType;
import com.azure.resourcemanager.containerservice.models.AgentPoolUpgradeSettings;
import com.azure.resourcemanager.containerservice.models.CreationData;
import com.azure.resourcemanager.containerservice.models.GpuInstanceProfile;
import com.azure.resourcemanager.containerservice.models.KubeletConfig;
import com.azure.resourcemanager.containerservice.models.KubeletDiskType;
Expand All @@ -21,6 +22,7 @@
import com.azure.resourcemanager.containerservice.models.ScaleDownMode;
import com.azure.resourcemanager.containerservice.models.ScaleSetEvictionPolicy;
import com.azure.resourcemanager.containerservice.models.ScaleSetPriority;
import com.azure.resourcemanager.containerservice.models.WorkloadRuntime;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.util.List;
Expand Down Expand Up @@ -218,6 +220,29 @@ public AgentPoolInner withKubeletDiskType(KubeletDiskType kubeletDiskType) {
return this;
}

/**
* Get the workloadRuntime property: Determines the type of workload a node can run.
*
* @return the workloadRuntime value.
*/
public WorkloadRuntime workloadRuntime() {
return this.innerProperties() == null ? null : this.innerProperties().workloadRuntime();
}

/**
* Set the workloadRuntime property: Determines the type of workload a node can run.
*
* @param workloadRuntime the workloadRuntime value to set.
* @return the AgentPoolInner object itself.
*/
public AgentPoolInner withWorkloadRuntime(WorkloadRuntime workloadRuntime) {
if (this.innerProperties() == null) {
this.innerProperties = new ManagedClusterAgentPoolProfileProperties();
}
this.innerProperties().withWorkloadRuntime(workloadRuntime);
return this;
}

/**
* Get the vnetSubnetId property: The ID of the subnet which agent pool nodes and optionally pods will join on
* startup. If this is not specified, a VNET and subnet will be generated and used. If no podSubnetID is specified,
Expand Down Expand Up @@ -982,6 +1007,31 @@ public AgentPoolInner withGpuInstanceProfile(GpuInstanceProfile gpuInstanceProfi
return this;
}

/**
* Get the creationData property: CreationData to be used to specify the source Snapshot ID if the node pool will be
* created/upgraded using a snapshot.
*
* @return the creationData value.
*/
public CreationData creationData() {
return this.innerProperties() == null ? null : this.innerProperties().creationData();
}

/**
* Set the creationData property: CreationData to be used to specify the source Snapshot ID if the node pool will be
* created/upgraded using a snapshot.
*
* @param creationData the creationData value to set.
* @return the AgentPoolInner object itself.
*/
public AgentPoolInner withCreationData(CreationData creationData) {
if (this.innerProperties() == null) {
this.innerProperties = new ManagedClusterAgentPoolProfileProperties();
}
this.innerProperties().withCreationData(creationData);
return this;
}

/**
* Validates the instance.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@
import com.azure.resourcemanager.containerservice.models.AgentPoolMode;
import com.azure.resourcemanager.containerservice.models.AgentPoolType;
import com.azure.resourcemanager.containerservice.models.AgentPoolUpgradeSettings;
import com.azure.resourcemanager.containerservice.models.CreationData;
import com.azure.resourcemanager.containerservice.models.GpuInstanceProfile;
import com.azure.resourcemanager.containerservice.models.KubeletConfig;
import com.azure.resourcemanager.containerservice.models.KubeletDiskType;
Expand All @@ -20,6 +21,7 @@
import com.azure.resourcemanager.containerservice.models.ScaleDownMode;
import com.azure.resourcemanager.containerservice.models.ScaleSetEvictionPolicy;
import com.azure.resourcemanager.containerservice.models.ScaleSetPriority;
import com.azure.resourcemanager.containerservice.models.WorkloadRuntime;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
import com.fasterxml.jackson.annotation.JsonProperty;
Expand Down Expand Up @@ -73,6 +75,12 @@ public class ManagedClusterAgentPoolProfileProperties {
@JsonProperty(value = "kubeletDiskType")
private KubeletDiskType kubeletDiskType;

/*
* Determines the type of workload a node can run.
*/
@JsonProperty(value = "workloadRuntime")
private WorkloadRuntime workloadRuntime;

/*
* The ID of the subnet which agent pool nodes and optionally pods will
* join on startup. If this is not specified, a VNET and subnet will be
Expand Down Expand Up @@ -313,6 +321,13 @@ public class ManagedClusterAgentPoolProfileProperties {
@JsonProperty(value = "gpuInstanceProfile")
private GpuInstanceProfile gpuInstanceProfile;

/*
* CreationData to be used to specify the source Snapshot ID if the node
* pool will be created/upgraded using a snapshot.
*/
@JsonProperty(value = "creationData")
private CreationData creationData;

/**
* Get the count property: Number of agents (VMs) to host docker containers. Allowed values must be 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
Expand Down Expand Up @@ -431,6 +446,26 @@ public ManagedClusterAgentPoolProfileProperties withKubeletDiskType(KubeletDiskT
return this;
}

/**
* Get the workloadRuntime property: Determines the type of workload a node can run.
*
* @return the workloadRuntime value.
*/
public WorkloadRuntime workloadRuntime() {
return this.workloadRuntime;
}

/**
* Set the workloadRuntime property: Determines the type of workload a node can run.
*
* @param workloadRuntime the workloadRuntime value to set.
* @return the ManagedClusterAgentPoolProfileProperties object itself.
*/
public ManagedClusterAgentPoolProfileProperties withWorkloadRuntime(WorkloadRuntime workloadRuntime) {
this.workloadRuntime = workloadRuntime;
return this;
}

/**
* Get the vnetSubnetId property: The ID of the subnet which agent pool nodes and optionally pods will join on
* startup. If this is not specified, a VNET and subnet will be generated and used. If no podSubnetID is specified,
Expand Down Expand Up @@ -1109,6 +1144,28 @@ public ManagedClusterAgentPoolProfileProperties withGpuInstanceProfile(GpuInstan
return this;
}

/**
* Get the creationData property: CreationData to be used to specify the source Snapshot ID if the node pool will be
* created/upgraded using a snapshot.
*
* @return the creationData value.
*/
public CreationData creationData() {
return this.creationData;
}

/**
* Set the creationData property: CreationData to be used to specify the source Snapshot ID if the node pool will be
* created/upgraded using a snapshot.
*
* @param creationData the creationData value to set.
* @return the ManagedClusterAgentPoolProfileProperties object itself.
*/
public ManagedClusterAgentPoolProfileProperties withCreationData(CreationData creationData) {
this.creationData = creationData;
return this;
}

/**
* Validates the instance.
*
Expand All @@ -1127,5 +1184,8 @@ public void validate() {
if (linuxOSConfig() != null) {
linuxOSConfig().validate();
}
if (creationData() != null) {
creationData().validate();
}
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@
import com.azure.resourcemanager.containerservice.models.ManagedClusterSku;
import com.azure.resourcemanager.containerservice.models.ManagedClusterWindowsProfile;
import com.azure.resourcemanager.containerservice.models.PowerState;
import com.azure.resourcemanager.containerservice.models.PublicNetworkAccess;
import com.azure.resourcemanager.containerservice.models.UserAssignedIdentity;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonProperty;
Expand Down Expand Up @@ -761,6 +762,31 @@ public ManagedClusterInner withSecurityProfile(ManagedClusterSecurityProfile sec
return this;
}

/**
* 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.
*
* @return the publicNetworkAccess value.
*/
public PublicNetworkAccess publicNetworkAccess() {
return this.innerProperties() == null ? null : this.innerProperties().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.
*
* @param publicNetworkAccess the publicNetworkAccess value to set.
* @return the ManagedClusterInner object itself.
*/
public ManagedClusterInner withPublicNetworkAccess(PublicNetworkAccess publicNetworkAccess) {
if (this.innerProperties() == null) {
this.innerProperties = new ManagedClusterProperties();
}
this.innerProperties().withPublicNetworkAccess(publicNetworkAccess);
return this;
}

/**
* Validates the instance.
*
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@
import com.azure.resourcemanager.containerservice.models.ManagedClusterServicePrincipalProfile;
import com.azure.resourcemanager.containerservice.models.ManagedClusterWindowsProfile;
import com.azure.resourcemanager.containerservice.models.PowerState;
import com.azure.resourcemanager.containerservice.models.PublicNetworkAccess;
import com.azure.resourcemanager.containerservice.models.UserAssignedIdentity;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonInclude;
Expand Down Expand Up @@ -234,6 +235,14 @@ public final class ManagedClusterProperties {
@JsonProperty(value = "securityProfile")
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
*/
@JsonProperty(value = "publicNetworkAccess")
private PublicNetworkAccess publicNetworkAccess;

/**
* Get the provisioningState property: The current provisioning state.
*
Expand Down Expand Up @@ -785,6 +794,28 @@ public ManagedClusterProperties withSecurityProfile(ManagedClusterSecurityProfil
return this;
}

/**
* 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.
*
* @return the publicNetworkAccess value.
*/
public PublicNetworkAccess publicNetworkAccess() {
return this.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.
*
* @param publicNetworkAccess the publicNetworkAccess value to set.
* @return the ManagedClusterProperties object itself.
*/
public ManagedClusterProperties withPublicNetworkAccess(PublicNetworkAccess publicNetworkAccess) {
this.publicNetworkAccess = publicNetworkAccess;
return this;
}

/**
* Validates the instance.
*
Expand Down

0 comments on commit 2028a28

Please sign in to comment.