From d261918c77d42fe24bb7f3f9abafc2f1177ed4c7 Mon Sep 17 00:00:00 2001 From: zzxwill Date: Mon, 18 Oct 2021 18:01:28 +0800 Subject: [PATCH] Fix: aws/azure Terraform provider are broken Removed built-in aws/azure Terraform providers, and fix azure mariadb definition issue. Fix #2475 --- go.mod | 2 +- go.sum | 4 ++-- .../definitions/terraform-azure-database-mariadb.yaml | 2 +- vela-templates/addons/terraform/template.yaml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/go.mod b/go.mod index 6e69fb99de8f..06936e73b2cf 100644 --- a/go.mod +++ b/go.mod @@ -35,7 +35,7 @@ require ( github.com/mitchellh/hashstructure/v2 v2.0.1 github.com/oam-dev/cluster-gateway v1.1.2 github.com/oam-dev/terraform-config-inspect v0.0.0-20210418082552-fc72d929aa28 - github.com/oam-dev/terraform-controller v0.2.1 + github.com/oam-dev/terraform-controller v0.2.4 github.com/olekukonko/tablewriter v0.0.5 github.com/onsi/ginkgo v1.16.4 github.com/onsi/gomega v1.16.0 diff --git a/go.sum b/go.sum index 18fedb114e0c..52245e12a87c 100644 --- a/go.sum +++ b/go.sum @@ -1207,8 +1207,8 @@ github.com/oam-dev/stern v1.13.0-alpha h1:EVjM8Qvh6LssB6t4RZrjf9DtCq1cz+/cy6OF7f github.com/oam-dev/stern v1.13.0-alpha/go.mod h1:AOkvfFUv0Arz7GBi0jz7S0Jsu4K/kdvSjNsnRt1+BIg= github.com/oam-dev/terraform-config-inspect v0.0.0-20210418082552-fc72d929aa28 h1:tD8HiFKnt0jnwdTWjeqUnfnUYLD/+Nsmj8ZGIxqDWiU= github.com/oam-dev/terraform-config-inspect v0.0.0-20210418082552-fc72d929aa28/go.mod h1:Mu8i0/DdplvnjwRbAYPsc8+LRR27n/mp8VWdkN10GzE= -github.com/oam-dev/terraform-controller v0.2.1 h1:gGXcUDBMWKfWet84STm99RX6gXo89pyTRsgQSLq2mog= -github.com/oam-dev/terraform-controller v0.2.1/go.mod h1:5Vy6jLx9fjotEd6E005Ve1f0x3fEpVlG/DVjmqLjAq0= +github.com/oam-dev/terraform-controller v0.2.4 h1:yGgIzm2EWNghuRutnChrRfhMjdlU/jE/cLfBizCgE24= +github.com/oam-dev/terraform-controller v0.2.4/go.mod h1:wd4rnqnJzz274Sg1/qoeIhBx1rvTZ/ECzXoMff0ucR0= github.com/oklog/oklog v0.3.2/go.mod h1:FCV+B7mhrz4o+ueLpx+KqkyXRGMWOYEvfiXtdGtbWGs= github.com/oklog/run v1.0.0/go.mod h1:dlhp/R75TPv97u0XWUtDeV/lRKWPKSdTuV0TZvrmrQA= github.com/oklog/run v1.1.0/go.mod h1:sVPdnTZT1zYwAJeCMu2Th4T21pA3FPOQRfWjQlk7DVU= diff --git a/vela-templates/addons/terraform/definitions/terraform-azure-database-mariadb.yaml b/vela-templates/addons/terraform/definitions/terraform-azure-database-mariadb.yaml index f1e9abfe1c17..3cb0b942a418 100644 --- a/vela-templates/addons/terraform/definitions/terraform-azure-database-mariadb.yaml +++ b/vela-templates/addons/terraform/definitions/terraform-azure-database-mariadb.yaml @@ -102,7 +102,7 @@ spec: value = var.password } output "DB_PORT" { - value = 3306 + value = "3306" } output "DB_HOST" { value = azurerm_mariadb_server.example.fqdn diff --git a/vela-templates/addons/terraform/template.yaml b/vela-templates/addons/terraform/template.yaml index 3bc2ed9fb69d..0ffd238ba774 100644 --- a/vela-templates/addons/terraform/template.yaml +++ b/vela-templates/addons/terraform/template.yaml @@ -33,7 +33,7 @@ spec: repoType: helm url: https://charts.kubevela.net/addons chart: terraform-controller - version: 0.1.19 + version: 0.2.4 {{ range .ResourceFiles }} - name: {{ .Name }} type: raw