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

Jump to bottom

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

Merged
merged 2 commits into from
Oct 9, 2019
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d6dd684
fix values file customization for tidb-operator on aliyun
DanielZhangQD Sep 30, 2019
1ebf537
Merge branch 'master' into aliyun
DanielZhangQD Oct 9, 2019
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
4 changes: 2 additions & 2 deletions deploy/aliyun/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 6 additions & 0 deletions deploy/aliyun/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down