From 99411a7f0134dc69bec907fc3b464e7cd91e7624 Mon Sep 17 00:00:00 2001 From: Zheng Xi Zhou Date: Thu, 30 Sep 2021 13:53:49 +0800 Subject: [PATCH] Fix: make the name of Terraform credential secret same to component name (#2399) To make the secret name of Terraform credential more clear and avoid the impact on the feature of #2336 --- .../templates/addons/terraform-provider-alibaba.yaml | 6 +++--- .../addons/auto-gen/terraform-provider-alibaba.yaml | 4 ++-- .../addons/terraform-provider-alibaba/template.yaml | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/charts/vela-core/templates/addons/terraform-provider-alibaba.yaml b/charts/vela-core/templates/addons/terraform-provider-alibaba.yaml index 70fd08b0c..48d8b0eb0 100644 --- a/charts/vela-core/templates/addons/terraform-provider-alibaba.yaml +++ b/charts/vela-core/templates/addons/terraform-provider-alibaba.yaml @@ -5,7 +5,7 @@ data: kind: Initializer metadata: annotations: - addons.oam.dev/description: terraform provider (alibaba) + addons.oam.dev/description: Kubernetes Terraform Controller for Alibaba Cloud addons.oam.dev/name: terraform/provider-alibaba name: terraform-provider-alibaba namespace: default @@ -18,7 +18,7 @@ data: apiVersion: v1 kind: Secret metadata: - name: alibaba-provider-secret + name: alibaba-account-creds namespace: vela-system stringData: credentials: | @@ -57,7 +57,7 @@ data: kind: ConfigMap metadata: annotations: - addons.oam.dev/description: terraform provider (alibaba) + addons.oam.dev/description: Kubernetes Terraform Controller for Alibaba Cloud addons.oam.dev/name: terraform/provider-alibaba labels: addons.oam.dev/type: terraform-provider-alibaba diff --git a/vela-templates/addons/auto-gen/terraform-provider-alibaba.yaml b/vela-templates/addons/auto-gen/terraform-provider-alibaba.yaml index 2335c17d5..79e58e29c 100644 --- a/vela-templates/addons/auto-gen/terraform-provider-alibaba.yaml +++ b/vela-templates/addons/auto-gen/terraform-provider-alibaba.yaml @@ -2,7 +2,7 @@ apiVersion: core.oam.dev/v1beta1 kind: Initializer metadata: annotations: - addons.oam.dev/description: terraform provider (alibaba) + addons.oam.dev/description: Kubernetes Terraform Controller for Alibaba Cloud addons.oam.dev/name: terraform/provider-alibaba name: terraform-provider-alibaba namespace: default @@ -15,7 +15,7 @@ spec: apiVersion: v1 kind: Secret metadata: - name: alibaba-provider-secret + name: alibaba-account-creds namespace: vela-system stringData: credentials: | diff --git a/vela-templates/addons/terraform-provider-alibaba/template.yaml b/vela-templates/addons/terraform-provider-alibaba/template.yaml index a225ae27f..85236d255 100644 --- a/vela-templates/addons/terraform-provider-alibaba/template.yaml +++ b/vela-templates/addons/terraform-provider-alibaba/template.yaml @@ -2,7 +2,7 @@ apiVersion: core.oam.dev/v1beta1 kind: Initializer metadata: annotations: - addons.oam.dev/description: terraform provider (alibaba) + addons.oam.dev/description: Kubernetes Terraform Controller for Alibaba Cloud addons.oam.dev/name: terraform/provider-alibaba name: terraform-provider-alibaba namespace: default @@ -15,7 +15,7 @@ spec: apiVersion: v1 kind: Secret metadata: - name: alibaba-provider-secret + name: alibaba-account-creds namespace: vela-system type: Opaque stringData: