diff --git a/sdk/resourcemanager/azure-resourcemanager-containerservice/pom.xml b/sdk/resourcemanager/azure-resourcemanager-containerservice/pom.xml index cde439b4acc05..7ef4277b8b860 100644 --- a/sdk/resourcemanager/azure-resourcemanager-containerservice/pom.xml +++ b/sdk/resourcemanager/azure-resourcemanager-containerservice/pom.xml @@ -42,7 +42,6 @@ --add-opens com.azure.core/com.azure.core.implementation.util=ALL-UNNAMED - - diff --git a/sdk/resourcemanager/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/ContainerServiceManager.java b/sdk/resourcemanager/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/ContainerServiceManager.java index 31a17f32c6124..a177b2687e32e 100644 --- a/sdk/resourcemanager/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/ContainerServiceManager.java +++ b/sdk/resourcemanager/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/ContainerServiceManager.java @@ -87,7 +87,11 @@ private ContainerServiceManager(HttpPipeline httpPipeline, AzureProfile profile) .buildClient()); } - /** @return the Azure Kubernetes cluster resource management API entry point */ + /** + * Gets he Azure Kubernetes cluster resource management API entry point. + * + * @return the Azure Kubernetes cluster resource management API entry point + */ public KubernetesClusters kubernetesClusters() { if (this.kubernetesClusters == null) { this.kubernetesClusters = new KubernetesClustersImpl(this); diff --git a/sdk/resourcemanager/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/AgentPool.java b/sdk/resourcemanager/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/AgentPool.java index c39b8a813ad3b..9f3758efef862 100644 --- a/sdk/resourcemanager/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/AgentPool.java +++ b/sdk/resourcemanager/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/AgentPool.java @@ -13,86 +13,178 @@ */ public interface AgentPool extends HasName { - /** @return the provisioning state of the agent pool */ + /** + * Gets the provisioning state of the agent pool. + * + * @return the provisioning state of the agent pool + */ String provisioningState(); - /** @return the number of agents (virtual machines) to host docker containers */ + /** + * Gets the number of agents (virtual machines) to host docker containers. + * + * @return the number of agents (virtual machines) to host docker containers + */ int count(); - /** @return size of each agent virtual machine in the agent pool */ + /** + * Gets size of each agent virtual machine in the agent pool. + * + * @return size of each agent virtual machine in the agent pool + */ ContainerServiceVMSizeTypes vmSize(); - /** @return OS disk size in GB set for each virtual machine in the agent pool */ + /** + * Gets OS disk size in GB set for each virtual machine in the agent pool. + * + * @return OS disk size in GB set for each virtual machine in the agent pool + */ int osDiskSizeInGB(); - /** @return OS of each virtual machine in the agent pool */ + /** + * Gets OS of each virtual machine in the agent pool. + * + * @return OS of each virtual machine in the agent pool + */ OSType osType(); - /** @return agent pool type */ + /** + * Gets agent pool type. + * + * @return agent pool type + */ AgentPoolType type(); - /** @return agent pool mode */ + /** + * Gets agent pool mode. + * + * @return agent pool mode + */ AgentPoolMode mode(); - /** @return the name of the subnet used by each virtual machine in the agent pool */ + /** + * Gets the name of the subnet used by each virtual machine in the agent pool. + * + * @return the name of the subnet used by each virtual machine in the agent pool + */ String subnetName(); - /** @return the ID of the virtual network used by each virtual machine in the agent pool */ + /** + * Gets the ID of the virtual network used by each virtual machine in the agent pool. + * + * @return the ID of the virtual network used by each virtual machine in the agent pool + */ String networkId(); - /** @return the list of availability zones */ + /** + * Gets the list of availability zones. + * + * @return the list of availability zones + */ List availabilityZones(); - /** @return the map of node labels */ + /** + * Gets the map of node labels. + * + * @return the map of node labels + */ Map nodeLabels(); - /** @return the list of node taints */ + /** + * Gets the list of node taints. + * + * @return the list of node taints + */ List nodeTaints(); - /** @return the power state, Running or Stopped */ + /** + * Gets the power state. + * + * @return the power state, Running or Stopped + */ PowerState powerState(); - /** @return the number of agents (VMs) to host docker containers */ + /** + * Gets the number of agents (VMs) to host docker containers. + * + * @return the number of agents (VMs) to host docker containers + */ int nodeSize(); - /** @return the maximum number of pods per node */ + /** + * Gets the maximum number of pods per node. + * + * @return the maximum number of pods per node + */ int maximumPodsPerNode(); - /** @return whether auto-scaling is enabled */ + /** + * Checks whether auto-scaling is enabled. + * + * @return whether auto-scaling is enabled + */ boolean isAutoScalingEnabled(); - /** @return the minimum number of nodes for auto-scaling */ + /** + * Gets the minimum number of nodes for auto-scaling. + * + * @return the minimum number of nodes for auto-scaling + */ int minimumNodeSize(); - /** @return the maximum number of nodes for auto-scaling */ + /** + * Gets the maximum number of nodes for auto-scaling. + * + * @return the maximum number of nodes for auto-scaling + */ int maximumNodeSize(); - /** @return the priority of each virtual machines in the agent pool */ + /** + * Gets the priority of each virtual machines in the agent pool. + * + * @return the priority of each virtual machines in the agent pool + */ ScaleSetPriority virtualMachinePriority(); - /** @return the eviction policy of each virtual machines in the agent pool */ + /** + * Gets the eviction policy of each virtual machines in the agent pool. + * + * @return the eviction policy of each virtual machines in the agent pool + */ ScaleSetEvictionPolicy virtualMachineEvictionPolicy(); - /** @return the maximum price of each spot virtual machines in the agent pool, -1 means pay-as-you-go prices */ + /** + * Gets the maximum price of each spot virtual machines in the agent pool. + * + * @return the maximum price of each spot virtual machines in the agent pool, -1 means pay-as-you-go prices + */ Double virtualMachineMaximumPrice(); /** + * Gets the maximum price of each spot virtual machines in the agent pool. + * * @return the OS disk type to be used for machines in the agent pool */ OSDiskType osDiskType(); /** + * Gets the disk type for the placement. + * * @return the disk type for the placement of emptyDir volumes, container runtime data root, * and Kubelet ephemeral storage */ KubeletDiskType kubeletDiskType(); /** + * Gets the tags of the agents. + * * @return the tags of the agents. */ Map tags(); /** + * Checks whether FIPS-enabled OS is been used for agent pool's machines. + * * @return whether FIPS-enabled OS is been used for agent pool's machines * @see * Add a FIPS-enabled node pool for more details. diff --git a/sdk/resourcemanager/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ContainerServiceResourceTypes.java b/sdk/resourcemanager/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ContainerServiceResourceTypes.java index fb1bdb39645aa..8978582ae7ae5 100644 --- a/sdk/resourcemanager/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ContainerServiceResourceTypes.java +++ b/sdk/resourcemanager/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/ContainerServiceResourceTypes.java @@ -13,6 +13,15 @@ public class ContainerServiceResourceTypes extends ExpandableStringEnum values() { return values(ContainerServiceResourceTypes.class); } diff --git a/sdk/resourcemanager/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/KubernetesCluster.java b/sdk/resourcemanager/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/KubernetesCluster.java index ceabbcfb0d262..9893f706a06c2 100644 --- a/sdk/resourcemanager/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/KubernetesCluster.java +++ b/sdk/resourcemanager/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/KubernetesCluster.java @@ -27,91 +27,190 @@ public interface KubernetesCluster extends GroupableResource, Refreshable, Updatable, SupportsListingPrivateLinkResource, SupportsListingPrivateEndpointConnection { - /** @return the provisioning state of the Kubernetes cluster */ + /** + * Gets the provisioning state of the Kubernetes cluster. + * + * @return the provisioning state of the Kubernetes cluster + */ String provisioningState(); - /** @return the DNS prefix which was specified at creation time */ + /** + * Gets the DNS prefix which was specified at creation time. + * + * @return the DNS prefix which was specified at creation time + */ String dnsPrefix(); - /** @return the FQDN for the master pool */ + /** + * Gets the FQDN for the master pool. + * + * @return the FQDN for the master pool + */ String fqdn(); - /** @return the Kubernetes version */ + /** + * Gets the Kubernetes version. + * + * @return the Kubernetes version + */ String version(); - /** @return the Kubernetes configuration file content with administrative privileges to the cluster */ + /** + * Gets the Kubernetes configuration file content with administrative privileges to the cluster. + * + * @return the Kubernetes configuration file content with administrative privileges to the cluster + */ byte[] adminKubeConfigContent(); - /** @return the Kubernetes configuration file content with user-level privileges to the cluster */ + /** + * Gets the Kubernetes configuration file content with user-level privileges to the cluster. + * + * @return the Kubernetes configuration file content with user-level privileges to the cluster + */ byte[] userKubeConfigContent(); /** + * Gets the Kubernetes configuration file content with user-level privileges to the cluster. + * * @param format Only apply to AAD clusters, specifies the format of returned kubeconfig. Format 'azure' will return azure auth-provider kubeconfig; format 'exec' will return exec format kubeconfig, which requires kubelogin binary in the path. * @return the Kubernetes configuration file content with user-level privileges to the cluster */ byte[] userKubeConfigContent(Format format); - /** @return the Kubernetes credentials with administrative privileges to the cluster */ + /** + * Gets the Kubernetes credentials with administrative privileges to the cluster. + * + * @return the Kubernetes credentials with administrative privileges to the cluster + */ List adminKubeConfigs(); - /** @return the Kubernetes credentials with user-level privileges to the cluster */ + /** + * Gets the Kubernetes credentials with user-level privileges to the cluster. + * + * @return the Kubernetes credentials with user-level privileges to the cluster + */ List userKubeConfigs(); /** + * Gets the Kubernetes credentials with user-level privileges to the cluster. + * * @param format Only apply to AAD clusters, specifies the format of returned kubeconfig. Format 'azure' will return azure auth-provider kubeconfig; format 'exec' will return exec format kubeconfig, which requires kubelogin binary in the path. * @return the Kubernetes credentials with user-level privileges to the cluster */ List userKubeConfigs(Format format); - /** @return the service principal client ID */ + /** + * Gets the service principal client ID. + * + * @return the service principal client ID + */ String servicePrincipalClientId(); - /** @return the service principal secret */ + /** + * Gets the service principal secret. + * + * @return the service principal secret + */ String servicePrincipalSecret(); - /** @return the Linux root username */ + /** + * Gets the Linux root username. + * + * @return the Linux root username + */ String linuxRootUsername(); - /** @return the Linux SSH key */ + /** + * Gets the Linux SSH key. + * + * @return the Linux SSH key + */ String sshKey(); - /** @return the agent pools in the Kubernetes cluster */ + /** + * Gets the agent pools in the Kubernetes cluster. + * + * @return the agent pools in the Kubernetes cluster + */ Map agentPools(); - /** @return the network profile settings for the cluster */ + /** + * Gets the network profile settings for the cluster. + * + * @return the network profile settings for the cluster + */ ContainerServiceNetworkProfile networkProfile(); - /** @return the cluster's add-on's profiles */ + /** + * Gets the cluster's add-on's profiles. + * + * @return the cluster's add-on's profiles + */ Map addonProfiles(); - /** @return the name of the resource group containing agent pool nodes */ + /** + * Gets the name of the resource group containing agent pool nodes. + * + * @return the name of the resource group containing agent pool nodes + */ String nodeResourceGroup(); - /** @return true if Kubernetes Role-Based Access Control is enabled */ + /** + * Checks whether Kubernetes Role-Based Access Control is enabled. + * + * @return true if Kubernetes Role-Based Access Control is enabled + */ boolean enableRBAC(); - /** @return the power state */ + /** + * Gets the power state. + * + * @return the power state + */ PowerState powerState(); - /** @return the SKU of a Managed Cluster */ + /** + * Gets the SKU of a Managed Cluster. + * + * @return the SKU of a Managed Cluster + */ ManagedClusterSku sku(); /** + * Gets the System Assigned Managed Service Identity specific Active Directory service principal ID + * assigned to the Kubernetes cluster. + * * @return the System Assigned Managed Service Identity specific Active Directory service principal ID * assigned to the Kubernetes cluster. */ String systemAssignedManagedServiceIdentityPrincipalId(); - /** @return the IDs (object IDs) of the Azure AD groups as the admin group of the cluster. */ + /** + * Gets the IDs (object IDs) of the Azure AD groups as the admin group of the cluster. + * + * @return the IDs (object IDs) of the Azure AD groups as the admin group of the cluster. + */ List azureActiveDirectoryGroupIds(); - /** @return whether local accounts is enabled. */ + /** + * Checks whether local accounts is enabled. + * + * @return whether local accounts is enabled. + */ boolean isLocalAccountsEnabled(); - /** @return whether Azure Role-Based Access Control for Kubernetes authorization is enabled. */ + /** + * Checks whether Azure Role-Based Access Control for Kubernetes authorization is enabled. + * + * @return whether Azure Role-Based Access Control for Kubernetes authorization is enabled. + */ boolean isAzureRbacEnabled(); - /** @return resource ID of the disk encryption set. */ + /** + * Gets resource ID of the disk encryption set. + * + * @return resource ID of the disk encryption set. + */ String diskEncryptionSetId(); /** @@ -122,7 +221,7 @@ public interface KubernetesCluster String agentPoolResourceGroup(); /** - * Whether the kubernetes cluster can be accessed from public network. + * Checks whether the kubernetes cluster can be accessed from public network. * * @return whether the kubernetes cluster can be accessed from public network. */ diff --git a/sdk/resourcemanager/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/KubernetesClusterAgentPool.java b/sdk/resourcemanager/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/KubernetesClusterAgentPool.java index 8507831fb4deb..5b35b723e25bc 100644 --- a/sdk/resourcemanager/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/KubernetesClusterAgentPool.java +++ b/sdk/resourcemanager/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/KubernetesClusterAgentPool.java @@ -17,81 +17,171 @@ public interface KubernetesClusterAgentPool extends ChildResource, HasInnerModel, AgentPool { - /** @return the provisioning state of the agent pool */ + /** + * Gets the provisioning state of the agent pool. + * + * @return the provisioning state of the agent pool + */ String provisioningState(); - /** @return the number of agents (virtual machines) to host docker containers */ + /** + * Gets the number of agents (virtual machines) to host docker containers. + * + * @return the number of agents (virtual machines) to host docker containers + */ int count(); - /** @return size of each agent virtual machine in the agent pool */ + /** + * Gets size of each agent virtual machine in the agent pool. + * + * @return size of each agent virtual machine in the agent pool + */ ContainerServiceVMSizeTypes vmSize(); - /** @return OS disk size in GB set for each virtual machine in the agent pool */ + /** + * Gets OS disk size in GB set for each virtual machine in the agent pool. + * + * @return OS disk size in GB set for each virtual machine in the agent pool + */ int osDiskSizeInGB(); - /** @return OS of each virtual machine in the agent pool */ + /** + * Gets OS of each virtual machine in the agent pool. + * + * @return OS of each virtual machine in the agent pool + */ OSType osType(); - /** @return agent pool type */ + /** + * Gets agent pool type. + * + * @return agent pool type + */ AgentPoolType type(); - /** @return agent pool mode */ + /** + * Gets agent pool mode. + * + * @return agent pool mode + */ AgentPoolMode mode(); - /** @return the name of the subnet used by each virtual machine in the agent pool */ + /** + * Gets the name of the subnet used by each virtual machine in the agent pool. + * + * @return the name of the subnet used by each virtual machine in the agent pool + */ String subnetName(); - /** @return the ID of the virtual network used by each virtual machine in the agent pool */ + /** + * Gets the ID of the virtual network used by each virtual machine in the agent pool. + * + * @return the ID of the virtual network used by each virtual machine in the agent pool + */ String networkId(); - /** @return the list of availability zones */ + /** + * Gets the list of availability zones. + * + * @return the list of availability zones + */ List availabilityZones(); - /** @return the map of node labels */ + /** + * Gets the map of node labels. + * + * @return the map of node labels + */ Map nodeLabels(); - /** @return the list of node taints */ + /** + * Gets the list of node taints. + * + * @return the list of node taints + */ List nodeTaints(); - /** @return the power state, Running or Stopped */ + /** + * Gets the power state. + * + * @return the power state, Running or Stopped + */ PowerState powerState(); - /** @return the number of agents (VMs) to host docker containers */ + /** + * Gets the number of agents (VMs) to host docker containers. + * + * @return the number of agents (VMs) to host docker containers + */ int nodeSize(); - /** @return the maximum number of pods per node */ + /** + * Gets the maximum number of pods per node. + * + * @return the maximum number of pods per node + */ int maximumPodsPerNode(); - /** @return whether auto-scaling is enabled */ + /** + * Checks whether auto-scaling is enabled. + * + * @return whether auto-scaling is enabled + */ boolean isAutoScalingEnabled(); - /** @return the minimum number of nodes for auto-scaling */ + /** + * Gets the minimum number of nodes for auto-scaling. + * + * @return the minimum number of nodes for auto-scaling + */ int minimumNodeSize(); - /** @return the maximum number of nodes for auto-scaling */ + /** + * Gets the maximum number of nodes for auto-scaling. + * + * @return the maximum number of nodes for auto-scaling + */ int maximumNodeSize(); - /** @return the priority of each virtual machines in the agent pool */ + /** + * Gets the priority of each virtual machines in the agent pool. + * + * @return the priority of each virtual machines in the agent pool + */ ScaleSetPriority virtualMachinePriority(); - /** @return the eviction policy of each virtual machines in the agent pool */ + /** + * Gets the eviction policy of each virtual machines in the agent pool. + * + * @return the eviction policy of each virtual machines in the agent pool + */ ScaleSetEvictionPolicy virtualMachineEvictionPolicy(); - /** @return the maximum price of each spot virtual machines in the agent pool, -1 means pay-as-you-go prices */ + /** + * Gets the maximum price of each spot virtual machines in the agent pool. + * + * @return the maximum price of each spot virtual machines in the agent pool, -1 means pay-as-you-go prices + */ Double virtualMachineMaximumPrice(); /** + * Gets the OS disk type to be used for machines in the agent pool. + * * @return the OS disk type to be used for machines in the agent pool */ OSDiskType osDiskType(); /** + * Gets the disk type for the placement. + * * @return the disk type for the placement of emptyDir volumes, container runtime data root, * and Kubelet ephemeral storage */ KubeletDiskType kubeletDiskType(); /** + * Gets the tags of the agents. + * * @return the tags of the agents. */ Map tags(); @@ -461,7 +551,11 @@ interface WithAttach extends WithOSType, WithOSDiskSize the stage of the container service definition to return to after attaching this definition + */ interface Update extends Settable, UpdateStages.WithAgentPoolVirtualMachineCount, UpdateStages.WithAutoScaling, UpdateStages.WithAgentPoolMode, UpdateStages.WithDiskType, UpdateStages.WithTags { diff --git a/sdk/resourcemanager/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/KubernetesClusterUpgradeProfile.java b/sdk/resourcemanager/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/KubernetesClusterUpgradeProfile.java index db8e12be3818c..a960220bf0cdb 100644 --- a/sdk/resourcemanager/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/KubernetesClusterUpgradeProfile.java +++ b/sdk/resourcemanager/azure-resourcemanager-containerservice/src/main/java/com/azure/resourcemanager/containerservice/models/KubernetesClusterUpgradeProfile.java @@ -9,12 +9,24 @@ /** The result of checking for the Kubernetes cluster's upgrade profile. */ @Fluent() public interface KubernetesClusterUpgradeProfile extends HasInnerModel { - /** @return the ID of the Kubernetes cluster upgrade profile */ + /** + * Gets the ID of the Kubernetes cluster upgrade profile. + * + * @return the ID of the Kubernetes cluster upgrade profile + */ String id(); - /** @return the name of the Kubernetes cluster upgrade profile */ + /** + * Gets the name of the Kubernetes cluster upgrade profile. + * + * @return the name of the Kubernetes cluster upgrade profile + */ String name(); - /** @return the type of the Kubernetes cluster upgrade profile. */ + /** + * Gets the type of the Kubernetes cluster upgrade profile. + * + * @return the type of the Kubernetes cluster upgrade profile. + */ String type(); }