From 6cdb640be8813e5819d85d5e9d7e19064f88aceb Mon Sep 17 00:00:00 2001 From: Zheng Xi Zhou Date: Fri, 3 Dec 2021 21:38:41 +0800 Subject: [PATCH] Add identifier and console url for some definitions Added `identifier`, console url and output list for Alibaba Cloud definitions Signed-off-by: Zheng Xi Zhou --- .../definitions/terraform-alibaba-ack.yaml | 6 ++++++ .../definitions/terraform-alibaba-ask.yaml | 4 ++++ .../definitions/terraform-alibaba-eip.yaml | 4 ++++ .../definitions/terraform-alibaba-oss.yaml | 1 - 4 files changed, 14 insertions(+), 1 deletion(-) diff --git a/addons/terraform-alibaba/definitions/terraform-alibaba-ack.yaml b/addons/terraform-alibaba/definitions/terraform-alibaba-ack.yaml index 7458a93c..1a245dc8 100644 --- a/addons/terraform-alibaba/definitions/terraform-alibaba-ack.yaml +++ b/addons/terraform-alibaba/definitions/terraform-alibaba-ack.yaml @@ -5,6 +5,12 @@ metadata: namespace: vela-system annotations: definition.oam.dev/description: Terraform configuration for Alibaba Cloud ACK cluster + # identifier of this cloud resource + cloud-resource/identifier: CLUSTER_ID + # the console url of this cloud resource + cloud-resource/console-url: "https://cs.console.aliyun.com/#/k8s/cluster/{CLUSTER_ID}/v2/info/overview?clusterType=Kubernetes&profile=Default&state=running®ion={REGION}" + # the outputs which are sensitive. Separate them by a comma if there are more than one + cloud-resource/sensitive-outputs: "CLUSTER_CA_CERT,CLIENT_CERT,CLIENT_KEY" labels: type: terraform spec: diff --git a/addons/terraform-alibaba/definitions/terraform-alibaba-ask.yaml b/addons/terraform-alibaba/definitions/terraform-alibaba-ask.yaml index d3f871be..8a40a34f 100644 --- a/addons/terraform-alibaba/definitions/terraform-alibaba-ask.yaml +++ b/addons/terraform-alibaba/definitions/terraform-alibaba-ask.yaml @@ -5,6 +5,10 @@ metadata: namespace: vela-system annotations: definition.oam.dev/description: Terraform configuration for Alibaba Cloud Serverless Kubernetes (ASK) + # identifier of this cloud resource + cloud-resource/identifier: CLUSTER_ID + # the console url of this cloud resource + cloud-resource/console-url: "https://cs.console.aliyun.com/#/k8s/cluster/{CLUSTER_ID}/v2/info/overview?clusterType=Ask&profile=ask.v2&state=running®ion={REGION}" labels: type: terraform spec: diff --git a/addons/terraform-alibaba/definitions/terraform-alibaba-eip.yaml b/addons/terraform-alibaba/definitions/terraform-alibaba-eip.yaml index 36a72049..cdce9dd6 100644 --- a/addons/terraform-alibaba/definitions/terraform-alibaba-eip.yaml +++ b/addons/terraform-alibaba/definitions/terraform-alibaba-eip.yaml @@ -5,6 +5,10 @@ metadata: namespace: vela-system annotations: definition.oam.dev/description: Terraform configuration for Alibaba Cloud Elastic IP + # identifier of this cloud resource + cloud-resource/identifier: CLUSTER_ID + # the console url of this cloud resource + cloud-resource/console-url: "https://cs.console.aliyun.com/#/k8s/cluster/{CLUSTER_ID}/v2/info/overview?clusterType=Ask&profile=ask.v2&state=running®ion={REGION}" labels: type: terraform spec: diff --git a/addons/terraform-alibaba/definitions/terraform-alibaba-oss.yaml b/addons/terraform-alibaba/definitions/terraform-alibaba-oss.yaml index afcebc0a..9206cb0f 100644 --- a/addons/terraform-alibaba/definitions/terraform-alibaba-oss.yaml +++ b/addons/terraform-alibaba/definitions/terraform-alibaba-oss.yaml @@ -9,7 +9,6 @@ metadata: cloud-resource/identifier: BUCKET_NAME # the console url of this cloud resource cloud-resource/console-url: "https://oss.console.aliyun.com/bucket/oss-{REGION}/{BUCKET_NAME}/overview" - # the outputs which are sensitive. Separate them by a comma if there are more than one labels: type: terraform spec: