Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix values file customization for tidb-operator on aliyun (#971) #983

Merged
merged 1 commit into from
Oct 9, 2019
+8 −2
Merged

fix values file customization for tidb-operator on aliyun (#971) #983

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
fix values file customization for tidb-operator on aliyun
@DanielZhangQD
DanielZhangQD authored and root committed Oct 9, 2019
commit 9dc2bb7521d525b9fda0ff7e4a286380b9667e3f
4 changes: 2 additions & 2 deletions deploy/aliyun/main.tf
View file
Original file line number Diff line number Diff line change
@@ -31,10 +31,10 @@ module "tidb-operator" {

region = var.ALICLOUD_REGION
access_key = var.ALICLOUD_ACCESS_KEY
secret_key = var.ALICLOUD_SECRET_KEY
secret_key = var.ALICLOUD_SECRET_KEY
cluster_name = var.cluster_name
operator_version = var.operator_version
operator_helm_values = var.operator_helm_values
operator_helm_values = var.operator_helm_values == "" ? "" : file(var.operator_helm_values)
k8s_pod_cidr = var.k8s_pod_cidr
k8s_service_cidr = var.k8s_service_cidr
vpc_cidr = var.vpc_cidr
6 changes: 6 additions & 0 deletions deploy/aliyun/variables.tf
View file
Original file line number Diff line number Diff line change
@@ -14,10 +14,16 @@ variable "operator_version" {
}

variable "operator_helm_values" {
description = "The helm values file for TiDB Operator, path is relative to current working dir"
type = string
default = ""
}

variable "override_values" {
description = "The helm values file for TiDB Cluster, path is relative to current working dir"
default = ""
}

variable "bastion_ingress_cidr" {
description = "Bastion ingress security rule cidr, it is highly recommended to set this in favor of safety"
default = "0.0.0.0/0"