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

add provider and module versions for aws #926

Merged
merged 3 commits into from
Sep 18, 2019
Merged

add provider and module versions for aws #926

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5042d1d
add provider and module versions for aws
DanielZhangQD Sep 17, 2019
f128e7a
Merge branch 'master' into aws
cofyc Sep 18, 2019
5a3b7cf
Merge branch 'master' into aws
DanielZhangQD Sep 18, 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/aws/aws-tutorial.tfvars
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
default_cluster_pd_instance_type = "c5d.large"
default_cluster_pd_tikv_instance_type = "c5d.large"
default_cluster_tikv_instance_type = "c5d.large"
default_cluster_tidb_instance_type = "c4.large"
default_cluster_monitor_instance_type = "c5.large"

default_cluster_pd_count = 1
default_cluster_tikv_count = 1
default_cluster_tidb_count = 1

default_cluster_cluster_name = "aws-tutorial"
default_cluster_name = "aws-tutorial"
9 changes: 9 additions & 0 deletions deploy/aws/versions.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,13 @@

terraform {
required_version = ">= 0.12"
required_providers {
aws = "~> 2.27"
external = "~> 1.2"
helm = "~> 0.10"
local = "~> 1.3"
null = "~> 2.1"
template = "~> 2.1"
tls = "~> 2.1"
}
}
1 change: 1 addition & 0 deletions deploy/modules/aws/tidb-operator/main.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
module "eks" {
source = "terraform-aws-modules/eks/aws"

version = "5.1.0"
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

what is this version?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is the version for module terraform-aws-modules/eks/aws.
Each provider and the non-local module is recommended to set the version explicitly:
https://www.terraform.io/docs/configuration/modules.html#module-versions
https://www.terraform.io/docs/configuration/providers.html#version-provider-versions

cluster_name = var.eks_name
cluster_version = var.eks_version
vpc_id = var.vpc_id
Expand Down