Add provider versions constraint for GCP and Aliyun and support values file customization for tidb-operator and tidb-cluster

deploy/aliyun/versions.tf

@@ -1,4 +1,11 @@
 
 terraform {
   required_version = ">= 0.12"
+  required_providers {
+    alicloud = "~> 1.56"
+    external = "~> 1.2"
+    helm = "~> 0.10"
+    null = "~> 2.1"
+    template = "~> 2.1"
+  }
 }

deploy/gcp/main.tf

@@ -50,7 +50,7 @@ module "tidb-operator" {
   kubeconfig_path               = local.kubeconfig
   tidb_operator_version         = var.tidb_operator_version
   maintenance_window_start_time = var.maintenance_window_start_time
-  operator_helm_values          = var.operator_helm_values
+  operator_helm_values          = var.operator_helm_values == "" ? var.operator_helm_values_file == "" ? "" : file(var.operator_helm_values_file) : var.operator_helm_values
 }
 
 module "bastion" {

deploy/gcp/tidbclusters.tf

@@ -40,5 +40,5 @@ module "default-tidb-cluster" {
   tidb_node_count            = var.tidb_count
   monitor_node_count         = var.monitor_count
   tikv_local_ssd_count       = var.tikv_local_ssd_count
-  override_values            = var.override_values
+  override_values            = var.override_values == "" ? var.override_values_file == "" ? "" : file(var.override_values_file) : var.override_values
 }

deploy/gcp/variables.tf

@@ -42,6 +42,11 @@ variable "operator_helm_values" {
   default     = ""
 }
 
+variable "operator_helm_values_file" {
+  description = "The helm values file for TiDB Operator, path is relative to current working dir"
+  default     = ""
+}
+
 variable "create_vpc" {
   default = true
 }
@@ -129,3 +134,7 @@ variable "override_values" {
   description = "YAML formatted values that will be passed in to the tidb-cluster helm release"
   default     = ""
 }
+variable "override_values_file" {
+  description = "The helm values file for TiDB Cluster, path is relative to current working dir"
+  default     = ""
+}

deploy/gcp/versions.tf

@@ -1,4 +1,11 @@
 
 terraform {
   required_version = ">= 0.12"
+  required_providers {
+    google = "~> 2.16"
+    google-beta = "~> 2.16"
+    external = "~> 1.2"
+    helm = "~> 0.10"
+    null = "~> 2.1"
+  }
 }