Skip to content

Commit

Permalink
[AutoRelease] t1-containerservice-2021-04-07-45043 (Azure#17864)
Browse files Browse the repository at this point in the history
* CodeGen from PR 13763 in Azure/azure-rest-api-specs
[aks] fix vm size model and osDiskType description  (Azure#13763)

* fix: agent pool vm size should be string, not enum

* fix: osDiskType default description for >= 2020-11-01

* version,CHANGELOG

* test

Co-authored-by: SDKAuto <[email protected]>
Co-authored-by: PythonSdkPipelines <PythonSdkPipelines>
  • Loading branch information
msyyc and SDKAuto authored Apr 7, 2021
1 parent a7c4b24 commit 977bfe9
Show file tree
Hide file tree
Showing 53 changed files with 10,724 additions and 708 deletions.
23 changes: 23 additions & 0 deletions sdk/containerservice/azure-mgmt-containerservice/CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,28 @@
# Release History

## 11.2.0 (2021-04-07)

**Features**

- Model ManagedClusterAgentPoolProfile has a new parameter gpu_instance_profile
- Model ManagedClusterAgentPoolProfile has a new parameter enable_fips
- Model ManagedClusterAgentPoolProfile has a new parameter os_sku
- Model AgentPool has a new parameter gpu_instance_profile
- Model AgentPool has a new parameter enable_fips
- Model AgentPool has a new parameter os_sku
- Model ManagedClusterPodIdentity has a new parameter binding_selector
- Model ManagedClusterAgentPoolProfileProperties has a new parameter gpu_instance_profile
- Model ManagedClusterAgentPoolProfileProperties has a new parameter enable_fips
- Model ManagedClusterAgentPoolProfileProperties has a new parameter os_sku
- Model ManagedClusterWindowsProfile has a new parameter enable_csi_proxy
- Model ManagedCluster has a new parameter disable_local_accounts
- Model ManagedCluster has a new parameter http_proxy_config
- Model ManagedCluster has a new parameter private_link_resources
- Model ManagedCluster has a new parameter extended_location
- Added operation ManagedClustersOperations.run_command
- Added operation ManagedClustersOperations.get_command_result
- Added operation ManagedClustersOperations.get_os_options

## 11.1.0 (2021-03-03)

**Features**
Expand Down
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
include _meta.json
recursive-include tests *.py *.yaml
include *.md
include azure/__init__.py
Expand Down
8 changes: 8 additions & 0 deletions sdk/containerservice/azure-mgmt-containerservice/_meta.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
{
"autorest": "V2",
"use": "@microsoft.azure/autorest.python@~4.0.71",
"commit": "8c3c899722a412e9e61264459d6426e64925cd68",
"repository_url": "https://github.com/Azure/azure-rest-api-specs",
"autorest_command": "autorest specification/containerservice/resource-manager/readme.md --keep-version-file --multiapi --no-async --python --python-mode=update --python-sdks-folder=/home/vsts/work/1/s/azure-sdk-for-python/sdk [email protected]/autorest.python@~4.0.71 --version=V2",
"readme": "specification/containerservice/resource-manager/readme.md"
}
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ class ContainerServiceClient(MultiApiClientMixin, SDKClient):
:type profile: azure.profiles.KnownProfiles
"""

DEFAULT_API_VERSION = '2021-02-01'
DEFAULT_API_VERSION = '2021-03-01'
_PROFILE_TAG = "azure.mgmt.containerservice.ContainerServiceClient"
LATEST_PROFILE = ProfileDefinition({
_PROFILE_TAG: {
Expand Down Expand Up @@ -97,6 +97,7 @@ def models(cls, api_version=DEFAULT_API_VERSION):
* 2020-11-01: :mod:`v2020_11_01.models<azure.mgmt.containerservice.v2020_11_01.models>`
* 2020-12-01: :mod:`v2020_12_01.models<azure.mgmt.containerservice.v2020_12_01.models>`
* 2021-02-01: :mod:`v2021_02_01.models<azure.mgmt.containerservice.v2021_02_01.models>`
* 2021-03-01: :mod:`v2021_03_01.models<azure.mgmt.containerservice.v2021_03_01.models>`
"""
if api_version == '2017-07-01':
from .v2017_07_01 import models
Expand Down Expand Up @@ -167,6 +168,9 @@ def models(cls, api_version=DEFAULT_API_VERSION):
elif api_version == '2021-02-01':
from .v2021_02_01 import models
return models
elif api_version == '2021-03-01':
from .v2021_03_01 import models
return models
raise NotImplementedError("APIVersion {} is not available".format(api_version))

@property
Expand All @@ -189,6 +193,7 @@ def agent_pools(self):
* 2020-11-01: :class:`AgentPoolsOperations<azure.mgmt.containerservice.v2020_11_01.operations.AgentPoolsOperations>`
* 2020-12-01: :class:`AgentPoolsOperations<azure.mgmt.containerservice.v2020_12_01.operations.AgentPoolsOperations>`
* 2021-02-01: :class:`AgentPoolsOperations<azure.mgmt.containerservice.v2021_02_01.operations.AgentPoolsOperations>`
* 2021-03-01: :class:`AgentPoolsOperations<azure.mgmt.containerservice.v2021_03_01.operations.AgentPoolsOperations>`
"""
api_version = self._get_api_version('agent_pools')
if api_version == '2019-02-01':
Expand Down Expand Up @@ -223,6 +228,8 @@ def agent_pools(self):
from .v2020_12_01.operations import AgentPoolsOperations as OperationClass
elif api_version == '2021-02-01':
from .v2021_02_01.operations import AgentPoolsOperations as OperationClass
elif api_version == '2021-03-01':
from .v2021_03_01.operations import AgentPoolsOperations as OperationClass
else:
raise NotImplementedError("APIVersion {} is not available".format(api_version))
return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
Expand All @@ -246,12 +253,15 @@ def maintenance_configurations(self):
* 2020-12-01: :class:`MaintenanceConfigurationsOperations<azure.mgmt.containerservice.v2020_12_01.operations.MaintenanceConfigurationsOperations>`
* 2021-02-01: :class:`MaintenanceConfigurationsOperations<azure.mgmt.containerservice.v2021_02_01.operations.MaintenanceConfigurationsOperations>`
* 2021-03-01: :class:`MaintenanceConfigurationsOperations<azure.mgmt.containerservice.v2021_03_01.operations.MaintenanceConfigurationsOperations>`
"""
api_version = self._get_api_version('maintenance_configurations')
if api_version == '2020-12-01':
from .v2020_12_01.operations import MaintenanceConfigurationsOperations as OperationClass
elif api_version == '2021-02-01':
from .v2021_02_01.operations import MaintenanceConfigurationsOperations as OperationClass
elif api_version == '2021-03-01':
from .v2021_03_01.operations import MaintenanceConfigurationsOperations as OperationClass
else:
raise NotImplementedError("APIVersion {} is not available".format(api_version))
return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
Expand All @@ -278,6 +288,7 @@ def managed_clusters(self):
* 2020-11-01: :class:`ManagedClustersOperations<azure.mgmt.containerservice.v2020_11_01.operations.ManagedClustersOperations>`
* 2020-12-01: :class:`ManagedClustersOperations<azure.mgmt.containerservice.v2020_12_01.operations.ManagedClustersOperations>`
* 2021-02-01: :class:`ManagedClustersOperations<azure.mgmt.containerservice.v2021_02_01.operations.ManagedClustersOperations>`
* 2021-03-01: :class:`ManagedClustersOperations<azure.mgmt.containerservice.v2021_03_01.operations.ManagedClustersOperations>`
"""
api_version = self._get_api_version('managed_clusters')
if api_version == '2018-03-31':
Expand Down Expand Up @@ -316,6 +327,8 @@ def managed_clusters(self):
from .v2020_12_01.operations import ManagedClustersOperations as OperationClass
elif api_version == '2021-02-01':
from .v2021_02_01.operations import ManagedClustersOperations as OperationClass
elif api_version == '2021-03-01':
from .v2021_03_01.operations import ManagedClustersOperations as OperationClass
else:
raise NotImplementedError("APIVersion {} is not available".format(api_version))
return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
Expand Down Expand Up @@ -364,6 +377,7 @@ def operations(self):
* 2020-11-01: :class:`Operations<azure.mgmt.containerservice.v2020_11_01.operations.Operations>`
* 2020-12-01: :class:`Operations<azure.mgmt.containerservice.v2020_12_01.operations.Operations>`
* 2021-02-01: :class:`Operations<azure.mgmt.containerservice.v2021_02_01.operations.Operations>`
* 2021-03-01: :class:`Operations<azure.mgmt.containerservice.v2021_03_01.operations.Operations>`
"""
api_version = self._get_api_version('operations')
if api_version == '2018-03-31':
Expand Down Expand Up @@ -402,6 +416,8 @@ def operations(self):
from .v2020_12_01.operations import Operations as OperationClass
elif api_version == '2021-02-01':
from .v2021_02_01.operations import Operations as OperationClass
elif api_version == '2021-03-01':
from .v2021_03_01.operations import Operations as OperationClass
else:
raise NotImplementedError("APIVersion {} is not available".format(api_version))
return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
Expand All @@ -416,6 +432,7 @@ def private_endpoint_connections(self):
* 2020-11-01: :class:`PrivateEndpointConnectionsOperations<azure.mgmt.containerservice.v2020_11_01.operations.PrivateEndpointConnectionsOperations>`
* 2020-12-01: :class:`PrivateEndpointConnectionsOperations<azure.mgmt.containerservice.v2020_12_01.operations.PrivateEndpointConnectionsOperations>`
* 2021-02-01: :class:`PrivateEndpointConnectionsOperations<azure.mgmt.containerservice.v2021_02_01.operations.PrivateEndpointConnectionsOperations>`
* 2021-03-01: :class:`PrivateEndpointConnectionsOperations<azure.mgmt.containerservice.v2021_03_01.operations.PrivateEndpointConnectionsOperations>`
"""
api_version = self._get_api_version('private_endpoint_connections')
if api_version == '2020-06-01':
Expand All @@ -430,6 +447,8 @@ def private_endpoint_connections(self):
from .v2020_12_01.operations import PrivateEndpointConnectionsOperations as OperationClass
elif api_version == '2021-02-01':
from .v2021_02_01.operations import PrivateEndpointConnectionsOperations as OperationClass
elif api_version == '2021-03-01':
from .v2021_03_01.operations import PrivateEndpointConnectionsOperations as OperationClass
else:
raise NotImplementedError("APIVersion {} is not available".format(api_version))
return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
Expand All @@ -442,6 +461,7 @@ def private_link_resources(self):
* 2020-11-01: :class:`PrivateLinkResourcesOperations<azure.mgmt.containerservice.v2020_11_01.operations.PrivateLinkResourcesOperations>`
* 2020-12-01: :class:`PrivateLinkResourcesOperations<azure.mgmt.containerservice.v2020_12_01.operations.PrivateLinkResourcesOperations>`
* 2021-02-01: :class:`PrivateLinkResourcesOperations<azure.mgmt.containerservice.v2021_02_01.operations.PrivateLinkResourcesOperations>`
* 2021-03-01: :class:`PrivateLinkResourcesOperations<azure.mgmt.containerservice.v2021_03_01.operations.PrivateLinkResourcesOperations>`
"""
api_version = self._get_api_version('private_link_resources')
if api_version == '2020-09-01':
Expand All @@ -452,6 +472,8 @@ def private_link_resources(self):
from .v2020_12_01.operations import PrivateLinkResourcesOperations as OperationClass
elif api_version == '2021-02-01':
from .v2021_02_01.operations import PrivateLinkResourcesOperations as OperationClass
elif api_version == '2021-03-01':
from .v2021_03_01.operations import PrivateLinkResourcesOperations as OperationClass
else:
raise NotImplementedError("APIVersion {} is not available".format(api_version))
return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
Expand All @@ -464,6 +486,7 @@ def resolve_private_link_service_id(self):
* 2020-11-01: :class:`ResolvePrivateLinkServiceIdOperations<azure.mgmt.containerservice.v2020_11_01.operations.ResolvePrivateLinkServiceIdOperations>`
* 2020-12-01: :class:`ResolvePrivateLinkServiceIdOperations<azure.mgmt.containerservice.v2020_12_01.operations.ResolvePrivateLinkServiceIdOperations>`
* 2021-02-01: :class:`ResolvePrivateLinkServiceIdOperations<azure.mgmt.containerservice.v2021_02_01.operations.ResolvePrivateLinkServiceIdOperations>`
* 2021-03-01: :class:`ResolvePrivateLinkServiceIdOperations<azure.mgmt.containerservice.v2021_03_01.operations.ResolvePrivateLinkServiceIdOperations>`
"""
api_version = self._get_api_version('resolve_private_link_service_id')
if api_version == '2020-09-01':
Expand All @@ -474,6 +497,8 @@ def resolve_private_link_service_id(self):
from .v2020_12_01.operations import ResolvePrivateLinkServiceIdOperations as OperationClass
elif api_version == '2021-02-01':
from .v2021_02_01.operations import ResolvePrivateLinkServiceIdOperations as OperationClass
elif api_version == '2021-03-01':
from .v2021_03_01.operations import ResolvePrivateLinkServiceIdOperations as OperationClass
else:
raise NotImplementedError("APIVersion {} is not available".format(api_version))
return OperationClass(self._client, self.config, Serializer(self._models_dict(api_version)), Deserializer(self._models_dict(api_version)))
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@
# --------------------------------------------------------------------------
from .v2017_07_01.models import *
from .v2019_04_30.models import *
from .v2021_02_01.models import *
from .v2021_03_01.models import *
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
# regenerated.
# --------------------------------------------------------------------------

VERSION = "11.1.0"
VERSION = "11.2.0"

Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
# regenerated.
# --------------------------------------------------------------------------

VERSION = "11.1.0"
VERSION = "11.2.0"

Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
# regenerated.
# --------------------------------------------------------------------------

VERSION = "11.1.0"
VERSION = "11.2.0"

Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
# regenerated.
# --------------------------------------------------------------------------

VERSION = "11.1.0"
VERSION = "11.2.0"

Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
# regenerated.
# --------------------------------------------------------------------------

VERSION = "11.1.0"
VERSION = "11.2.0"

Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
# regenerated.
# --------------------------------------------------------------------------

VERSION = "11.1.0"
VERSION = "11.2.0"

Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
# regenerated.
# --------------------------------------------------------------------------

VERSION = "11.1.0"
VERSION = "11.2.0"

Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
# regenerated.
# --------------------------------------------------------------------------

VERSION = "11.1.0"
VERSION = "11.2.0"

Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
# regenerated.
# --------------------------------------------------------------------------

VERSION = "11.1.0"
VERSION = "11.2.0"

Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
# regenerated.
# --------------------------------------------------------------------------

VERSION = "11.1.0"
VERSION = "11.2.0"

Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
# regenerated.
# --------------------------------------------------------------------------

VERSION = "11.1.0"
VERSION = "11.2.0"

Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
# regenerated.
# --------------------------------------------------------------------------

VERSION = "11.1.0"
VERSION = "11.2.0"

Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
# regenerated.
# --------------------------------------------------------------------------

VERSION = "11.1.0"
VERSION = "11.2.0"

Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
# regenerated.
# --------------------------------------------------------------------------

VERSION = "11.1.0"
VERSION = "11.2.0"

Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
# regenerated.
# --------------------------------------------------------------------------

VERSION = "11.1.0"
VERSION = "11.2.0"

Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
# regenerated.
# --------------------------------------------------------------------------

VERSION = "11.1.0"
VERSION = "11.2.0"

Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
# regenerated.
# --------------------------------------------------------------------------

VERSION = "11.1.0"
VERSION = "11.2.0"

Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
# regenerated.
# --------------------------------------------------------------------------

VERSION = "11.1.0"
VERSION = "11.2.0"

Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
# regenerated.
# --------------------------------------------------------------------------

VERSION = "11.1.0"
VERSION = "11.2.0"

Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,5 @@
# regenerated.
# --------------------------------------------------------------------------

VERSION = "11.1.0"
VERSION = "11.2.0"

Original file line number Diff line number Diff line change
Expand Up @@ -123,9 +123,11 @@ class AgentPool(SubResource):
will apply the default osDisk size according to the vmSize specified.
:type os_disk_size_gb: int
:param os_disk_type: OS disk type to be used for machines in a given agent
pool. Allowed values are 'Ephemeral' and 'Managed'. Defaults to 'Managed'.
May not be changed after creation. Possible values include: 'Managed',
'Ephemeral'
pool. Allowed values are 'Ephemeral' and 'Managed'. If unspecified,
defaults to 'Ephemeral' when the VM supports ephemeral OS and has a cache
disk larger than the requested OSDiskSizeGB. Otherwise, defaults to
'Managed'. May not be changed after creation. Possible values include:
'Managed', 'Ephemeral'
:type os_disk_type: str or
~azure.mgmt.containerservice.v2020_11_01.models.OSDiskType
:param vnet_subnet_id: VNet SubnetID specifies the VNet's subnet
Expand Down Expand Up @@ -1421,9 +1423,11 @@ class ManagedClusterAgentPoolProfileProperties(Model):
will apply the default osDisk size according to the vmSize specified.
:type os_disk_size_gb: int
:param os_disk_type: OS disk type to be used for machines in a given agent
pool. Allowed values are 'Ephemeral' and 'Managed'. Defaults to 'Managed'.
May not be changed after creation. Possible values include: 'Managed',
'Ephemeral'
pool. Allowed values are 'Ephemeral' and 'Managed'. If unspecified,
defaults to 'Ephemeral' when the VM supports ephemeral OS and has a cache
disk larger than the requested OSDiskSizeGB. Otherwise, defaults to
'Managed'. May not be changed after creation. Possible values include:
'Managed', 'Ephemeral'
:type os_disk_type: str or
~azure.mgmt.containerservice.v2020_11_01.models.OSDiskType
:param vnet_subnet_id: VNet SubnetID specifies the VNet's subnet
Expand Down Expand Up @@ -1651,9 +1655,11 @@ class ManagedClusterAgentPoolProfile(ManagedClusterAgentPoolProfileProperties):
will apply the default osDisk size according to the vmSize specified.
:type os_disk_size_gb: int
:param os_disk_type: OS disk type to be used for machines in a given agent
pool. Allowed values are 'Ephemeral' and 'Managed'. Defaults to 'Managed'.
May not be changed after creation. Possible values include: 'Managed',
'Ephemeral'
pool. Allowed values are 'Ephemeral' and 'Managed'. If unspecified,
defaults to 'Ephemeral' when the VM supports ephemeral OS and has a cache
disk larger than the requested OSDiskSizeGB. Otherwise, defaults to
'Managed'. May not be changed after creation. Possible values include:
'Managed', 'Ephemeral'
:type os_disk_type: str or
~azure.mgmt.containerservice.v2020_11_01.models.OSDiskType
:param vnet_subnet_id: VNet SubnetID specifies the VNet's subnet
Expand Down
Loading

0 comments on commit 977bfe9

Please sign in to comment.