Skip to content

Commit 5dfde1c

Browse files
authored
sdk: rolling update for 0.11.129 (#362)
1 parent c4e66f4 commit 5dfde1c

7 files changed

Lines changed: 868 additions & 824 deletions

File tree

‎ucloud/services/uk8s/client.py‎

Lines changed: 124 additions & 119 deletions
Large diffs are not rendered by default.

‎ucloud/services/uk8s/schemas/apis.py‎

Lines changed: 108 additions & 108 deletions
Original file line numberDiff line numberDiff line change
@@ -160,13 +160,12 @@ class AddUK8SUHostNodeParamNetworkInterfaceSchema(schema.RequestSchema):
160160
}
161161

162162

163-
class AddUK8SUHostNodeParamKubeletConfigurationSchema(schema.RequestSchema):
164-
"""AddUK8SUHostNodeParamKubeletConfiguration -"""
163+
class AddUK8SUHostNodeParamUserLabelsSchema(schema.RequestSchema):
164+
"""AddUK8SUHostNodeParamUserLabels -"""
165165

166166
fields = {
167-
"ContainerLogMaxFiles": fields.Str(
168-
required=False, dump_to="ContainerLogMaxFiles"
169-
),
167+
"Key": fields.Str(required=False, dump_to="Key"),
168+
"Value": fields.Str(required=False, dump_to="Value"),
170169
}
171170

172171

@@ -180,12 +179,13 @@ class AddUK8SUHostNodeParamSecGroupIdSchema(schema.RequestSchema):
180179
}
181180

182181

183-
class AddUK8SUHostNodeParamUserLabelsSchema(schema.RequestSchema):
184-
"""AddUK8SUHostNodeParamUserLabels -"""
182+
class AddUK8SUHostNodeParamKubeletConfigurationSchema(schema.RequestSchema):
183+
"""AddUK8SUHostNodeParamKubeletConfiguration -"""
185184

186185
fields = {
187-
"Key": fields.Str(required=False, dump_to="Key"),
188-
"Value": fields.Str(required=False, dump_to="Value"),
186+
"ContainerLogMaxFiles": fields.Str(
187+
required=False, dump_to="ContainerLogMaxFiles"
188+
),
189189
}
190190

191191

@@ -276,6 +276,17 @@ class CreateUK8SClusterV2ParamMasterSecGroupIdSchema(schema.RequestSchema):
276276
}
277277

278278

279+
class CreateUK8SClusterV2ParamMasterSchema(schema.RequestSchema):
280+
"""CreateUK8SClusterV2ParamMaster -"""
281+
282+
fields = {
283+
"SecGroupId": fields.List(
284+
CreateUK8SClusterV2ParamMasterSecGroupIdSchema()
285+
),
286+
"Zone": fields.Str(required=True, dump_to="Zone"),
287+
}
288+
289+
279290
class CreateUK8SClusterV2ParamNodesNetworkInterfaceEIPSchema(
280291
schema.RequestSchema
281292
):
@@ -292,14 +303,6 @@ class CreateUK8SClusterV2ParamNodesNetworkInterfaceEIPSchema(
292303
}
293304

294305

295-
class CreateUK8SClusterV2ParamKubeProxySchema(schema.RequestSchema):
296-
"""CreateUK8SClusterV2ParamKubeProxy -"""
297-
298-
fields = {
299-
"Mode": fields.Str(required=False, dump_to="Mode"),
300-
}
301-
302-
303306
class CreateUK8SClusterV2ParamNodesNetworkInterfaceSchema(schema.RequestSchema):
304307
"""CreateUK8SClusterV2ParamNodesNetworkInterface -"""
305308

@@ -361,14 +364,11 @@ class CreateUK8SClusterV2ParamNodesSchema(schema.RequestSchema):
361364
}
362365

363366

364-
class CreateUK8SClusterV2ParamMasterSchema(schema.RequestSchema):
365-
"""CreateUK8SClusterV2ParamMaster -"""
367+
class CreateUK8SClusterV2ParamKubeProxySchema(schema.RequestSchema):
368+
"""CreateUK8SClusterV2ParamKubeProxy -"""
366369

367370
fields = {
368-
"SecGroupId": fields.List(
369-
CreateUK8SClusterV2ParamMasterSecGroupIdSchema()
370-
),
371-
"Zone": fields.Str(required=True, dump_to="Zone"),
371+
"Mode": fields.Str(required=False, dump_to="Mode"),
372372
}
373373

374374

@@ -449,36 +449,56 @@ class CreateUK8SClusterV2ResponseSchema(schema.ResponseSchema):
449449
"""
450450

451451

452-
class CreateUK8SULSConfigParamInputDetailMetadataSchema(schema.RequestSchema):
453-
"""CreateUK8SULSConfigParamInputDetailMetadata -"""
452+
class CreateUK8SULSConfigParamMatchRulePodLabelsLabelsSchema(
453+
schema.RequestSchema
454+
):
455+
"""CreateUK8SULSConfigParamMatchRulePodLabelsLabels -"""
454456

455457
fields = {
456-
"Container": fields.Str(required=False, dump_to="Container"),
457-
"Labels": fields.Str(required=False, dump_to="Labels"),
458+
"Key": fields.Str(required=False, dump_to="Key"),
459+
"Value": fields.Str(required=False, dump_to="Value"),
460+
"ValueOperator": fields.Str(required=False, dump_to="ValueOperator"),
458461
}
459462

460463

461-
class CreateUK8SULSConfigParamInputDetailFilePathsSchema(schema.RequestSchema):
462-
"""CreateUK8SULSConfigParamInputDetailFilePaths -"""
464+
class CreateUK8SULSConfigParamMatchRulePodLabelsSchema(schema.RequestSchema):
465+
"""CreateUK8SULSConfigParamMatchRulePodLabels -"""
463466

464467
fields = {
465-
"File": fields.Str(required=False, dump_to="File"),
466-
"Path": fields.Str(required=False, dump_to="Path"),
468+
"Labels": fields.List(
469+
CreateUK8SULSConfigParamMatchRulePodLabelsLabelsSchema()
470+
),
471+
"Namespace": fields.Str(required=False, dump_to="Namespace"),
472+
"NamespaceOperator": fields.Str(
473+
required=False, dump_to="NamespaceOperator"
474+
),
467475
}
468476

469477

470-
class CreateUK8SULSConfigParamInputDetailSchema(schema.RequestSchema):
471-
"""CreateUK8SULSConfigParamInputDetail -"""
478+
class CreateUK8SULSConfigParamMatchRuleWorkloadsSchema(schema.RequestSchema):
479+
"""CreateUK8SULSConfigParamMatchRuleWorkloads -"""
472480

473481
fields = {
474-
"FilePaths": fields.List(
475-
CreateUK8SULSConfigParamInputDetailFilePathsSchema()
482+
"Name": fields.Str(required=False, dump_to="Name"),
483+
"Namespace": fields.Str(required=False, dump_to="Namespace"),
484+
"Type": fields.Str(required=False, dump_to="Type"),
485+
}
486+
487+
488+
class CreateUK8SULSConfigParamMatchRuleSchema(schema.RequestSchema):
489+
"""CreateUK8SULSConfigParamMatchRule -"""
490+
491+
fields = {
492+
"Container": fields.Str(required=False, dump_to="Container"),
493+
"ContainerOperator": fields.Str(
494+
required=False, dump_to="ContainerOperator"
476495
),
477-
"Metadata": CreateUK8SULSConfigParamInputDetailMetadataSchema(
478-
required=False, dump_to="Metadata"
496+
"PodLabels": CreateUK8SULSConfigParamMatchRulePodLabelsSchema(
497+
required=False, dump_to="PodLabels"
498+
),
499+
"Workloads": fields.List(
500+
CreateUK8SULSConfigParamMatchRuleWorkloadsSchema()
479501
),
480-
"Stream": fields.Str(required=False, dump_to="Stream"),
481-
"Type": fields.Str(required=True, dump_to="Type"),
482502
}
483503

484504

@@ -492,13 +512,12 @@ class CreateUK8SULSConfigParamExtractRuleExtractRuleSchema(
492512
}
493513

494514

495-
class CreateUK8SULSConfigParamMatchRuleWorkloadsSchema(schema.RequestSchema):
496-
"""CreateUK8SULSConfigParamMatchRuleWorkloads -"""
515+
class CreateUK8SULSConfigParamInputDetailMetadataSchema(schema.RequestSchema):
516+
"""CreateUK8SULSConfigParamInputDetailMetadata -"""
497517

498518
fields = {
499-
"Name": fields.Str(required=False, dump_to="Name"),
500-
"Namespace": fields.Str(required=False, dump_to="Namespace"),
501-
"Type": fields.Str(required=False, dump_to="Type"),
519+
"Container": fields.Str(required=False, dump_to="Container"),
520+
"Labels": fields.Str(required=False, dump_to="Labels"),
502521
}
503522

504523

@@ -529,46 +548,27 @@ class CreateUK8SULSConfigParamExtractRuleSchema(schema.RequestSchema):
529548
}
530549

531550

532-
class CreateUK8SULSConfigParamMatchRulePodLabelsLabelsSchema(
533-
schema.RequestSchema
534-
):
535-
"""CreateUK8SULSConfigParamMatchRulePodLabelsLabels -"""
536-
537-
fields = {
538-
"Key": fields.Str(required=False, dump_to="Key"),
539-
"Value": fields.Str(required=False, dump_to="Value"),
540-
"ValueOperator": fields.Str(required=False, dump_to="ValueOperator"),
541-
}
542-
543-
544-
class CreateUK8SULSConfigParamMatchRulePodLabelsSchema(schema.RequestSchema):
545-
"""CreateUK8SULSConfigParamMatchRulePodLabels -"""
551+
class CreateUK8SULSConfigParamInputDetailFilePathsSchema(schema.RequestSchema):
552+
"""CreateUK8SULSConfigParamInputDetailFilePaths -"""
546553

547554
fields = {
548-
"Labels": fields.List(
549-
CreateUK8SULSConfigParamMatchRulePodLabelsLabelsSchema()
550-
),
551-
"Namespace": fields.Str(required=False, dump_to="Namespace"),
552-
"NamespaceOperator": fields.Str(
553-
required=False, dump_to="NamespaceOperator"
554-
),
555+
"File": fields.Str(required=False, dump_to="File"),
556+
"Path": fields.Str(required=False, dump_to="Path"),
555557
}
556558

557559

558-
class CreateUK8SULSConfigParamMatchRuleSchema(schema.RequestSchema):
559-
"""CreateUK8SULSConfigParamMatchRule -"""
560+
class CreateUK8SULSConfigParamInputDetailSchema(schema.RequestSchema):
561+
"""CreateUK8SULSConfigParamInputDetail -"""
560562

561563
fields = {
562-
"Container": fields.Str(required=False, dump_to="Container"),
563-
"ContainerOperator": fields.Str(
564-
required=False, dump_to="ContainerOperator"
565-
),
566-
"PodLabels": CreateUK8SULSConfigParamMatchRulePodLabelsSchema(
567-
required=False, dump_to="PodLabels"
564+
"FilePaths": fields.List(
565+
CreateUK8SULSConfigParamInputDetailFilePathsSchema()
568566
),
569-
"Workloads": fields.List(
570-
CreateUK8SULSConfigParamMatchRuleWorkloadsSchema()
567+
"Metadata": CreateUK8SULSConfigParamInputDetailMetadataSchema(
568+
required=False, dump_to="Metadata"
571569
),
570+
"Stream": fields.Str(required=False, dump_to="Stream"),
571+
"Type": fields.Str(required=True, dump_to="Type"),
572572
}
573573

574574

@@ -1094,15 +1094,6 @@ class RemoveUK8SNodeGroupResponseSchema(schema.ResponseSchema):
10941094
"""
10951095

10961096

1097-
class UpdateUK8SULSConfigParamInputDetailMetadataSchema(schema.RequestSchema):
1098-
"""UpdateUK8SULSConfigParamInputDetailMetadata -"""
1099-
1100-
fields = {
1101-
"Container": fields.Str(required=False, dump_to="Container"),
1102-
"Labels": fields.Str(required=False, dump_to="Labels"),
1103-
}
1104-
1105-
11061097
class UpdateUK8SULSConfigParamMatchRulePodLabelsLabelsSchema(
11071098
schema.RequestSchema
11081099
):
@@ -1156,37 +1147,21 @@ class UpdateUK8SULSConfigParamMatchRuleSchema(schema.RequestSchema):
11561147
}
11571148

11581149

1159-
class UpdateUK8SULSConfigParamExtractRuleSchema(schema.RequestSchema):
1160-
"""UpdateUK8SULSConfigParamExtractRule -"""
1150+
class UpdateUK8SULSConfigParamInputDetailFilePathsSchema(schema.RequestSchema):
1151+
"""UpdateUK8SULSConfigParamInputDetailFilePaths -"""
11611152

11621153
fields = {
1163-
"BeginningRegex": fields.Str(required=False, dump_to="BeginningRegex"),
1164-
"BeginningRegexBase64": fields.Str(
1165-
required=False, dump_to="BeginningRegexBase64"
1166-
),
1167-
"CollectPolicy": fields.Str(required=False, dump_to="CollectPolicy"),
1168-
"Delimiter": fields.Str(required=False, dump_to="Delimiter"),
1169-
"DelimiterBase64": fields.Str(
1170-
required=False, dump_to="DelimiterBase64"
1171-
),
1172-
"Encode": fields.Str(required=False, dump_to="Encode"),
1173-
"Keys": fields.List(fields.Str()),
1174-
"LogRegex": fields.Str(required=False, dump_to="LogRegex"),
1175-
"LogRegexBase64": fields.Str(required=False, dump_to="LogRegexBase64"),
1176-
"LogType": fields.Str(required=True, dump_to="LogType"),
1177-
"TimeFormat": fields.Str(required=False, dump_to="TimeFormat"),
1178-
"TimeKey": fields.Str(required=False, dump_to="TimeKey"),
1179-
"UnMatchKey": fields.Str(required=False, dump_to="UnMatchKey"),
1180-
"UnMatchUpload": fields.Str(required=False, dump_to="UnMatchUpload"),
1154+
"File": fields.Str(required=False, dump_to="File"),
1155+
"Path": fields.Str(required=False, dump_to="Path"),
11811156
}
11821157

11831158

1184-
class UpdateUK8SULSConfigParamInputDetailFilePathsSchema(schema.RequestSchema):
1185-
"""UpdateUK8SULSConfigParamInputDetailFilePaths -"""
1159+
class UpdateUK8SULSConfigParamInputDetailMetadataSchema(schema.RequestSchema):
1160+
"""UpdateUK8SULSConfigParamInputDetailMetadata -"""
11861161

11871162
fields = {
1188-
"File": fields.Str(required=False, dump_to="File"),
1189-
"Path": fields.Str(required=False, dump_to="Path"),
1163+
"Container": fields.Str(required=False, dump_to="Container"),
1164+
"Labels": fields.Str(required=False, dump_to="Labels"),
11901165
}
11911166

11921167

@@ -1205,6 +1180,31 @@ class UpdateUK8SULSConfigParamInputDetailSchema(schema.RequestSchema):
12051180
}
12061181

12071182

1183+
class UpdateUK8SULSConfigParamExtractRuleSchema(schema.RequestSchema):
1184+
"""UpdateUK8SULSConfigParamExtractRule -"""
1185+
1186+
fields = {
1187+
"BeginningRegex": fields.Str(required=False, dump_to="BeginningRegex"),
1188+
"BeginningRegexBase64": fields.Str(
1189+
required=False, dump_to="BeginningRegexBase64"
1190+
),
1191+
"CollectPolicy": fields.Str(required=False, dump_to="CollectPolicy"),
1192+
"Delimiter": fields.Str(required=False, dump_to="Delimiter"),
1193+
"DelimiterBase64": fields.Str(
1194+
required=False, dump_to="DelimiterBase64"
1195+
),
1196+
"Encode": fields.Str(required=False, dump_to="Encode"),
1197+
"Keys": fields.List(fields.Str()),
1198+
"LogRegex": fields.Str(required=False, dump_to="LogRegex"),
1199+
"LogRegexBase64": fields.Str(required=False, dump_to="LogRegexBase64"),
1200+
"LogType": fields.Str(required=True, dump_to="LogType"),
1201+
"TimeFormat": fields.Str(required=False, dump_to="TimeFormat"),
1202+
"TimeKey": fields.Str(required=False, dump_to="TimeKey"),
1203+
"UnMatchKey": fields.Str(required=False, dump_to="UnMatchKey"),
1204+
"UnMatchUpload": fields.Str(required=False, dump_to="UnMatchUpload"),
1205+
}
1206+
1207+
12081208
class UpdateUK8SULSConfigRequestSchema(schema.RequestSchema):
12091209
"""UpdateUK8SULSConfig - 更新指定UK8S集群的日志采集规则。"""
12101210

0 commit comments

Comments
 (0)