From 5e85f7ac53c7c23dda8a98d9e9f775ea0ac63fa6 Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Fri, 25 May 2018 22:30:24 +0000 Subject: [PATCH 1/3] Generated from e365e10741ba688b8c3b39b67986e2b6e06e4ddc Rename to ManagedClusterAgentPoolProfile. Its fields have diverged from ContainerServiceAgentPoolProfile. --- .../container_service_client.py | 6 +- .../mgmt/containerservice/models/__init__.py | 21 +++ .../models/compute_operation_value.py | 60 +++++++ .../models/compute_operation_value_paged.py | 27 ++++ .../models/compute_operation_value_py3.py | 60 +++++++ .../models/container_service_client_enums.py | 12 ++ .../container_service_network_profile.py | 67 ++++++++ .../container_service_network_profile_py3.py | 67 ++++++++ .../models/managed_cluster.py | 34 +++- .../models/managed_cluster_aad_profile.py | 49 ++++++ .../models/managed_cluster_aad_profile_py3.py | 49 ++++++ .../models/managed_cluster_addon_profile.py | 38 +++++ .../managed_cluster_addon_profile_py3.py | 38 +++++ .../managed_cluster_agent_pool_profile.py | 147 ++++++++++++++++++ .../managed_cluster_agent_pool_profile_py3.py | 147 ++++++++++++++++++ .../models/managed_cluster_py3.py | 36 ++++- .../containerservice/operations/__init__.py | 2 + .../operations/managed_clusters_operations.py | 78 +--------- .../containerservice/operations/operations.py | 99 ++++++++++++ .../azure/mgmt/containerservice/version.py | 2 +- 20 files changed, 946 insertions(+), 93 deletions(-) create mode 100644 azure-mgmt-containerservice/azure/mgmt/containerservice/models/compute_operation_value.py create mode 100644 azure-mgmt-containerservice/azure/mgmt/containerservice/models/compute_operation_value_paged.py create mode 100644 azure-mgmt-containerservice/azure/mgmt/containerservice/models/compute_operation_value_py3.py create mode 100644 azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_network_profile.py create mode 100644 azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_network_profile_py3.py create mode 100644 azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_aad_profile.py create mode 100644 azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_aad_profile_py3.py create mode 100644 azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_addon_profile.py create mode 100644 azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_addon_profile_py3.py create mode 100644 azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_agent_pool_profile.py create mode 100644 azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_agent_pool_profile_py3.py create mode 100644 azure-mgmt-containerservice/azure/mgmt/containerservice/operations/operations.py diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/container_service_client.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/container_service_client.py index e28da4b406f5..a5d7eb651da6 100644 --- a/azure-mgmt-containerservice/azure/mgmt/containerservice/container_service_client.py +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/container_service_client.py @@ -9,12 +9,12 @@ # regenerated. # -------------------------------------------------------------------------- -import warnings from msrest.service_client import SDKClient from msrest import Serializer, Deserializer from msrestazure import AzureConfiguration from .version import VERSION from .operations.container_services_operations import ContainerServicesOperations +from .operations.operations import Operations from .operations.managed_clusters_operations import ManagedClustersOperations from . import models @@ -61,6 +61,8 @@ class ContainerServiceClient(SDKClient): :ivar container_services: ContainerServices operations :vartype container_services: azure.mgmt.containerservice.operations.ContainerServicesOperations + :ivar operations: Operations operations + :vartype operations: azure.mgmt.containerservice.operations.Operations :ivar managed_clusters: ManagedClusters operations :vartype managed_clusters: azure.mgmt.containerservice.operations.ManagedClustersOperations @@ -86,5 +88,7 @@ def __init__( self.container_services = ContainerServicesOperations( self._client, self.config, self._serialize, self._deserialize) + self.operations = Operations( + self._client, self.config, self._serialize, self._deserialize) self.managed_clusters = ManagedClustersOperations( self._client, self.config, self._serialize, self._deserialize) diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/__init__.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/__init__.py index b15f92d0cee8..3be1559b0294 100644 --- a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/__init__.py +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/__init__.py @@ -24,6 +24,11 @@ from .container_service_vm_diagnostics_py3 import ContainerServiceVMDiagnostics from .container_service_diagnostics_profile_py3 import ContainerServiceDiagnosticsProfile from .container_service_py3 import ContainerService + from .compute_operation_value_py3 import ComputeOperationValue + from .managed_cluster_agent_pool_profile_py3 import ManagedClusterAgentPoolProfile + from .container_service_network_profile_py3 import ContainerServiceNetworkProfile + from .managed_cluster_addon_profile_py3 import ManagedClusterAddonProfile + from .managed_cluster_aad_profile_py3 import ManagedClusterAADProfile from .managed_cluster_py3 import ManagedCluster from .orchestrator_profile_py3 import OrchestratorProfile from .managed_cluster_access_profile_py3 import ManagedClusterAccessProfile @@ -46,6 +51,11 @@ from .container_service_vm_diagnostics import ContainerServiceVMDiagnostics from .container_service_diagnostics_profile import ContainerServiceDiagnosticsProfile from .container_service import ContainerService + from .compute_operation_value import ComputeOperationValue + from .managed_cluster_agent_pool_profile import ManagedClusterAgentPoolProfile + from .container_service_network_profile import ContainerServiceNetworkProfile + from .managed_cluster_addon_profile import ManagedClusterAddonProfile + from .managed_cluster_aad_profile import ManagedClusterAADProfile from .managed_cluster import ManagedCluster from .orchestrator_profile import OrchestratorProfile from .managed_cluster_access_profile import ManagedClusterAccessProfile @@ -54,12 +64,15 @@ from .orchestrator_version_profile import OrchestratorVersionProfile from .orchestrator_version_profile_list_result import OrchestratorVersionProfileListResult from .container_service_paged import ContainerServicePaged +from .compute_operation_value_paged import ComputeOperationValuePaged from .managed_cluster_paged import ManagedClusterPaged from .container_service_client_enums import ( ContainerServiceStorageProfileTypes, ContainerServiceVMSizeTypes, ContainerServiceOrchestratorTypes, OSType, + NetworkPlugin, + NetworkPolicy, ) __all__ = [ @@ -77,6 +90,11 @@ 'ContainerServiceVMDiagnostics', 'ContainerServiceDiagnosticsProfile', 'ContainerService', + 'ComputeOperationValue', + 'ManagedClusterAgentPoolProfile', + 'ContainerServiceNetworkProfile', + 'ManagedClusterAddonProfile', + 'ManagedClusterAADProfile', 'ManagedCluster', 'OrchestratorProfile', 'ManagedClusterAccessProfile', @@ -85,9 +103,12 @@ 'OrchestratorVersionProfile', 'OrchestratorVersionProfileListResult', 'ContainerServicePaged', + 'ComputeOperationValuePaged', 'ManagedClusterPaged', 'ContainerServiceStorageProfileTypes', 'ContainerServiceVMSizeTypes', 'ContainerServiceOrchestratorTypes', 'OSType', + 'NetworkPlugin', + 'NetworkPolicy', ] diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/compute_operation_value.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/compute_operation_value.py new file mode 100644 index 000000000000..525ef3bbb69a --- /dev/null +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/compute_operation_value.py @@ -0,0 +1,60 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ComputeOperationValue(Model): + """Describes the properties of a Compute Operation value. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :ivar origin: The origin of the compute operation. + :vartype origin: str + :ivar name: The name of the compute operation. + :vartype name: str + :ivar operation: The display name of the compute operation. + :vartype operation: str + :ivar resource: The display name of the resource the operation applies to. + :vartype resource: str + :ivar description: The description of the operation. + :vartype description: str + :ivar provider: The resource provider for the operation. + :vartype provider: str + """ + + _validation = { + 'origin': {'readonly': True}, + 'name': {'readonly': True}, + 'operation': {'readonly': True}, + 'resource': {'readonly': True}, + 'description': {'readonly': True}, + 'provider': {'readonly': True}, + } + + _attribute_map = { + 'origin': {'key': 'origin', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'operation': {'key': 'display.operation', 'type': 'str'}, + 'resource': {'key': 'display.resource', 'type': 'str'}, + 'description': {'key': 'display.description', 'type': 'str'}, + 'provider': {'key': 'display.provider', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(ComputeOperationValue, self).__init__(**kwargs) + self.origin = None + self.name = None + self.operation = None + self.resource = None + self.description = None + self.provider = None diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/compute_operation_value_paged.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/compute_operation_value_paged.py new file mode 100644 index 000000000000..aad0effe7bc6 --- /dev/null +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/compute_operation_value_paged.py @@ -0,0 +1,27 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.paging import Paged + + +class ComputeOperationValuePaged(Paged): + """ + A paging container for iterating over a list of :class:`ComputeOperationValue ` object + """ + + _attribute_map = { + 'next_link': {'key': 'nextLink', 'type': 'str'}, + 'current_page': {'key': 'value', 'type': '[ComputeOperationValue]'} + } + + def __init__(self, *args, **kwargs): + + super(ComputeOperationValuePaged, self).__init__(*args, **kwargs) diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/compute_operation_value_py3.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/compute_operation_value_py3.py new file mode 100644 index 000000000000..3c4388f312b9 --- /dev/null +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/compute_operation_value_py3.py @@ -0,0 +1,60 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ComputeOperationValue(Model): + """Describes the properties of a Compute Operation value. + + Variables are only populated by the server, and will be ignored when + sending a request. + + :ivar origin: The origin of the compute operation. + :vartype origin: str + :ivar name: The name of the compute operation. + :vartype name: str + :ivar operation: The display name of the compute operation. + :vartype operation: str + :ivar resource: The display name of the resource the operation applies to. + :vartype resource: str + :ivar description: The description of the operation. + :vartype description: str + :ivar provider: The resource provider for the operation. + :vartype provider: str + """ + + _validation = { + 'origin': {'readonly': True}, + 'name': {'readonly': True}, + 'operation': {'readonly': True}, + 'resource': {'readonly': True}, + 'description': {'readonly': True}, + 'provider': {'readonly': True}, + } + + _attribute_map = { + 'origin': {'key': 'origin', 'type': 'str'}, + 'name': {'key': 'name', 'type': 'str'}, + 'operation': {'key': 'display.operation', 'type': 'str'}, + 'resource': {'key': 'display.resource', 'type': 'str'}, + 'description': {'key': 'display.description', 'type': 'str'}, + 'provider': {'key': 'display.provider', 'type': 'str'}, + } + + def __init__(self, **kwargs) -> None: + super(ComputeOperationValue, self).__init__(**kwargs) + self.origin = None + self.name = None + self.operation = None + self.resource = None + self.description = None + self.provider = None diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_client_enums.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_client_enums.py index d35c6bd6a364..38a1b24754fd 100644 --- a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_client_enums.py +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_client_enums.py @@ -209,3 +209,15 @@ class OSType(str, Enum): linux = "Linux" windows = "Windows" + + +class NetworkPlugin(str, Enum): + + azure = "azure" + kubenet = "kubenet" + + +class NetworkPolicy(str, Enum): + + calico = "calico" + cilium = "cilium" diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_network_profile.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_network_profile.py new file mode 100644 index 000000000000..35916ac7cb89 --- /dev/null +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_network_profile.py @@ -0,0 +1,67 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ContainerServiceNetworkProfile(Model): + """Profile of network configuration. + + :param network_plugin: Network plugin used for building Kubernetes + network. Possible values include: 'azure', 'kubenet'. Default value: + "kubenet" . + :type network_plugin: str or + ~azure.mgmt.containerservice.models.NetworkPlugin + :param network_policy: Network policy used for building Kubernetes + network. Possible values include: 'calico', 'cilium' + :type network_policy: str or + ~azure.mgmt.containerservice.models.NetworkPolicy + :param pod_cidr: A CIDR notation IP range from which to assign pod IPs + when kubenet is used. + :type pod_cidr: str + :param service_cidr: A CIDR notation IP range from which to assign service + cluster IPs. It must not overlap with any Subnet IP ranges. Default value: + "10.0.0.0/16" . + :type service_cidr: str + :param dns_service_ip: An IP address assigned to the Kubernetes DNS + service. It must be within the Kubernetes service address range specified + in serviceCidr. Default value: "10.0.0.10" . + :type dns_service_ip: str + :param docker_bridge_cidr: A CIDR notation IP range assigned to the Docker + bridge network. It must not overlap with any Subnet IP ranges or the + Kubernetes service address range. Default value: "172.17.0.1/16" . + :type docker_bridge_cidr: str + """ + + _validation = { + 'pod_cidr': {'pattern': r'^([0-9]{1,3}\.){3}[0-9]{1,3}(\/([0-9]|[1-2][0-9]|3[0-2]))?$'}, + 'service_cidr': {'pattern': r'^([0-9]{1,3}\.){3}[0-9]{1,3}(\/([0-9]|[1-2][0-9]|3[0-2]))?$'}, + 'dns_service_ip': {'pattern': r'^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$'}, + 'docker_bridge_cidr': {'pattern': r'^([0-9]{1,3}\.){3}[0-9]{1,3}(\/([0-9]|[1-2][0-9]|3[0-2]))?$'}, + } + + _attribute_map = { + 'network_plugin': {'key': 'networkPlugin', 'type': 'str'}, + 'network_policy': {'key': 'networkPolicy', 'type': 'str'}, + 'pod_cidr': {'key': 'podCidr', 'type': 'str'}, + 'service_cidr': {'key': 'serviceCidr', 'type': 'str'}, + 'dns_service_ip': {'key': 'dnsServiceIP', 'type': 'str'}, + 'docker_bridge_cidr': {'key': 'dockerBridgeCidr', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(ContainerServiceNetworkProfile, self).__init__(**kwargs) + self.network_plugin = kwargs.get('network_plugin', "kubenet") + self.network_policy = kwargs.get('network_policy', None) + self.pod_cidr = kwargs.get('pod_cidr', None) + self.service_cidr = kwargs.get('service_cidr', "10.0.0.0/16") + self.dns_service_ip = kwargs.get('dns_service_ip', "10.0.0.10") + self.docker_bridge_cidr = kwargs.get('docker_bridge_cidr', "172.17.0.1/16") diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_network_profile_py3.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_network_profile_py3.py new file mode 100644 index 000000000000..5c5af7149d7c --- /dev/null +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_network_profile_py3.py @@ -0,0 +1,67 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ContainerServiceNetworkProfile(Model): + """Profile of network configuration. + + :param network_plugin: Network plugin used for building Kubernetes + network. Possible values include: 'azure', 'kubenet'. Default value: + "kubenet" . + :type network_plugin: str or + ~azure.mgmt.containerservice.models.NetworkPlugin + :param network_policy: Network policy used for building Kubernetes + network. Possible values include: 'calico', 'cilium' + :type network_policy: str or + ~azure.mgmt.containerservice.models.NetworkPolicy + :param pod_cidr: A CIDR notation IP range from which to assign pod IPs + when kubenet is used. + :type pod_cidr: str + :param service_cidr: A CIDR notation IP range from which to assign service + cluster IPs. It must not overlap with any Subnet IP ranges. Default value: + "10.0.0.0/16" . + :type service_cidr: str + :param dns_service_ip: An IP address assigned to the Kubernetes DNS + service. It must be within the Kubernetes service address range specified + in serviceCidr. Default value: "10.0.0.10" . + :type dns_service_ip: str + :param docker_bridge_cidr: A CIDR notation IP range assigned to the Docker + bridge network. It must not overlap with any Subnet IP ranges or the + Kubernetes service address range. Default value: "172.17.0.1/16" . + :type docker_bridge_cidr: str + """ + + _validation = { + 'pod_cidr': {'pattern': r'^([0-9]{1,3}\.){3}[0-9]{1,3}(\/([0-9]|[1-2][0-9]|3[0-2]))?$'}, + 'service_cidr': {'pattern': r'^([0-9]{1,3}\.){3}[0-9]{1,3}(\/([0-9]|[1-2][0-9]|3[0-2]))?$'}, + 'dns_service_ip': {'pattern': r'^(?:(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)\.){3}(?:25[0-5]|2[0-4][0-9]|[01]?[0-9][0-9]?)$'}, + 'docker_bridge_cidr': {'pattern': r'^([0-9]{1,3}\.){3}[0-9]{1,3}(\/([0-9]|[1-2][0-9]|3[0-2]))?$'}, + } + + _attribute_map = { + 'network_plugin': {'key': 'networkPlugin', 'type': 'str'}, + 'network_policy': {'key': 'networkPolicy', 'type': 'str'}, + 'pod_cidr': {'key': 'podCidr', 'type': 'str'}, + 'service_cidr': {'key': 'serviceCidr', 'type': 'str'}, + 'dns_service_ip': {'key': 'dnsServiceIP', 'type': 'str'}, + 'docker_bridge_cidr': {'key': 'dockerBridgeCidr', 'type': 'str'}, + } + + def __init__(self, *, network_plugin="kubenet", network_policy=None, pod_cidr: str=None, service_cidr: str="10.0.0.0/16", dns_service_ip: str="10.0.0.10", docker_bridge_cidr: str="172.17.0.1/16", **kwargs) -> None: + super(ContainerServiceNetworkProfile, self).__init__(**kwargs) + self.network_plugin = network_plugin + self.network_policy = network_policy + self.pod_cidr = pod_cidr + self.service_cidr = service_cidr + self.dns_service_ip = dns_service_ip + self.docker_bridge_cidr = docker_bridge_cidr diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster.py index 05a949f8a12d..3dbfcf996b0e 100644 --- a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster.py +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster.py @@ -33,16 +33,16 @@ class ManagedCluster(Resource): :ivar provisioning_state: The current deployment or provisioning state, which only appears in the response. :vartype provisioning_state: str + :param kubernetes_version: Version of Kubernetes specified when creating + the managed cluster. + :type kubernetes_version: str :param dns_prefix: DNS prefix specified when creating the managed cluster. :type dns_prefix: str :ivar fqdn: FDQN for the master pool. :vartype fqdn: str - :param kubernetes_version: Version of Kubernetes specified when creating - the managed cluster. - :type kubernetes_version: str :param agent_pool_profiles: Properties of the agent pool. :type agent_pool_profiles: - list[~azure.mgmt.containerservice.models.ContainerServiceAgentPoolProfile] + list[~azure.mgmt.containerservice.models.ManagedClusterAgentPoolProfile] :param linux_profile: Profile for Linux VMs in the container service cluster. :type linux_profile: @@ -52,6 +52,18 @@ class ManagedCluster(Resource): or keyVaultSecretRef must be specified. :type service_principal_profile: ~azure.mgmt.containerservice.models.ContainerServiceServicePrincipalProfile + :param addon_profiles: Profile of managed cluster add-on. + :type addon_profiles: dict[str, + ~azure.mgmt.containerservice.models.ManagedClusterAddonProfile] + :param enable_rbac: Whether to enable Kubernetes Role-Based Access + Control. + :type enable_rbac: bool + :param network_profile: Profile of network configuration. + :type network_profile: + ~azure.mgmt.containerservice.models.ContainerServiceNetworkProfile + :param aad_profile: Profile of Azure Active Directory configuration. + :type aad_profile: + ~azure.mgmt.containerservice.models.ManagedClusterAADProfile """ _validation = { @@ -70,20 +82,28 @@ class ManagedCluster(Resource): 'location': {'key': 'location', 'type': 'str'}, 'tags': {'key': 'tags', 'type': '{str}'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, + 'kubernetes_version': {'key': 'properties.kubernetesVersion', 'type': 'str'}, 'dns_prefix': {'key': 'properties.dnsPrefix', 'type': 'str'}, 'fqdn': {'key': 'properties.fqdn', 'type': 'str'}, - 'kubernetes_version': {'key': 'properties.kubernetesVersion', 'type': 'str'}, - 'agent_pool_profiles': {'key': 'properties.agentPoolProfiles', 'type': '[ContainerServiceAgentPoolProfile]'}, + 'agent_pool_profiles': {'key': 'properties.agentPoolProfiles', 'type': '[ManagedClusterAgentPoolProfile]'}, 'linux_profile': {'key': 'properties.linuxProfile', 'type': 'ContainerServiceLinuxProfile'}, 'service_principal_profile': {'key': 'properties.servicePrincipalProfile', 'type': 'ContainerServiceServicePrincipalProfile'}, + 'addon_profiles': {'key': 'properties.addonProfiles', 'type': '{ManagedClusterAddonProfile}'}, + 'enable_rbac': {'key': 'properties.enableRBAC', 'type': 'bool'}, + 'network_profile': {'key': 'properties.networkProfile', 'type': 'ContainerServiceNetworkProfile'}, + 'aad_profile': {'key': 'properties.aadProfile', 'type': 'ManagedClusterAADProfile'}, } def __init__(self, **kwargs): super(ManagedCluster, self).__init__(**kwargs) self.provisioning_state = None + self.kubernetes_version = kwargs.get('kubernetes_version', None) self.dns_prefix = kwargs.get('dns_prefix', None) self.fqdn = None - self.kubernetes_version = kwargs.get('kubernetes_version', None) self.agent_pool_profiles = kwargs.get('agent_pool_profiles', None) self.linux_profile = kwargs.get('linux_profile', None) self.service_principal_profile = kwargs.get('service_principal_profile', None) + self.addon_profiles = kwargs.get('addon_profiles', None) + self.enable_rbac = kwargs.get('enable_rbac', None) + self.network_profile = kwargs.get('network_profile', None) + self.aad_profile = kwargs.get('aad_profile', None) diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_aad_profile.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_aad_profile.py new file mode 100644 index 000000000000..50e3acd14b60 --- /dev/null +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_aad_profile.py @@ -0,0 +1,49 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ManagedClusterAADProfile(Model): + """AADProfile specifies attributes for Azure Active Directory integration. + + All required parameters must be populated in order to send to Azure. + + :param client_app_id: Required. The client AAD application ID. + :type client_app_id: str + :param server_app_id: Required. The server AAD application ID. + :type server_app_id: str + :param server_app_secret: Required. The server AAD application secret. + :type server_app_secret: str + :param tenant_id: The AAD tenant ID to use for authentication. If not + specified, will use the tenant of the deployment subscription. + :type tenant_id: str + """ + + _validation = { + 'client_app_id': {'required': True}, + 'server_app_id': {'required': True}, + 'server_app_secret': {'required': True}, + } + + _attribute_map = { + 'client_app_id': {'key': 'clientAppID', 'type': 'str'}, + 'server_app_id': {'key': 'serverAppID', 'type': 'str'}, + 'server_app_secret': {'key': 'serverAppSecret', 'type': 'str'}, + 'tenant_id': {'key': 'tenantID', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(ManagedClusterAADProfile, self).__init__(**kwargs) + self.client_app_id = kwargs.get('client_app_id', None) + self.server_app_id = kwargs.get('server_app_id', None) + self.server_app_secret = kwargs.get('server_app_secret', None) + self.tenant_id = kwargs.get('tenant_id', None) diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_aad_profile_py3.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_aad_profile_py3.py new file mode 100644 index 000000000000..6db15c1dd6c2 --- /dev/null +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_aad_profile_py3.py @@ -0,0 +1,49 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ManagedClusterAADProfile(Model): + """AADProfile specifies attributes for Azure Active Directory integration. + + All required parameters must be populated in order to send to Azure. + + :param client_app_id: Required. The client AAD application ID. + :type client_app_id: str + :param server_app_id: Required. The server AAD application ID. + :type server_app_id: str + :param server_app_secret: Required. The server AAD application secret. + :type server_app_secret: str + :param tenant_id: The AAD tenant ID to use for authentication. If not + specified, will use the tenant of the deployment subscription. + :type tenant_id: str + """ + + _validation = { + 'client_app_id': {'required': True}, + 'server_app_id': {'required': True}, + 'server_app_secret': {'required': True}, + } + + _attribute_map = { + 'client_app_id': {'key': 'clientAppID', 'type': 'str'}, + 'server_app_id': {'key': 'serverAppID', 'type': 'str'}, + 'server_app_secret': {'key': 'serverAppSecret', 'type': 'str'}, + 'tenant_id': {'key': 'tenantID', 'type': 'str'}, + } + + def __init__(self, *, client_app_id: str, server_app_id: str, server_app_secret: str, tenant_id: str=None, **kwargs) -> None: + super(ManagedClusterAADProfile, self).__init__(**kwargs) + self.client_app_id = client_app_id + self.server_app_id = server_app_id + self.server_app_secret = server_app_secret + self.tenant_id = tenant_id diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_addon_profile.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_addon_profile.py new file mode 100644 index 000000000000..796f9246a686 --- /dev/null +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_addon_profile.py @@ -0,0 +1,38 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ManagedClusterAddonProfile(Model): + """A Kubernetes add-on profile for a managed cluster. + + All required parameters must be populated in order to send to Azure. + + :param enabled: Required. Whether the add-on is enabled or not. + :type enabled: bool + :param config: Key-value pairs for configuring an add-on. + :type config: dict[str, str] + """ + + _validation = { + 'enabled': {'required': True}, + } + + _attribute_map = { + 'enabled': {'key': 'enabled', 'type': 'bool'}, + 'config': {'key': 'config', 'type': '{str}'}, + } + + def __init__(self, **kwargs): + super(ManagedClusterAddonProfile, self).__init__(**kwargs) + self.enabled = kwargs.get('enabled', None) + self.config = kwargs.get('config', None) diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_addon_profile_py3.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_addon_profile_py3.py new file mode 100644 index 000000000000..71e05cd14c0e --- /dev/null +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_addon_profile_py3.py @@ -0,0 +1,38 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ManagedClusterAddonProfile(Model): + """A Kubernetes add-on profile for a managed cluster. + + All required parameters must be populated in order to send to Azure. + + :param enabled: Required. Whether the add-on is enabled or not. + :type enabled: bool + :param config: Key-value pairs for configuring an add-on. + :type config: dict[str, str] + """ + + _validation = { + 'enabled': {'required': True}, + } + + _attribute_map = { + 'enabled': {'key': 'enabled', 'type': 'bool'}, + 'config': {'key': 'config', 'type': '{str}'}, + } + + def __init__(self, *, enabled: bool, config=None, **kwargs) -> None: + super(ManagedClusterAddonProfile, self).__init__(**kwargs) + self.enabled = enabled + self.config = config diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_agent_pool_profile.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_agent_pool_profile.py new file mode 100644 index 000000000000..41c8331d24d6 --- /dev/null +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_agent_pool_profile.py @@ -0,0 +1,147 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ManagedClusterAgentPoolProfile(Model): + """Profile for the container service agent pool. + + Variables are only populated by the server, and will be ignored when + sending a request. + + All required parameters must be populated in order to send to Azure. + + :param name: Required. Unique name of the agent pool profile in the + context of the subscription and resource group. + :type name: str + :param count: Number of agents (VMs) to host docker containers. Allowed + values must be in the range of 1 to 100 (inclusive). The default value is + 1. . Default value: 1 . + :type count: int + :param vm_size: Required. Size of agent VMs. Possible values include: + 'Standard_A1', 'Standard_A10', 'Standard_A11', 'Standard_A1_v2', + 'Standard_A2', 'Standard_A2_v2', 'Standard_A2m_v2', 'Standard_A3', + 'Standard_A4', 'Standard_A4_v2', 'Standard_A4m_v2', 'Standard_A5', + 'Standard_A6', 'Standard_A7', 'Standard_A8', 'Standard_A8_v2', + 'Standard_A8m_v2', 'Standard_A9', 'Standard_B2ms', 'Standard_B2s', + 'Standard_B4ms', 'Standard_B8ms', 'Standard_D1', 'Standard_D11', + 'Standard_D11_v2', 'Standard_D11_v2_Promo', 'Standard_D12', + 'Standard_D12_v2', 'Standard_D12_v2_Promo', 'Standard_D13', + 'Standard_D13_v2', 'Standard_D13_v2_Promo', 'Standard_D14', + 'Standard_D14_v2', 'Standard_D14_v2_Promo', 'Standard_D15_v2', + 'Standard_D16_v3', 'Standard_D16s_v3', 'Standard_D1_v2', 'Standard_D2', + 'Standard_D2_v2', 'Standard_D2_v2_Promo', 'Standard_D2_v3', + 'Standard_D2s_v3', 'Standard_D3', 'Standard_D32_v3', 'Standard_D32s_v3', + 'Standard_D3_v2', 'Standard_D3_v2_Promo', 'Standard_D4', 'Standard_D4_v2', + 'Standard_D4_v2_Promo', 'Standard_D4_v3', 'Standard_D4s_v3', + 'Standard_D5_v2', 'Standard_D5_v2_Promo', 'Standard_D64_v3', + 'Standard_D64s_v3', 'Standard_D8_v3', 'Standard_D8s_v3', 'Standard_DS1', + 'Standard_DS11', 'Standard_DS11_v2', 'Standard_DS11_v2_Promo', + 'Standard_DS12', 'Standard_DS12_v2', 'Standard_DS12_v2_Promo', + 'Standard_DS13', 'Standard_DS13-2_v2', 'Standard_DS13-4_v2', + 'Standard_DS13_v2', 'Standard_DS13_v2_Promo', 'Standard_DS14', + 'Standard_DS14-4_v2', 'Standard_DS14-8_v2', 'Standard_DS14_v2', + 'Standard_DS14_v2_Promo', 'Standard_DS15_v2', 'Standard_DS1_v2', + 'Standard_DS2', 'Standard_DS2_v2', 'Standard_DS2_v2_Promo', + 'Standard_DS3', 'Standard_DS3_v2', 'Standard_DS3_v2_Promo', + 'Standard_DS4', 'Standard_DS4_v2', 'Standard_DS4_v2_Promo', + 'Standard_DS5_v2', 'Standard_DS5_v2_Promo', 'Standard_E16_v3', + 'Standard_E16s_v3', 'Standard_E2_v3', 'Standard_E2s_v3', + 'Standard_E32-16s_v3', 'Standard_E32-8s_v3', 'Standard_E32_v3', + 'Standard_E32s_v3', 'Standard_E4_v3', 'Standard_E4s_v3', + 'Standard_E64-16s_v3', 'Standard_E64-32s_v3', 'Standard_E64_v3', + 'Standard_E64s_v3', 'Standard_E8_v3', 'Standard_E8s_v3', 'Standard_F1', + 'Standard_F16', 'Standard_F16s', 'Standard_F16s_v2', 'Standard_F1s', + 'Standard_F2', 'Standard_F2s', 'Standard_F2s_v2', 'Standard_F32s_v2', + 'Standard_F4', 'Standard_F4s', 'Standard_F4s_v2', 'Standard_F64s_v2', + 'Standard_F72s_v2', 'Standard_F8', 'Standard_F8s', 'Standard_F8s_v2', + 'Standard_G1', 'Standard_G2', 'Standard_G3', 'Standard_G4', 'Standard_G5', + 'Standard_GS1', 'Standard_GS2', 'Standard_GS3', 'Standard_GS4', + 'Standard_GS4-4', 'Standard_GS4-8', 'Standard_GS5', 'Standard_GS5-16', + 'Standard_GS5-8', 'Standard_H16', 'Standard_H16m', 'Standard_H16mr', + 'Standard_H16r', 'Standard_H8', 'Standard_H8m', 'Standard_L16s', + 'Standard_L32s', 'Standard_L4s', 'Standard_L8s', 'Standard_M128-32ms', + 'Standard_M128-64ms', 'Standard_M128ms', 'Standard_M128s', + 'Standard_M64-16ms', 'Standard_M64-32ms', 'Standard_M64ms', + 'Standard_M64s', 'Standard_NC12', 'Standard_NC12s_v2', + 'Standard_NC12s_v3', 'Standard_NC24', 'Standard_NC24r', + 'Standard_NC24rs_v2', 'Standard_NC24rs_v3', 'Standard_NC24s_v2', + 'Standard_NC24s_v3', 'Standard_NC6', 'Standard_NC6s_v2', + 'Standard_NC6s_v3', 'Standard_ND12s', 'Standard_ND24rs', 'Standard_ND24s', + 'Standard_ND6s', 'Standard_NV12', 'Standard_NV24', 'Standard_NV6' + :type vm_size: str or + ~azure.mgmt.containerservice.models.ContainerServiceVMSizeTypes + :param os_disk_size_gb: OS Disk Size in GB to be used to specify the disk + size for every machine in this master/agent pool. If you specify 0, it + will apply the default osDisk size according to the vmSize specified. + :type os_disk_size_gb: int + :param dns_prefix: DNS prefix to be used to create the FQDN for the agent + pool. + :type dns_prefix: str + :ivar fqdn: FDQN for the agent pool. + :vartype fqdn: str + :param ports: Ports number array used to expose on this agent pool. The + default opened ports are different based on your choice of orchestrator. + :type ports: list[int] + :param storage_profile: Storage profile specifies what kind of storage + used. Choose from StorageAccount and ManagedDisks. Leave it empty, we will + choose for you based on the orchestrator choice. Possible values include: + 'StorageAccount', 'ManagedDisks' + :type storage_profile: str or + ~azure.mgmt.containerservice.models.ContainerServiceStorageProfileTypes + :param vnet_subnet_id: VNet SubnetID specifies the vnet's subnet + identifier. If you specify either master VNet Subnet, or agent VNet + Subnet, you need to specify both. And they have to be in the same VNet. + :type vnet_subnet_id: str + :param max_pods: Maximum number of pods that can run on a node. Default + value: 30 . + :type max_pods: int + :param os_type: OsType to be used to specify os type. Choose from Linux + and Windows. Default to Linux. Possible values include: 'Linux', + 'Windows'. Default value: "Linux" . + :type os_type: str or ~azure.mgmt.containerservice.models.OSType + """ + + _validation = { + 'name': {'required': True}, + 'count': {'maximum': 100, 'minimum': 1}, + 'vm_size': {'required': True}, + 'fqdn': {'readonly': True}, + } + + _attribute_map = { + 'name': {'key': 'name', 'type': 'str'}, + 'count': {'key': 'count', 'type': 'int'}, + 'vm_size': {'key': 'vmSize', 'type': 'str'}, + 'os_disk_size_gb': {'key': 'osDiskSizeGB', 'type': 'int'}, + 'dns_prefix': {'key': 'dnsPrefix', 'type': 'str'}, + 'fqdn': {'key': 'fqdn', 'type': 'str'}, + 'ports': {'key': 'ports', 'type': '[int]'}, + 'storage_profile': {'key': 'storageProfile', 'type': 'str'}, + 'vnet_subnet_id': {'key': 'vnetSubnetID', 'type': 'str'}, + 'max_pods': {'key': 'maxPods', 'type': 'int'}, + 'os_type': {'key': 'osType', 'type': 'str'}, + } + + def __init__(self, **kwargs): + super(ManagedClusterAgentPoolProfile, self).__init__(**kwargs) + self.name = kwargs.get('name', None) + self.count = kwargs.get('count', 1) + self.vm_size = kwargs.get('vm_size', None) + self.os_disk_size_gb = kwargs.get('os_disk_size_gb', None) + self.dns_prefix = kwargs.get('dns_prefix', None) + self.fqdn = None + self.ports = kwargs.get('ports', None) + self.storage_profile = kwargs.get('storage_profile', None) + self.vnet_subnet_id = kwargs.get('vnet_subnet_id', None) + self.max_pods = kwargs.get('max_pods', 30) + self.os_type = kwargs.get('os_type', "Linux") diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_agent_pool_profile_py3.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_agent_pool_profile_py3.py new file mode 100644 index 000000000000..3261958a7daa --- /dev/null +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_agent_pool_profile_py3.py @@ -0,0 +1,147 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +from msrest.serialization import Model + + +class ManagedClusterAgentPoolProfile(Model): + """Profile for the container service agent pool. + + Variables are only populated by the server, and will be ignored when + sending a request. + + All required parameters must be populated in order to send to Azure. + + :param name: Required. Unique name of the agent pool profile in the + context of the subscription and resource group. + :type name: str + :param count: Number of agents (VMs) to host docker containers. Allowed + values must be in the range of 1 to 100 (inclusive). The default value is + 1. . Default value: 1 . + :type count: int + :param vm_size: Required. Size of agent VMs. Possible values include: + 'Standard_A1', 'Standard_A10', 'Standard_A11', 'Standard_A1_v2', + 'Standard_A2', 'Standard_A2_v2', 'Standard_A2m_v2', 'Standard_A3', + 'Standard_A4', 'Standard_A4_v2', 'Standard_A4m_v2', 'Standard_A5', + 'Standard_A6', 'Standard_A7', 'Standard_A8', 'Standard_A8_v2', + 'Standard_A8m_v2', 'Standard_A9', 'Standard_B2ms', 'Standard_B2s', + 'Standard_B4ms', 'Standard_B8ms', 'Standard_D1', 'Standard_D11', + 'Standard_D11_v2', 'Standard_D11_v2_Promo', 'Standard_D12', + 'Standard_D12_v2', 'Standard_D12_v2_Promo', 'Standard_D13', + 'Standard_D13_v2', 'Standard_D13_v2_Promo', 'Standard_D14', + 'Standard_D14_v2', 'Standard_D14_v2_Promo', 'Standard_D15_v2', + 'Standard_D16_v3', 'Standard_D16s_v3', 'Standard_D1_v2', 'Standard_D2', + 'Standard_D2_v2', 'Standard_D2_v2_Promo', 'Standard_D2_v3', + 'Standard_D2s_v3', 'Standard_D3', 'Standard_D32_v3', 'Standard_D32s_v3', + 'Standard_D3_v2', 'Standard_D3_v2_Promo', 'Standard_D4', 'Standard_D4_v2', + 'Standard_D4_v2_Promo', 'Standard_D4_v3', 'Standard_D4s_v3', + 'Standard_D5_v2', 'Standard_D5_v2_Promo', 'Standard_D64_v3', + 'Standard_D64s_v3', 'Standard_D8_v3', 'Standard_D8s_v3', 'Standard_DS1', + 'Standard_DS11', 'Standard_DS11_v2', 'Standard_DS11_v2_Promo', + 'Standard_DS12', 'Standard_DS12_v2', 'Standard_DS12_v2_Promo', + 'Standard_DS13', 'Standard_DS13-2_v2', 'Standard_DS13-4_v2', + 'Standard_DS13_v2', 'Standard_DS13_v2_Promo', 'Standard_DS14', + 'Standard_DS14-4_v2', 'Standard_DS14-8_v2', 'Standard_DS14_v2', + 'Standard_DS14_v2_Promo', 'Standard_DS15_v2', 'Standard_DS1_v2', + 'Standard_DS2', 'Standard_DS2_v2', 'Standard_DS2_v2_Promo', + 'Standard_DS3', 'Standard_DS3_v2', 'Standard_DS3_v2_Promo', + 'Standard_DS4', 'Standard_DS4_v2', 'Standard_DS4_v2_Promo', + 'Standard_DS5_v2', 'Standard_DS5_v2_Promo', 'Standard_E16_v3', + 'Standard_E16s_v3', 'Standard_E2_v3', 'Standard_E2s_v3', + 'Standard_E32-16s_v3', 'Standard_E32-8s_v3', 'Standard_E32_v3', + 'Standard_E32s_v3', 'Standard_E4_v3', 'Standard_E4s_v3', + 'Standard_E64-16s_v3', 'Standard_E64-32s_v3', 'Standard_E64_v3', + 'Standard_E64s_v3', 'Standard_E8_v3', 'Standard_E8s_v3', 'Standard_F1', + 'Standard_F16', 'Standard_F16s', 'Standard_F16s_v2', 'Standard_F1s', + 'Standard_F2', 'Standard_F2s', 'Standard_F2s_v2', 'Standard_F32s_v2', + 'Standard_F4', 'Standard_F4s', 'Standard_F4s_v2', 'Standard_F64s_v2', + 'Standard_F72s_v2', 'Standard_F8', 'Standard_F8s', 'Standard_F8s_v2', + 'Standard_G1', 'Standard_G2', 'Standard_G3', 'Standard_G4', 'Standard_G5', + 'Standard_GS1', 'Standard_GS2', 'Standard_GS3', 'Standard_GS4', + 'Standard_GS4-4', 'Standard_GS4-8', 'Standard_GS5', 'Standard_GS5-16', + 'Standard_GS5-8', 'Standard_H16', 'Standard_H16m', 'Standard_H16mr', + 'Standard_H16r', 'Standard_H8', 'Standard_H8m', 'Standard_L16s', + 'Standard_L32s', 'Standard_L4s', 'Standard_L8s', 'Standard_M128-32ms', + 'Standard_M128-64ms', 'Standard_M128ms', 'Standard_M128s', + 'Standard_M64-16ms', 'Standard_M64-32ms', 'Standard_M64ms', + 'Standard_M64s', 'Standard_NC12', 'Standard_NC12s_v2', + 'Standard_NC12s_v3', 'Standard_NC24', 'Standard_NC24r', + 'Standard_NC24rs_v2', 'Standard_NC24rs_v3', 'Standard_NC24s_v2', + 'Standard_NC24s_v3', 'Standard_NC6', 'Standard_NC6s_v2', + 'Standard_NC6s_v3', 'Standard_ND12s', 'Standard_ND24rs', 'Standard_ND24s', + 'Standard_ND6s', 'Standard_NV12', 'Standard_NV24', 'Standard_NV6' + :type vm_size: str or + ~azure.mgmt.containerservice.models.ContainerServiceVMSizeTypes + :param os_disk_size_gb: OS Disk Size in GB to be used to specify the disk + size for every machine in this master/agent pool. If you specify 0, it + will apply the default osDisk size according to the vmSize specified. + :type os_disk_size_gb: int + :param dns_prefix: DNS prefix to be used to create the FQDN for the agent + pool. + :type dns_prefix: str + :ivar fqdn: FDQN for the agent pool. + :vartype fqdn: str + :param ports: Ports number array used to expose on this agent pool. The + default opened ports are different based on your choice of orchestrator. + :type ports: list[int] + :param storage_profile: Storage profile specifies what kind of storage + used. Choose from StorageAccount and ManagedDisks. Leave it empty, we will + choose for you based on the orchestrator choice. Possible values include: + 'StorageAccount', 'ManagedDisks' + :type storage_profile: str or + ~azure.mgmt.containerservice.models.ContainerServiceStorageProfileTypes + :param vnet_subnet_id: VNet SubnetID specifies the vnet's subnet + identifier. If you specify either master VNet Subnet, or agent VNet + Subnet, you need to specify both. And they have to be in the same VNet. + :type vnet_subnet_id: str + :param max_pods: Maximum number of pods that can run on a node. Default + value: 30 . + :type max_pods: int + :param os_type: OsType to be used to specify os type. Choose from Linux + and Windows. Default to Linux. Possible values include: 'Linux', + 'Windows'. Default value: "Linux" . + :type os_type: str or ~azure.mgmt.containerservice.models.OSType + """ + + _validation = { + 'name': {'required': True}, + 'count': {'maximum': 100, 'minimum': 1}, + 'vm_size': {'required': True}, + 'fqdn': {'readonly': True}, + } + + _attribute_map = { + 'name': {'key': 'name', 'type': 'str'}, + 'count': {'key': 'count', 'type': 'int'}, + 'vm_size': {'key': 'vmSize', 'type': 'str'}, + 'os_disk_size_gb': {'key': 'osDiskSizeGB', 'type': 'int'}, + 'dns_prefix': {'key': 'dnsPrefix', 'type': 'str'}, + 'fqdn': {'key': 'fqdn', 'type': 'str'}, + 'ports': {'key': 'ports', 'type': '[int]'}, + 'storage_profile': {'key': 'storageProfile', 'type': 'str'}, + 'vnet_subnet_id': {'key': 'vnetSubnetID', 'type': 'str'}, + 'max_pods': {'key': 'maxPods', 'type': 'int'}, + 'os_type': {'key': 'osType', 'type': 'str'}, + } + + def __init__(self, *, name: str, vm_size, count: int=1, os_disk_size_gb: int=None, dns_prefix: str=None, ports=None, storage_profile=None, vnet_subnet_id: str=None, max_pods: int=30, os_type="Linux", **kwargs) -> None: + super(ManagedClusterAgentPoolProfile, self).__init__(**kwargs) + self.name = name + self.count = count + self.vm_size = vm_size + self.os_disk_size_gb = os_disk_size_gb + self.dns_prefix = dns_prefix + self.fqdn = None + self.ports = ports + self.storage_profile = storage_profile + self.vnet_subnet_id = vnet_subnet_id + self.max_pods = max_pods + self.os_type = os_type diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_py3.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_py3.py index 38d179965e94..2bd2f52cb5e4 100644 --- a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_py3.py +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_py3.py @@ -33,16 +33,16 @@ class ManagedCluster(Resource): :ivar provisioning_state: The current deployment or provisioning state, which only appears in the response. :vartype provisioning_state: str + :param kubernetes_version: Version of Kubernetes specified when creating + the managed cluster. + :type kubernetes_version: str :param dns_prefix: DNS prefix specified when creating the managed cluster. :type dns_prefix: str :ivar fqdn: FDQN for the master pool. :vartype fqdn: str - :param kubernetes_version: Version of Kubernetes specified when creating - the managed cluster. - :type kubernetes_version: str :param agent_pool_profiles: Properties of the agent pool. :type agent_pool_profiles: - list[~azure.mgmt.containerservice.models.ContainerServiceAgentPoolProfile] + list[~azure.mgmt.containerservice.models.ManagedClusterAgentPoolProfile] :param linux_profile: Profile for Linux VMs in the container service cluster. :type linux_profile: @@ -52,6 +52,18 @@ class ManagedCluster(Resource): or keyVaultSecretRef must be specified. :type service_principal_profile: ~azure.mgmt.containerservice.models.ContainerServiceServicePrincipalProfile + :param addon_profiles: Profile of managed cluster add-on. + :type addon_profiles: dict[str, + ~azure.mgmt.containerservice.models.ManagedClusterAddonProfile] + :param enable_rbac: Whether to enable Kubernetes Role-Based Access + Control. + :type enable_rbac: bool + :param network_profile: Profile of network configuration. + :type network_profile: + ~azure.mgmt.containerservice.models.ContainerServiceNetworkProfile + :param aad_profile: Profile of Azure Active Directory configuration. + :type aad_profile: + ~azure.mgmt.containerservice.models.ManagedClusterAADProfile """ _validation = { @@ -70,20 +82,28 @@ class ManagedCluster(Resource): 'location': {'key': 'location', 'type': 'str'}, 'tags': {'key': 'tags', 'type': '{str}'}, 'provisioning_state': {'key': 'properties.provisioningState', 'type': 'str'}, + 'kubernetes_version': {'key': 'properties.kubernetesVersion', 'type': 'str'}, 'dns_prefix': {'key': 'properties.dnsPrefix', 'type': 'str'}, 'fqdn': {'key': 'properties.fqdn', 'type': 'str'}, - 'kubernetes_version': {'key': 'properties.kubernetesVersion', 'type': 'str'}, - 'agent_pool_profiles': {'key': 'properties.agentPoolProfiles', 'type': '[ContainerServiceAgentPoolProfile]'}, + 'agent_pool_profiles': {'key': 'properties.agentPoolProfiles', 'type': '[ManagedClusterAgentPoolProfile]'}, 'linux_profile': {'key': 'properties.linuxProfile', 'type': 'ContainerServiceLinuxProfile'}, 'service_principal_profile': {'key': 'properties.servicePrincipalProfile', 'type': 'ContainerServiceServicePrincipalProfile'}, + 'addon_profiles': {'key': 'properties.addonProfiles', 'type': '{ManagedClusterAddonProfile}'}, + 'enable_rbac': {'key': 'properties.enableRBAC', 'type': 'bool'}, + 'network_profile': {'key': 'properties.networkProfile', 'type': 'ContainerServiceNetworkProfile'}, + 'aad_profile': {'key': 'properties.aadProfile', 'type': 'ManagedClusterAADProfile'}, } - def __init__(self, *, location: str, tags=None, dns_prefix: str=None, kubernetes_version: str=None, agent_pool_profiles=None, linux_profile=None, service_principal_profile=None, **kwargs) -> None: + def __init__(self, *, location: str, tags=None, kubernetes_version: str=None, dns_prefix: str=None, agent_pool_profiles=None, linux_profile=None, service_principal_profile=None, addon_profiles=None, enable_rbac: bool=None, network_profile=None, aad_profile=None, **kwargs) -> None: super(ManagedCluster, self).__init__(location=location, tags=tags, **kwargs) self.provisioning_state = None + self.kubernetes_version = kubernetes_version self.dns_prefix = dns_prefix self.fqdn = None - self.kubernetes_version = kubernetes_version self.agent_pool_profiles = agent_pool_profiles self.linux_profile = linux_profile self.service_principal_profile = service_principal_profile + self.addon_profiles = addon_profiles + self.enable_rbac = enable_rbac + self.network_profile = network_profile + self.aad_profile = aad_profile diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/operations/__init__.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/operations/__init__.py index 597836f668a8..551547c5317b 100644 --- a/azure-mgmt-containerservice/azure/mgmt/containerservice/operations/__init__.py +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/operations/__init__.py @@ -10,9 +10,11 @@ # -------------------------------------------------------------------------- from .container_services_operations import ContainerServicesOperations +from .operations import Operations from .managed_clusters_operations import ManagedClustersOperations __all__ = [ 'ContainerServicesOperations', + 'Operations', 'ManagedClustersOperations', ] diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/operations/managed_clusters_operations.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/operations/managed_clusters_operations.py index 85fc5e0ec9b7..d7b2d3213a34 100644 --- a/azure-mgmt-containerservice/azure/mgmt/containerservice/operations/managed_clusters_operations.py +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/operations/managed_clusters_operations.py @@ -10,7 +10,6 @@ # -------------------------------------------------------------------------- import uuid -import warnings from msrest.pipeline import ClientRawResponse from msrestazure.azure_exceptions import CloudError from msrest.polling import LROPoller, NoPolling @@ -26,7 +25,7 @@ class ManagedClustersOperations(object): :param config: Configuration of service client. :param serializer: An object model serializer. :param deserializer: An object model deserializer. - :ivar api_version: Client Api Version. Constant value: "2017-08-31". + :ivar api_version: Client Api Version. Constant value: "2018-03-31". """ models = models @@ -36,7 +35,7 @@ def __init__(self, client, config, serializer, deserializer): self._client = client self._serialize = serializer self._deserialize = deserializer - self.api_version = "2017-08-31" + self.api_version = "2018-03-31" self.config = config @@ -316,79 +315,6 @@ def get_access_profile( return deserialized get_access_profile.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/accessProfiles/{roleName}/listCredential'} - def get_access_profiles( - self, resource_group_name, resource_name, role_name, custom_headers=None, raw=False, **operation_config): - """Gets access profile of a managed cluster. - - Use ManagedClusters_GetAccessProfile instead. - - .. warning:: - This method is deprecated - - :param resource_group_name: The name of the resource group. - :type resource_group_name: str - :param resource_name: The name of the managed cluster resource. - :type resource_name: str - :param role_name: The name of the role for managed cluster - accessProfile resource. - :type role_name: str - :param dict custom_headers: headers that will be added to the request - :param bool raw: returns the direct response alongside the - deserialized response - :param operation_config: :ref:`Operation configuration - overrides`. - :return: ManagedClusterAccessProfile or ClientRawResponse if raw=true - :rtype: - ~azure.mgmt.containerservice.models.ManagedClusterAccessProfile or - ~msrest.pipeline.ClientRawResponse - :raises: :class:`CloudError` - """ - warnings.warn("Method get_access_profiles is deprecated", DeprecationWarning) - # Construct URL - url = self.get_access_profiles.metadata['url'] - path_format_arguments = { - 'subscriptionId': self._serialize.url("self.config.subscription_id", self.config.subscription_id, 'str'), - 'resourceGroupName': self._serialize.url("resource_group_name", resource_group_name, 'str'), - 'resourceName': self._serialize.url("resource_name", resource_name, 'str'), - 'roleName': self._serialize.url("role_name", role_name, 'str') - } - url = self._client.format_url(url, **path_format_arguments) - - # Construct parameters - query_parameters = {} - query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') - - # Construct headers - header_parameters = {} - header_parameters['Content-Type'] = 'application/json; charset=utf-8' - if self.config.generate_client_request_id: - header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) - if custom_headers: - header_parameters.update(custom_headers) - if self.config.accept_language is not None: - header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') - - # Construct and send request - request = self._client.get(url, query_parameters) - response = self._client.send(request, header_parameters, stream=False, **operation_config) - - if response.status_code not in [200]: - exp = CloudError(response) - exp.request_id = response.headers.get('x-ms-request-id') - raise exp - - deserialized = None - - if response.status_code == 200: - deserialized = self._deserialize('ManagedClusterAccessProfile', response) - - if raw: - client_raw_response = ClientRawResponse(deserialized, response) - return client_raw_response - - return deserialized - get_access_profiles.metadata = {'url': '/subscriptions/{subscriptionId}/resourceGroups/{resourceGroupName}/providers/Microsoft.ContainerService/managedClusters/{resourceName}/accessProfiles/{roleName}'} - def get( self, resource_group_name, resource_name, custom_headers=None, raw=False, **operation_config): """Gets a managed cluster. diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/operations/operations.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/operations/operations.py new file mode 100644 index 000000000000..4da1377673bd --- /dev/null +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/operations/operations.py @@ -0,0 +1,99 @@ +# coding=utf-8 +# -------------------------------------------------------------------------- +# Copyright (c) Microsoft Corporation. All rights reserved. +# Licensed under the MIT License. See License.txt in the project root for +# license information. +# +# Code generated by Microsoft (R) AutoRest Code Generator. +# Changes may cause incorrect behavior and will be lost if the code is +# regenerated. +# -------------------------------------------------------------------------- + +import uuid +from msrest.pipeline import ClientRawResponse +from msrestazure.azure_exceptions import CloudError + +from .. import models + + +class Operations(object): + """Operations operations. + + :param client: Client for service requests. + :param config: Configuration of service client. + :param serializer: An object model serializer. + :param deserializer: An object model deserializer. + :ivar api_version: Client Api Version. Constant value: "2018-03-31". + """ + + models = models + + def __init__(self, client, config, serializer, deserializer): + + self._client = client + self._serialize = serializer + self._deserialize = deserializer + self.api_version = "2018-03-31" + + self.config = config + + def list( + self, custom_headers=None, raw=False, **operation_config): + """Gets a list of compute operations. + + :param dict custom_headers: headers that will be added to the request + :param bool raw: returns the direct response alongside the + deserialized response + :param operation_config: :ref:`Operation configuration + overrides`. + :return: An iterator like instance of ComputeOperationValue + :rtype: + ~azure.mgmt.containerservice.models.ComputeOperationValuePaged[~azure.mgmt.containerservice.models.ComputeOperationValue] + :raises: :class:`CloudError` + """ + def internal_paging(next_link=None, raw=False): + + if not next_link: + # Construct URL + url = self.list.metadata['url'] + + # Construct parameters + query_parameters = {} + query_parameters['api-version'] = self._serialize.query("self.api_version", self.api_version, 'str') + + else: + url = next_link + query_parameters = {} + + # Construct headers + header_parameters = {} + header_parameters['Content-Type'] = 'application/json; charset=utf-8' + if self.config.generate_client_request_id: + header_parameters['x-ms-client-request-id'] = str(uuid.uuid1()) + if custom_headers: + header_parameters.update(custom_headers) + if self.config.accept_language is not None: + header_parameters['accept-language'] = self._serialize.header("self.config.accept_language", self.config.accept_language, 'str') + + # Construct and send request + request = self._client.get(url, query_parameters) + response = self._client.send( + request, header_parameters, stream=False, **operation_config) + + if response.status_code not in [200]: + exp = CloudError(response) + exp.request_id = response.headers.get('x-ms-request-id') + raise exp + + return response + + # Deserialize response + deserialized = models.ComputeOperationValuePaged(internal_paging, self._deserialize.dependencies) + + if raw: + header_dict = {} + client_raw_response = models.ComputeOperationValuePaged(internal_paging, self._deserialize.dependencies, header_dict) + return client_raw_response + + return deserialized + list.metadata = {'url': '/providers/Microsoft.ContainerService/operations'} diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/version.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/version.py index 20cee28211d4..9797f3dd0011 100644 --- a/azure-mgmt-containerservice/azure/mgmt/containerservice/version.py +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/version.py @@ -9,5 +9,5 @@ # regenerated. # -------------------------------------------------------------------------- -VERSION = "4.0.0" +VERSION = "3.1.0" From 5eba287f3872b34aab294da70d429ac7460d218a Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Fri, 25 May 2018 22:36:34 +0000 Subject: [PATCH 2/3] Generated from 3047e9e632f7c44d4a88f3c768fc1de4dd9f40ec Py version --- .../azure/mgmt/containerservice/version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/version.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/version.py index 9797f3dd0011..20cee28211d4 100644 --- a/azure-mgmt-containerservice/azure/mgmt/containerservice/version.py +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/version.py @@ -9,5 +9,5 @@ # regenerated. # -------------------------------------------------------------------------- -VERSION = "3.1.0" +VERSION = "4.0.0" From 3c7deb74d783ca6f6173f7b5c7b36016276f550e Mon Sep 17 00:00:00 2001 From: Azure SDK for Python bot Date: Wed, 30 May 2018 21:44:40 +0000 Subject: [PATCH 3/3] Generated from d61dfda40f6a7498040fee441c1b23cb6a1bc01a Incorporated review comments --- .../models/container_service_agent_pool_profile.py | 3 +-- .../models/container_service_agent_pool_profile_py3.py | 3 +-- .../models/container_service_client_enums.py | 1 - .../models/container_service_master_profile.py | 3 +-- .../models/container_service_master_profile_py3.py | 3 +-- .../models/container_service_network_profile.py | 6 +++--- .../models/container_service_network_profile_py3.py | 6 +++--- .../models/managed_cluster_agent_pool_profile.py | 3 +-- .../models/managed_cluster_agent_pool_profile_py3.py | 3 +-- 9 files changed, 12 insertions(+), 19 deletions(-) diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_agent_pool_profile.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_agent_pool_profile.py index 63fbe629b8b9..e0d5dd777aaa 100644 --- a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_agent_pool_profile.py +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_agent_pool_profile.py @@ -99,8 +99,7 @@ class ContainerServiceAgentPoolProfile(Model): :type storage_profile: str or ~azure.mgmt.containerservice.models.ContainerServiceStorageProfileTypes :param vnet_subnet_id: VNet SubnetID specifies the vnet's subnet - identifier. If you specify either master VNet Subnet, or agent VNet - Subnet, you need to specify both. And they have to be in the same VNet. + identifier. :type vnet_subnet_id: str :param os_type: OsType to be used to specify os type. Choose from Linux and Windows. Default to Linux. Possible values include: 'Linux', diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_agent_pool_profile_py3.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_agent_pool_profile_py3.py index d627b850e939..dcb5bd830a96 100644 --- a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_agent_pool_profile_py3.py +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_agent_pool_profile_py3.py @@ -99,8 +99,7 @@ class ContainerServiceAgentPoolProfile(Model): :type storage_profile: str or ~azure.mgmt.containerservice.models.ContainerServiceStorageProfileTypes :param vnet_subnet_id: VNet SubnetID specifies the vnet's subnet - identifier. If you specify either master VNet Subnet, or agent VNet - Subnet, you need to specify both. And they have to be in the same VNet. + identifier. :type vnet_subnet_id: str :param os_type: OsType to be used to specify os type. Choose from Linux and Windows. Default to Linux. Possible values include: 'Linux', diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_client_enums.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_client_enums.py index 38a1b24754fd..4fe56768c577 100644 --- a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_client_enums.py +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_client_enums.py @@ -220,4 +220,3 @@ class NetworkPlugin(str, Enum): class NetworkPolicy(str, Enum): calico = "calico" - cilium = "cilium" diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_master_profile.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_master_profile.py index d2ffb6961d2f..07a8ce1266ea 100644 --- a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_master_profile.py +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_master_profile.py @@ -84,8 +84,7 @@ class ContainerServiceMasterProfile(Model): will apply the default osDisk size according to the vmSize specified. :type os_disk_size_gb: int :param vnet_subnet_id: VNet SubnetID specifies the vnet's subnet - identifier. If you specify either master VNet Subnet, or agent VNet - Subnet, you need to specify both. And they have to be in the same VNet. + identifier. :type vnet_subnet_id: str :param first_consecutive_static_ip: FirstConsecutiveStaticIP used to specify the first static ip of masters. Default value: "10.240.255.5" . diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_master_profile_py3.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_master_profile_py3.py index 72be47c05e08..15457f5e44dc 100644 --- a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_master_profile_py3.py +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_master_profile_py3.py @@ -84,8 +84,7 @@ class ContainerServiceMasterProfile(Model): will apply the default osDisk size according to the vmSize specified. :type os_disk_size_gb: int :param vnet_subnet_id: VNet SubnetID specifies the vnet's subnet - identifier. If you specify either master VNet Subnet, or agent VNet - Subnet, you need to specify both. And they have to be in the same VNet. + identifier. :type vnet_subnet_id: str :param first_consecutive_static_ip: FirstConsecutiveStaticIP used to specify the first static ip of masters. Default value: "10.240.255.5" . diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_network_profile.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_network_profile.py index 35916ac7cb89..45d3bb48aec7 100644 --- a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_network_profile.py +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_network_profile.py @@ -21,11 +21,11 @@ class ContainerServiceNetworkProfile(Model): :type network_plugin: str or ~azure.mgmt.containerservice.models.NetworkPlugin :param network_policy: Network policy used for building Kubernetes - network. Possible values include: 'calico', 'cilium' + network. Possible values include: 'calico' :type network_policy: str or ~azure.mgmt.containerservice.models.NetworkPolicy :param pod_cidr: A CIDR notation IP range from which to assign pod IPs - when kubenet is used. + when kubenet is used. Default value: "10.244.0.0/16" . :type pod_cidr: str :param service_cidr: A CIDR notation IP range from which to assign service cluster IPs. It must not overlap with any Subnet IP ranges. Default value: @@ -61,7 +61,7 @@ def __init__(self, **kwargs): super(ContainerServiceNetworkProfile, self).__init__(**kwargs) self.network_plugin = kwargs.get('network_plugin', "kubenet") self.network_policy = kwargs.get('network_policy', None) - self.pod_cidr = kwargs.get('pod_cidr', None) + self.pod_cidr = kwargs.get('pod_cidr', "10.244.0.0/16") self.service_cidr = kwargs.get('service_cidr', "10.0.0.0/16") self.dns_service_ip = kwargs.get('dns_service_ip', "10.0.0.10") self.docker_bridge_cidr = kwargs.get('docker_bridge_cidr', "172.17.0.1/16") diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_network_profile_py3.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_network_profile_py3.py index 5c5af7149d7c..ec728075a040 100644 --- a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_network_profile_py3.py +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service_network_profile_py3.py @@ -21,11 +21,11 @@ class ContainerServiceNetworkProfile(Model): :type network_plugin: str or ~azure.mgmt.containerservice.models.NetworkPlugin :param network_policy: Network policy used for building Kubernetes - network. Possible values include: 'calico', 'cilium' + network. Possible values include: 'calico' :type network_policy: str or ~azure.mgmt.containerservice.models.NetworkPolicy :param pod_cidr: A CIDR notation IP range from which to assign pod IPs - when kubenet is used. + when kubenet is used. Default value: "10.244.0.0/16" . :type pod_cidr: str :param service_cidr: A CIDR notation IP range from which to assign service cluster IPs. It must not overlap with any Subnet IP ranges. Default value: @@ -57,7 +57,7 @@ class ContainerServiceNetworkProfile(Model): 'docker_bridge_cidr': {'key': 'dockerBridgeCidr', 'type': 'str'}, } - def __init__(self, *, network_plugin="kubenet", network_policy=None, pod_cidr: str=None, service_cidr: str="10.0.0.0/16", dns_service_ip: str="10.0.0.10", docker_bridge_cidr: str="172.17.0.1/16", **kwargs) -> None: + def __init__(self, *, network_plugin="kubenet", network_policy=None, pod_cidr: str="10.244.0.0/16", service_cidr: str="10.0.0.0/16", dns_service_ip: str="10.0.0.10", docker_bridge_cidr: str="172.17.0.1/16", **kwargs) -> None: super(ContainerServiceNetworkProfile, self).__init__(**kwargs) self.network_plugin = network_plugin self.network_policy = network_policy diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_agent_pool_profile.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_agent_pool_profile.py index 41c8331d24d6..1c8e15db6b77 100644 --- a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_agent_pool_profile.py +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_agent_pool_profile.py @@ -99,8 +99,7 @@ class ManagedClusterAgentPoolProfile(Model): :type storage_profile: str or ~azure.mgmt.containerservice.models.ContainerServiceStorageProfileTypes :param vnet_subnet_id: VNet SubnetID specifies the vnet's subnet - identifier. If you specify either master VNet Subnet, or agent VNet - Subnet, you need to specify both. And they have to be in the same VNet. + identifier. :type vnet_subnet_id: str :param max_pods: Maximum number of pods that can run on a node. Default value: 30 . diff --git a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_agent_pool_profile_py3.py b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_agent_pool_profile_py3.py index 3261958a7daa..c59eddf48bf7 100644 --- a/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_agent_pool_profile_py3.py +++ b/azure-mgmt-containerservice/azure/mgmt/containerservice/models/managed_cluster_agent_pool_profile_py3.py @@ -99,8 +99,7 @@ class ManagedClusterAgentPoolProfile(Model): :type storage_profile: str or ~azure.mgmt.containerservice.models.ContainerServiceStorageProfileTypes :param vnet_subnet_id: VNet SubnetID specifies the vnet's subnet - identifier. If you specify either master VNet Subnet, or agent VNet - Subnet, you need to specify both. And they have to be in the same VNet. + identifier. :type vnet_subnet_id: str :param max_pods: Maximum number of pods that can run on a node. Default value: 30 .