Skip to content

Commit

Permalink
refactor(backend): helm整包更新 TencentBlueKing#8468
Browse files Browse the repository at this point in the history
  • Loading branch information
iSecloud committed Dec 6, 2024
1 parent ddef38d commit 1accc65
Show file tree
Hide file tree
Showing 8 changed files with 13 additions and 10 deletions.
4 changes: 2 additions & 2 deletions dbm-ui/backend/iam_app/dataclass/actions.py
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ class ActionEnum:

MYSQL_ADD_ACCOUNT_RULE = ActionMeta(
id="mysql_add_account_rule",
name=_("MySQL账号规则变更"),
name=_("MySQL授权规则变更"),
name_en="mysql_add_account_rule",
type="create",
related_actions=[DB_MANAGE.id],
Expand Down Expand Up @@ -705,7 +705,7 @@ class ActionEnum:

TENDBCLUSTER_ADD_ACCOUNT_RULE = ActionMeta(
id="tendbcluster_add_account_rule",
name=_("TenDB Cluster 账号规则变更"),
name=_("TenDB Cluster 授权规则变更"),
name_en="tendbcluster_add_account_rule",
type="create",
related_actions=[DB_MANAGE.id],
Expand Down
5 changes: 4 additions & 1 deletion dbm-ui/backend/ticket/builders/mysql/mysql_dump_data.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
DBTableField,
MySQLBaseOperateDetailSerializer,
)
from backend.ticket.constants import TicketType
from backend.ticket.constants import TicketFlowStatus, TicketType


class MySQLDumpDataDetailSerializer(MySQLBaseOperateDetailSerializer):
Expand Down Expand Up @@ -59,6 +59,9 @@ def format_ticket_data(self):

def post_callback(self):
flow = self.ticket.current_flow()
# 如果流程树运行不为成功,则忽略
if flow.status != TicketFlowStatus.SUCCEEDED:
return
# 往flow的detail中写入制品库的下载链接
dump_file_name = f"{flow.details['ticket_data']['dump_file_name']}.zip"
flow.details["ticket_data"].update(
Expand Down
2 changes: 1 addition & 1 deletion dbm-ui/backend/ticket/constants.py
Original file line number Diff line number Diff line change
Expand Up @@ -261,7 +261,7 @@ def get_cluster_type_by_ticket(cls, ticket_type):
TENDBSINGLE_STANDARDIZE = TicketEnumField("TENDBSINGLE_STANDARDIZE", _("TenDB Single 集群标准化"), register_iam=False) # noqa
TENDBCLUSTER_DATA_MIGRATE = TicketEnumField("TENDBCLUSTER_DATA_MIGRATE", _("TenDB Cluster DB克隆"), _("数据处理"))
TENDBCLUSTER_DUMP_DATA = TicketEnumField("TENDBCLUSTER_DUMP_DATA", _("TenDB Cluster 数据导出"), _("数据处理"))
TENDBCLUSTER_ACCOUNT_RULE_CHANGE = TicketEnumField("TENDBCLUSTER_ACCOUNT_RULE_CHANGE", _("TenDB Cluster 账号规则变更"), register_iam=False) # noqa
TENDBCLUSTER_ACCOUNT_RULE_CHANGE = TicketEnumField("TENDBCLUSTER_ACCOUNT_RULE_CHANGE", _("TenDB Cluster 授权规则变更"), register_iam=False) # noqa

# Tbinlogdumper
TBINLOGDUMPER_INSTALL = TicketEnumField("TBINLOGDUMPER_INSTALL", _("TBINLOGDUMPER 上架"), register_iam=False)
Expand Down
4 changes: 2 additions & 2 deletions helm-charts/bk-dbm/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -91,5 +91,5 @@ dependencies:
description: A Helm chart for bk-dbm
name: bk-dbm
type: application
version: 1.5.0-alpha.28
appVersion: 1.5.0-alpha.28
version: 1.5.0-alpha.29
appVersion: 1.5.0-alpha.29
2 changes: 1 addition & 1 deletion helm-charts/bk-dbm/charts/db-resource/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: v2
appVersion: 0.0.1-alpha.107
appVersion: 0.0.1-alpha.108
description: A Helm chart for Kubernetes
name: db-resource
type: application
Expand Down
2 changes: 1 addition & 1 deletion helm-charts/bk-dbm/charts/dbconfig/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: v2
appVersion: 0.0.1-alpha.129
appVersion: 0.0.1-alpha.130
description: A Helm chart for dbconfig
name: dbconfig
type: application
Expand Down
2 changes: 1 addition & 1 deletion helm-charts/bk-dbm/charts/dbm/Chart.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
apiVersion: v2
appVersion: 1.5.0-alpha.1300
appVersion: 1.5.0-alpha.1377
description: A Helm chart for dbm
name: dbm
type: application
Expand Down
2 changes: 1 addition & 1 deletion helm-charts/bk-dbm/charts/hadb-api/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ name: hadb-api
description: A Helm chart for Kubernetes
type: application
version: 0.0.11
appVersion: 0.0.1-alpha.31
appVersion: 0.0.1-alpha.33

0 comments on commit 1accc65

Please sign in to comment.