Skip to content

Commit 4de8c91

Browse files
author
BitsAdmin
committed
Merge 'vke-Python-2022-05-12-online-2037-2026_01_14_16_40_48' into 'integration_2026-01-15_1104105318146'
feat: [development task] vke-2037-Python (2032457) See merge request: !1023
2 parents 7d9bf71 + eb2f4c3 commit 4de8c91

File tree

49 files changed

+2335
-103
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

49 files changed

+2335
-103
lines changed

volcenginesdkvke/__init__.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,10 @@
4343
from volcenginesdkvke.models.condition_for_list_nodes_output import ConditionForListNodesOutput
4444
from volcenginesdkvke.models.config_for_list_remedy_configs_output import ConfigForListRemedyConfigsOutput
4545
from volcenginesdkvke.models.connector_config_for_list_clusters_output import ConnectorConfigForListClustersOutput
46+
from volcenginesdkvke.models.containerd_config_for_create_default_node_pool_input import ContainerdConfigForCreateDefaultNodePoolInput
47+
from volcenginesdkvke.models.containerd_config_for_create_node_pool_input import ContainerdConfigForCreateNodePoolInput
48+
from volcenginesdkvke.models.containerd_config_for_list_node_pools_output import ContainerdConfigForListNodePoolsOutput
49+
from volcenginesdkvke.models.containerd_config_for_update_node_pool_config_input import ContainerdConfigForUpdateNodePoolConfigInput
4650
from volcenginesdkvke.models.convert_tag_for_list_node_pools_output import ConvertTagForListNodePoolsOutput
4751
from volcenginesdkvke.models.create_addon_request import CreateAddonRequest
4852
from volcenginesdkvke.models.create_addon_response import CreateAddonResponse
@@ -97,6 +101,7 @@
97101
from volcenginesdkvke.models.filter_for_list_supported_resource_types_input import FilterForListSupportedResourceTypesInput
98102
from volcenginesdkvke.models.flannel_config_for_create_cluster_input import FlannelConfigForCreateClusterInput
99103
from volcenginesdkvke.models.flannel_config_for_list_clusters_output import FlannelConfigForListClustersOutput
104+
from volcenginesdkvke.models.flannel_config_for_update_cluster_config_input import FlannelConfigForUpdateClusterConfigInput
100105
from volcenginesdkvke.models.forward_kubernetes_api_request import ForwardKubernetesApiRequest
101106
from volcenginesdkvke.models.forward_kubernetes_api_response import ForwardKubernetesApiResponse
102107
from volcenginesdkvke.models.get_global_default_delete_option_request import GetGlobalDefaultDeleteOptionRequest
@@ -110,6 +115,7 @@
110115
from volcenginesdkvke.models.instances_distribution_for_update_node_pool_config_input import InstancesDistributionForUpdateNodePoolConfigInput
111116
from volcenginesdkvke.models.intervene_cordon_for_list_remedy_configs_output import InterveneCordonForListRemedyConfigsOutput
112117
from volcenginesdkvke.models.intervene_drain_for_list_remedy_configs_output import InterveneDrainForListRemedyConfigsOutput
118+
from volcenginesdkvke.models.irsa_config_for_list_clusters_output import IrsaConfigForListClustersOutput
113119
from volcenginesdkvke.models.item_for_list_addons_output import ItemForListAddonsOutput
114120
from volcenginesdkvke.models.item_for_list_clusters_output import ItemForListClustersOutput
115121
from volcenginesdkvke.models.item_for_list_instance_type_labels_output import ItemForListInstanceTypeLabelsOutput
@@ -211,6 +217,10 @@
211217
from volcenginesdkvke.models.public_ip_for_list_clusters_output import PublicIpForListClustersOutput
212218
from volcenginesdkvke.models.register_monitoring_config_for_list_clusters_output import RegisterMonitoringConfigForListClustersOutput
213219
from volcenginesdkvke.models.register_monitoring_config_for_update_cluster_config_input import RegisterMonitoringConfigForUpdateClusterConfigInput
220+
from volcenginesdkvke.models.registry_proxy_config_for_create_default_node_pool_input import RegistryProxyConfigForCreateDefaultNodePoolInput
221+
from volcenginesdkvke.models.registry_proxy_config_for_create_node_pool_input import RegistryProxyConfigForCreateNodePoolInput
222+
from volcenginesdkvke.models.registry_proxy_config_for_list_node_pools_output import RegistryProxyConfigForListNodePoolsOutput
223+
from volcenginesdkvke.models.registry_proxy_config_for_update_node_pool_config_input import RegistryProxyConfigForUpdateNodePoolConfigInput
214224
from volcenginesdkvke.models.remedy_config_for_create_node_pool_input import RemedyConfigForCreateNodePoolInput
215225
from volcenginesdkvke.models.remedy_config_for_list_node_pools_output import RemedyConfigForListNodePoolsOutput
216226
from volcenginesdkvke.models.remedy_config_for_update_node_pool_config_input import RemedyConfigForUpdateNodePoolConfigInput

volcenginesdkvke/models/__init__.py

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,10 @@
3939
from volcenginesdkvke.models.condition_for_list_nodes_output import ConditionForListNodesOutput
4040
from volcenginesdkvke.models.config_for_list_remedy_configs_output import ConfigForListRemedyConfigsOutput
4141
from volcenginesdkvke.models.connector_config_for_list_clusters_output import ConnectorConfigForListClustersOutput
42+
from volcenginesdkvke.models.containerd_config_for_create_default_node_pool_input import ContainerdConfigForCreateDefaultNodePoolInput
43+
from volcenginesdkvke.models.containerd_config_for_create_node_pool_input import ContainerdConfigForCreateNodePoolInput
44+
from volcenginesdkvke.models.containerd_config_for_list_node_pools_output import ContainerdConfigForListNodePoolsOutput
45+
from volcenginesdkvke.models.containerd_config_for_update_node_pool_config_input import ContainerdConfigForUpdateNodePoolConfigInput
4246
from volcenginesdkvke.models.convert_tag_for_list_node_pools_output import ConvertTagForListNodePoolsOutput
4347
from volcenginesdkvke.models.create_addon_request import CreateAddonRequest
4448
from volcenginesdkvke.models.create_addon_response import CreateAddonResponse
@@ -93,6 +97,7 @@
9397
from volcenginesdkvke.models.filter_for_list_supported_resource_types_input import FilterForListSupportedResourceTypesInput
9498
from volcenginesdkvke.models.flannel_config_for_create_cluster_input import FlannelConfigForCreateClusterInput
9599
from volcenginesdkvke.models.flannel_config_for_list_clusters_output import FlannelConfigForListClustersOutput
100+
from volcenginesdkvke.models.flannel_config_for_update_cluster_config_input import FlannelConfigForUpdateClusterConfigInput
96101
from volcenginesdkvke.models.forward_kubernetes_api_request import ForwardKubernetesApiRequest
97102
from volcenginesdkvke.models.forward_kubernetes_api_response import ForwardKubernetesApiResponse
98103
from volcenginesdkvke.models.get_global_default_delete_option_request import GetGlobalDefaultDeleteOptionRequest
@@ -106,6 +111,7 @@
106111
from volcenginesdkvke.models.instances_distribution_for_update_node_pool_config_input import InstancesDistributionForUpdateNodePoolConfigInput
107112
from volcenginesdkvke.models.intervene_cordon_for_list_remedy_configs_output import InterveneCordonForListRemedyConfigsOutput
108113
from volcenginesdkvke.models.intervene_drain_for_list_remedy_configs_output import InterveneDrainForListRemedyConfigsOutput
114+
from volcenginesdkvke.models.irsa_config_for_list_clusters_output import IrsaConfigForListClustersOutput
109115
from volcenginesdkvke.models.item_for_list_addons_output import ItemForListAddonsOutput
110116
from volcenginesdkvke.models.item_for_list_clusters_output import ItemForListClustersOutput
111117
from volcenginesdkvke.models.item_for_list_instance_type_labels_output import ItemForListInstanceTypeLabelsOutput
@@ -207,6 +213,10 @@
207213
from volcenginesdkvke.models.public_ip_for_list_clusters_output import PublicIpForListClustersOutput
208214
from volcenginesdkvke.models.register_monitoring_config_for_list_clusters_output import RegisterMonitoringConfigForListClustersOutput
209215
from volcenginesdkvke.models.register_monitoring_config_for_update_cluster_config_input import RegisterMonitoringConfigForUpdateClusterConfigInput
216+
from volcenginesdkvke.models.registry_proxy_config_for_create_default_node_pool_input import RegistryProxyConfigForCreateDefaultNodePoolInput
217+
from volcenginesdkvke.models.registry_proxy_config_for_create_node_pool_input import RegistryProxyConfigForCreateNodePoolInput
218+
from volcenginesdkvke.models.registry_proxy_config_for_list_node_pools_output import RegistryProxyConfigForListNodePoolsOutput
219+
from volcenginesdkvke.models.registry_proxy_config_for_update_node_pool_config_input import RegistryProxyConfigForUpdateNodePoolConfigInput
210220
from volcenginesdkvke.models.remedy_config_for_create_node_pool_input import RemedyConfigForCreateNodePoolInput
211221
from volcenginesdkvke.models.remedy_config_for_list_node_pools_output import RemedyConfigForListNodePoolsOutput
212222
from volcenginesdkvke.models.remedy_config_for_update_node_pool_config_input import RemedyConfigForUpdateNodePoolConfigInput

volcenginesdkvke/models/binding_remedy_config_request.py

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ class BindingRemedyConfigRequest(object):
3333
and the value is json key in definition.
3434
"""
3535
swagger_types = {
36+
'client_token': 'str',
3637
'cluster_id': 'str',
3738
'id': 'str',
3839
'resource_ids': 'list[str]',
@@ -41,26 +42,30 @@ class BindingRemedyConfigRequest(object):
4142
}
4243

4344
attribute_map = {
45+
'client_token': 'ClientToken',
4446
'cluster_id': 'ClusterId',
4547
'id': 'Id',
4648
'resource_ids': 'ResourceIds',
4749
'resource_type': 'ResourceType',
4850
'use_recommended_remedy_configs': 'UseRecommendedRemedyConfigs'
4951
}
5052

51-
def __init__(self, cluster_id=None, id=None, resource_ids=None, resource_type=None, use_recommended_remedy_configs=None, _configuration=None): # noqa: E501
53+
def __init__(self, client_token=None, cluster_id=None, id=None, resource_ids=None, resource_type=None, use_recommended_remedy_configs=None, _configuration=None): # noqa: E501
5254
"""BindingRemedyConfigRequest - a model defined in Swagger""" # noqa: E501
5355
if _configuration is None:
5456
_configuration = Configuration()
5557
self._configuration = _configuration
5658

59+
self._client_token = None
5760
self._cluster_id = None
5861
self._id = None
5962
self._resource_ids = None
6063
self._resource_type = None
6164
self._use_recommended_remedy_configs = None
6265
self.discriminator = None
6366

67+
if client_token is not None:
68+
self.client_token = client_token
6469
self.cluster_id = cluster_id
6570
if id is not None:
6671
self.id = id
@@ -70,6 +75,27 @@ def __init__(self, cluster_id=None, id=None, resource_ids=None, resource_type=No
7075
if use_recommended_remedy_configs is not None:
7176
self.use_recommended_remedy_configs = use_recommended_remedy_configs
7277

78+
@property
79+
def client_token(self):
80+
"""Gets the client_token of this BindingRemedyConfigRequest. # noqa: E501
81+
82+
83+
:return: The client_token of this BindingRemedyConfigRequest. # noqa: E501
84+
:rtype: str
85+
"""
86+
return self._client_token
87+
88+
@client_token.setter
89+
def client_token(self, client_token):
90+
"""Sets the client_token of this BindingRemedyConfigRequest.
91+
92+
93+
:param client_token: The client_token of this BindingRemedyConfigRequest. # noqa: E501
94+
:type: str
95+
"""
96+
97+
self._client_token = client_token
98+
7399
@property
74100
def cluster_id(self):
75101
"""Gets the cluster_id of this BindingRemedyConfigRequest. # noqa: E501

volcenginesdkvke/models/cluster_config_for_list_clusters_output.py

Lines changed: 27 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@ class ClusterConfigForListClustersOutput(object):
3636
'api_server_endpoints': 'ApiServerEndpointsForListClustersOutput',
3737
'api_server_public_access_config': 'ApiServerPublicAccessConfigForListClustersOutput',
3838
'api_server_public_access_enabled': 'bool',
39+
'ip_family': 'str',
3940
'resource_public_access_default_enabled': 'bool',
4041
'security_group_ids': 'list[str]',
4142
'subnet_ids': 'list[str]',
@@ -46,13 +47,14 @@ class ClusterConfigForListClustersOutput(object):
4647
'api_server_endpoints': 'ApiServerEndpoints',
4748
'api_server_public_access_config': 'ApiServerPublicAccessConfig',
4849
'api_server_public_access_enabled': 'ApiServerPublicAccessEnabled',
50+
'ip_family': 'IpFamily',
4951
'resource_public_access_default_enabled': 'ResourcePublicAccessDefaultEnabled',
5052
'security_group_ids': 'SecurityGroupIds',
5153
'subnet_ids': 'SubnetIds',
5254
'vpc_id': 'VpcId'
5355
}
5456

55-
def __init__(self, api_server_endpoints=None, api_server_public_access_config=None, api_server_public_access_enabled=None, resource_public_access_default_enabled=None, security_group_ids=None, subnet_ids=None, vpc_id=None, _configuration=None): # noqa: E501
57+
def __init__(self, api_server_endpoints=None, api_server_public_access_config=None, api_server_public_access_enabled=None, ip_family=None, resource_public_access_default_enabled=None, security_group_ids=None, subnet_ids=None, vpc_id=None, _configuration=None): # noqa: E501
5658
"""ClusterConfigForListClustersOutput - a model defined in Swagger""" # noqa: E501
5759
if _configuration is None:
5860
_configuration = Configuration()
@@ -61,6 +63,7 @@ def __init__(self, api_server_endpoints=None, api_server_public_access_config=No
6163
self._api_server_endpoints = None
6264
self._api_server_public_access_config = None
6365
self._api_server_public_access_enabled = None
66+
self._ip_family = None
6467
self._resource_public_access_default_enabled = None
6568
self._security_group_ids = None
6669
self._subnet_ids = None
@@ -73,6 +76,8 @@ def __init__(self, api_server_endpoints=None, api_server_public_access_config=No
7376
self.api_server_public_access_config = api_server_public_access_config
7477
if api_server_public_access_enabled is not None:
7578
self.api_server_public_access_enabled = api_server_public_access_enabled
79+
if ip_family is not None:
80+
self.ip_family = ip_family
7681
if resource_public_access_default_enabled is not None:
7782
self.resource_public_access_default_enabled = resource_public_access_default_enabled
7883
if security_group_ids is not None:
@@ -145,6 +150,27 @@ def api_server_public_access_enabled(self, api_server_public_access_enabled):
145150

146151
self._api_server_public_access_enabled = api_server_public_access_enabled
147152

153+
@property
154+
def ip_family(self):
155+
"""Gets the ip_family of this ClusterConfigForListClustersOutput. # noqa: E501
156+
157+
158+
:return: The ip_family of this ClusterConfigForListClustersOutput. # noqa: E501
159+
:rtype: str
160+
"""
161+
return self._ip_family
162+
163+
@ip_family.setter
164+
def ip_family(self, ip_family):
165+
"""Sets the ip_family of this ClusterConfigForListClustersOutput.
166+
167+
168+
:param ip_family: The ip_family of this ClusterConfigForListClustersOutput. # noqa: E501
169+
:type: str
170+
"""
171+
172+
self._ip_family = ip_family
173+
148174
@property
149175
def resource_public_access_default_enabled(self):
150176
"""Gets the resource_public_access_default_enabled of this ClusterConfigForListClustersOutput. # noqa: E501

volcenginesdkvke/models/cluster_connector_config_request_for_update_cluster_config_input.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,7 @@ def provider(self, provider):
8585
:param provider: The provider of this ClusterConnectorConfigRequestForUpdateClusterConfigInput. # noqa: E501
8686
:type: str
8787
"""
88-
allowed_values = ["Ack", "Tke", "Cce", "Gke", "Eks", "BaiduCce", "None"] # noqa: E501
88+
allowed_values = ["VeStack", "Vke", "Ack", "Tke", "Cce", "None", "BaiduCce", "Gke", "Eks"] # noqa: E501
8989
if (self._configuration.client_side_validation and
9090
provider not in allowed_values):
9191
raise ValueError(
@@ -155,7 +155,7 @@ def type(self, type):
155155
:param type: The type of this ClusterConnectorConfigRequestForUpdateClusterConfigInput. # noqa: E501
156156
:type: str
157157
"""
158-
allowed_values = ["Direct", "Proxy"] # noqa: E501
158+
allowed_values = ["Direct", "Proxy", "Agent"] # noqa: E501
159159
if (self._configuration.client_side_validation and
160160
type not in allowed_values):
161161
raise ValueError(

0 commit comments

Comments
 (0)