Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[AutoPR containerservices/resource-manager] [AKS] specify byte format for base64-encoded kubeconfig #2184

Closed
wants to merge 1 commit into from
Closed

[AutoPR containerservices/resource-manager] [AKS] specify byte format for base64-encoded kubeconfig #2184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
65 changes: 44 additions & 21 deletions azure-mgmt-containerservice/azure/mgmt/containerservice/models/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,27 +9,50 @@
# regenerated.
# --------------------------------------------------------------------------

from .resource import Resource
from .container_service_custom_profile import ContainerServiceCustomProfile
from .key_vault_secret_ref import KeyVaultSecretRef
from .container_service_service_principal_profile import ContainerServiceServicePrincipalProfile
from .container_service_orchestrator_profile import ContainerServiceOrchestratorProfile
from .container_service_master_profile import ContainerServiceMasterProfile
from .container_service_agent_pool_profile import ContainerServiceAgentPoolProfile
from .container_service_windows_profile import ContainerServiceWindowsProfile
from .container_service_ssh_public_key import ContainerServiceSshPublicKey
from .container_service_ssh_configuration import ContainerServiceSshConfiguration
from .container_service_linux_profile import ContainerServiceLinuxProfile
from .container_service_vm_diagnostics import ContainerServiceVMDiagnostics
from .container_service_diagnostics_profile import ContainerServiceDiagnosticsProfile
from .container_service import ContainerService
from .managed_cluster import ManagedCluster
from .orchestrator_profile import OrchestratorProfile
from .managed_cluster_access_profile import ManagedClusterAccessProfile
from .managed_cluster_pool_upgrade_profile import ManagedClusterPoolUpgradeProfile
from .managed_cluster_upgrade_profile import ManagedClusterUpgradeProfile
from .orchestrator_version_profile import OrchestratorVersionProfile
from .orchestrator_version_profile_list_result import OrchestratorVersionProfileListResult
try:
from .resource_py3 import Resource
from .container_service_custom_profile_py3 import ContainerServiceCustomProfile
from .key_vault_secret_ref_py3 import KeyVaultSecretRef
from .container_service_service_principal_profile_py3 import ContainerServiceServicePrincipalProfile
from .container_service_orchestrator_profile_py3 import ContainerServiceOrchestratorProfile
from .container_service_master_profile_py3 import ContainerServiceMasterProfile
from .container_service_agent_pool_profile_py3 import ContainerServiceAgentPoolProfile
from .container_service_windows_profile_py3 import ContainerServiceWindowsProfile
from .container_service_ssh_public_key_py3 import ContainerServiceSshPublicKey
from .container_service_ssh_configuration_py3 import ContainerServiceSshConfiguration
from .container_service_linux_profile_py3 import ContainerServiceLinuxProfile
from .container_service_vm_diagnostics_py3 import ContainerServiceVMDiagnostics
from .container_service_diagnostics_profile_py3 import ContainerServiceDiagnosticsProfile
from .container_service_py3 import ContainerService
from .managed_cluster_py3 import ManagedCluster
from .orchestrator_profile_py3 import OrchestratorProfile
from .managed_cluster_access_profile_py3 import ManagedClusterAccessProfile
from .managed_cluster_pool_upgrade_profile_py3 import ManagedClusterPoolUpgradeProfile
from .managed_cluster_upgrade_profile_py3 import ManagedClusterUpgradeProfile
from .orchestrator_version_profile_py3 import OrchestratorVersionProfile
from .orchestrator_version_profile_list_result_py3 import OrchestratorVersionProfileListResult
except (SyntaxError, ImportError):
from .resource import Resource
from .container_service_custom_profile import ContainerServiceCustomProfile
from .key_vault_secret_ref import KeyVaultSecretRef
from .container_service_service_principal_profile import ContainerServiceServicePrincipalProfile
from .container_service_orchestrator_profile import ContainerServiceOrchestratorProfile
from .container_service_master_profile import ContainerServiceMasterProfile
from .container_service_agent_pool_profile import ContainerServiceAgentPoolProfile
from .container_service_windows_profile import ContainerServiceWindowsProfile
from .container_service_ssh_public_key import ContainerServiceSshPublicKey
from .container_service_ssh_configuration import ContainerServiceSshConfiguration
from .container_service_linux_profile import ContainerServiceLinuxProfile
from .container_service_vm_diagnostics import ContainerServiceVMDiagnostics
from .container_service_diagnostics_profile import ContainerServiceDiagnosticsProfile
from .container_service import ContainerService
from .managed_cluster import ManagedCluster
from .orchestrator_profile import OrchestratorProfile
from .managed_cluster_access_profile import ManagedClusterAccessProfile
from .managed_cluster_pool_upgrade_profile import ManagedClusterPoolUpgradeProfile
from .managed_cluster_upgrade_profile import ManagedClusterUpgradeProfile
from .orchestrator_version_profile import OrchestratorVersionProfile
from .orchestrator_version_profile_list_result import OrchestratorVersionProfileListResult
from .container_service_paged import ContainerServicePaged
from .managed_cluster_paged import ManagedClusterPaged
from .container_service_client_enums import (
Expand Down
32 changes: 17 additions & 15 deletions azure-mgmt-containerservice/azure/mgmt/containerservice/models/container_service.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,20 +18,22 @@ class ContainerService(Resource):
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.

:ivar id: Resource Id
:vartype id: str
:ivar name: Resource name
:vartype name: str
:ivar type: Resource type
:vartype type: str
:param location: Resource location
:param location: Required. Resource location
:type location: str
:param tags: Resource tags
:type tags: dict[str, str]
:ivar provisioning_state: The current deployment or provisioning state,
which only appears in the response.
:vartype provisioning_state: str
:param orchestrator_profile: Profile for the container service
:param orchestrator_profile: Required. Profile for the container service
orchestrator.
:type orchestrator_profile:
~azure.mgmt.containerservice.models.ContainerServiceOrchestratorProfile
Expand All @@ -44,7 +46,7 @@ class ContainerService(Resource):
secret or keyVaultSecretRef need to be specified.
:type service_principal_profile:
~azure.mgmt.containerservice.models.ContainerServiceServicePrincipalProfile
:param master_profile: Profile for the container service master.
:param master_profile: Required. Profile for the container service master.
:type master_profile:
~azure.mgmt.containerservice.models.ContainerServiceMasterProfile
:param agent_pool_profiles: Properties of the agent pool.
Expand All @@ -54,8 +56,8 @@ class ContainerService(Resource):
cluster.
:type windows_profile:
~azure.mgmt.containerservice.models.ContainerServiceWindowsProfile
:param linux_profile: Profile for Linux VMs in the container service
cluster.
:param linux_profile: Required. Profile for Linux VMs in the container
service cluster.
:type linux_profile:
~azure.mgmt.containerservice.models.ContainerServiceLinuxProfile
:param diagnostics_profile: Profile for diagnostics in the container
Expand Down Expand Up @@ -92,14 +94,14 @@ class ContainerService(Resource):
'diagnostics_profile': {'key': 'properties.diagnosticsProfile', 'type': 'ContainerServiceDiagnosticsProfile'},
}

def __init__(self, location, orchestrator_profile, master_profile, linux_profile, tags=None, custom_profile=None, service_principal_profile=None, agent_pool_profiles=None, windows_profile=None, diagnostics_profile=None):
super(ContainerService, self).__init__(location=location, tags=tags)
def __init__(self, **kwargs):
super(ContainerService, self).__init__(**kwargs)
self.provisioning_state = None
self.orchestrator_profile = orchestrator_profile
self.custom_profile = custom_profile
self.service_principal_profile = service_principal_profile
self.master_profile = master_profile
self.agent_pool_profiles = agent_pool_profiles
self.windows_profile = windows_profile
self.linux_profile = linux_profile
self.diagnostics_profile = diagnostics_profile
self.orchestrator_profile = kwargs.get('orchestrator_profile', None)
self.custom_profile = kwargs.get('custom_profile', None)
self.service_principal_profile = kwargs.get('service_principal_profile', None)
self.master_profile = kwargs.get('master_profile', None)
self.agent_pool_profiles = kwargs.get('agent_pool_profiles', None)
self.windows_profile = kwargs.get('windows_profile', None)
self.linux_profile = kwargs.get('linux_profile', None)
self.diagnostics_profile = kwargs.get('diagnostics_profile', None)
54 changes: 28 additions & 26 deletions ...ntainerservice/azure/mgmt/containerservice/models/container_service_agent_pool_profile.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,26 +18,28 @@ class ContainerServiceAgentPoolProfile(Model):
Variables are only populated by the server, and will be ignored when
sending a request.

:param name: Unique name of the agent pool profile in the context of the
subscription and resource group.
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: Size of agent VMs. Possible values include: 'Standard_A0',
'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_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_D3_v2',
:param vm_size: Required. Size of agent VMs. Possible values include:
'Standard_A0', '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_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_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_D8_v3',
Expand Down Expand Up @@ -113,15 +115,15 @@ class ContainerServiceAgentPoolProfile(Model):
'os_type': {'key': 'osType', 'type': 'str'},
}

def __init__(self, name, vm_size, count=1, os_disk_size_gb=None, dns_prefix=None, ports=None, storage_profile=None, vnet_subnet_id=None, os_type="Linux"):
super(ContainerServiceAgentPoolProfile, self).__init__()
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
def __init__(self, **kwargs):
super(ContainerServiceAgentPoolProfile, 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 = ports
self.storage_profile = storage_profile
self.vnet_subnet_id = vnet_subnet_id
self.os_type = os_type
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.os_type = kwargs.get('os_type', "Linux")
129 changes: 129 additions & 0 deletions ...nerservice/azure/mgmt/containerservice/models/container_service_agent_pool_profile_py3.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,129 @@
# 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 ContainerServiceAgentPoolProfile(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_A0', '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_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_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_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_v2',
'Standard_DS13_v2_Promo', 'Standard_DS14', '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_v3', 'Standard_E32s_v3', 'Standard_E4_v3',
'Standard_E4s_v3', 'Standard_E64_v3', 'Standard_E64s_v3',
'Standard_E8_v3', 'Standard_E8s_v3', 'Standard_F1', 'Standard_F16',
'Standard_F16s', 'Standard_F1s', 'Standard_F2', 'Standard_F2s',
'Standard_F4', 'Standard_F4s', 'Standard_F8', 'Standard_F8s',
'Standard_G1', 'Standard_G2', 'Standard_G3', 'Standard_G4', 'Standard_G5',
'Standard_GS1', 'Standard_GS2', 'Standard_GS3', 'Standard_GS4',
'Standard_GS5', 'Standard_H16', 'Standard_H16m', 'Standard_H16mr',
'Standard_H16r', 'Standard_H8', 'Standard_H8m', 'Standard_L16s',
'Standard_L32s', 'Standard_L4s', 'Standard_L8s', 'Standard_M128s',
'Standard_M64ms', 'Standard_NC12', 'Standard_NC24', 'Standard_NC24r',
'Standard_NC6', '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 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'},
'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, os_type="Linux", **kwargs) -> None:
super(ContainerServiceAgentPoolProfile, 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.os_type = os_type
Loading