From c7b28feb07dd5c97d5dd10f47f5218af21800ac6 Mon Sep 17 00:00:00 2001 From: xiaojunnuo Date: Fri, 8 Jan 2021 09:13:29 +0800 Subject: [PATCH] fix: 1 --- packages/executor/src/index.js | 9 +++++++-- .../plugins/src/tencent/deploy-to-tke-ingress/index.js | 1 + 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/packages/executor/src/index.js b/packages/executor/src/index.js index 9a9118e3..1c1c1768 100644 --- a/packages/executor/src/index.js +++ b/packages/executor/src/index.js @@ -152,8 +152,13 @@ export class Executor { return } logger.info(`----【${taskName}】开始执行`) - await instance.execute({ cert, props: task.props, context }) - trace.set({ deployName, taskName, value: { current: 'success', status: 'success', remark: '执行成功', time: dayjs().format() } }) + try { + await instance.execute({ cert, props: task.props, context }) + trace.set({ deployName, taskName, value: { current: 'success', status: 'success', remark: '执行成功', time: dayjs().format() } }) + } catch (e) { + trace.set({ deployName, taskName, value: { current: 'error', status: 'error', remark: e.message, time: dayjs().format() } }) + throw e + } logger.info(`----任务【${taskName}】执行完成`) logger.info('') } diff --git a/packages/plugins/src/tencent/deploy-to-tke-ingress/index.js b/packages/plugins/src/tencent/deploy-to-tke-ingress/index.js index 9ad64dcf..81c48864 100644 --- a/packages/plugins/src/tencent/deploy-to-tke-ingress/index.js +++ b/packages/plugins/src/tencent/deploy-to-tke-ingress/index.js @@ -90,6 +90,7 @@ export class DeployCertToTencentTKEIngress extends AbstractTencentPlugin { } const ret = await client.DescribeClusterKubeconfig(params) this.checkRet(ret) + this.logger.info('注意:后续操作需要在【集群->基本信息】中配置(外网或内网访问),https://console.cloud.tencent.com/tke2/cluster') return ret.Kubeconfig }