Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Generated from d61dfda40f6a7498040fee441c1b23cb6a1bc01a
Incorporated review comments
  • Loading branch information
AutorestCI committed May 30, 2018
commit 3c7deb74d783ca6f6173f7b5c7b36016276f550e
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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',
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -220,4 +220,3 @@ class NetworkPlugin(str, Enum):
class NetworkPolicy(str, Enum):

calico = "calico"
cilium = "cilium"
Original file line number Diff line number Diff line change
Expand Up @@ -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" .
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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" .
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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")
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 .
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 .
Expand Down