-
Notifications
You must be signed in to change notification settings - Fork 75
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'master' into releases/mainnet/v1.1.3-dashboard-only
- Loading branch information
Showing
49 changed files
with
1,430 additions
and
696 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
12 changes: 0 additions & 12 deletions
12
infrastructure/terraform/keep-dev/config-files/bitcoin-values.yaml.tmpl
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| terraform { | ||
| backend "gcs" { | ||
| bucket = "keep-prd-terraform-backend-bucket" | ||
| prefix = "terraform/state" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,69 @@ | ||
| data "google_client_config" "default" {} | ||
|
|
||
| # Configure the Google Cloud provider | ||
| provider "google" { | ||
| version = "<= 1.19.0" | ||
| region = "${var.region_data["region"]}" | ||
| } | ||
|
|
||
| provider "google-beta" { | ||
| version = "<= 1.19.0" | ||
| region = "${var.region_data["region"]}" | ||
| } | ||
|
|
||
| provider "null" { | ||
| version = "<= 2.0.0" | ||
| } | ||
|
|
||
| provider "random" { | ||
| version = "<= 2.0.0" | ||
| } | ||
|
|
||
| provider "template" { | ||
| version = "<= 1.0.0" | ||
| } | ||
|
|
||
| /* Set your locals. | ||
| * Terraform doesn't allow for string interpolation in variable maps. | ||
| * We cheat it by defining a local. A local instance variable mapping | ||
| * allows for string interpolation in maps. Locals are also good for | ||
| * names who are a construct of multiple values, to keep module blocks | ||
| * clean. | ||
| */ | ||
| locals { | ||
| public_subnet_name = "${var.environment}-${module.vpc.vpc_subnet_prefix}-pub-${var.region_data["region"]}" | ||
| private_subnet_name = "${var.environment}-${module.vpc.vpc_subnet_prefix}-pri-${var.region_data["region"]}" | ||
| gke_subnet_name = "${var.environment}-${module.vpc.vpc_subnet_prefix}-gke-${var.region_data["region"]}" | ||
|
|
||
| labels { | ||
| contact = "${var.contacts}" | ||
| environment = "${var.environment}" | ||
| vertical = "${var.vertical}" | ||
| } | ||
| } | ||
|
|
||
| module "project" { | ||
| source = "git@github.com:thesis/terraform-google-bootstrap-project.git?ref=0.1.0" | ||
| project_name = "${var.project_name}" | ||
| org_id = "${var.gcp_thesis_org_id}" | ||
| billing_account = "${var.gcp_thesis_billing_account}" | ||
| project_owner_members = "${var.project_owner_members}" | ||
| project_service_list = "${var.project_service_list}" | ||
| location = "${var.region_data["region"]}" | ||
| labels = "${local.labels}" | ||
| } | ||
|
|
||
| # Create vpc and primary subnets | ||
| module "vpc" { | ||
| source = "git@github.com:thesis/terraform-google-vpc.git?ref=0.1.0" | ||
| vpc_network_name = "${var.vpc_network_name}" | ||
| project = "${module.project.project_id}" | ||
| region = "${var.region_data["region"]}" | ||
| routing_mode = "${var.routing_mode}" | ||
|
|
||
| public_subnet_name = "${local.public_subnet_name}" | ||
| public_subnet_ip_cidr_range = "${var.public_subnet_ip_cidr_range}" | ||
|
|
||
| private_subnet_name = "${local.private_subnet_name}" | ||
| private_subnet_ip_cidr_range = "${var.private_subnet_ip_cidr_range}" | ||
| } |
10 changes: 10 additions & 0 deletions
10
infrastructure/terraform/keep-prd/config-files/files/helm-repositories.yaml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,10 @@ | ||
| apiVersion: "" | ||
| generated: "0001-01-01T00:00:00Z" | ||
| repositories: | ||
| - caFile: "" | ||
| certFile: "" | ||
| keyFile: "" | ||
| name: stable | ||
| password: "" | ||
| url: https://kubernetes-charts.storage.googleapis.com | ||
| username: "" |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,60 @@ | ||
| provider "kubernetes" { | ||
| version = "= 1.11.1" | ||
| load_config_file = false | ||
| host = "https://${var.gke_cluster["master_private_endpoint"]}" | ||
| token = "${data.google_client_config.default.access_token}" | ||
| cluster_ca_certificate = "${base64decode(module.gke_cluster.cluster_ca_certificate)}" | ||
| } | ||
|
|
||
| provider "helm" { | ||
| version = "= 1.1.1" | ||
| repository_config_path = "./config-files/helm-repositories.yaml" | ||
|
|
||
| kubernetes { | ||
| host = "https://${var.gke_cluster["master_private_endpoint"]}" | ||
| token = "${data.google_client_config.default.access_token}" | ||
| cluster_ca_certificate = "${base64decode(module.gke_cluster.cluster_ca_certificate)}" | ||
| } | ||
| } | ||
|
|
||
| # create gke cluster | ||
| module "gke_cluster" { | ||
| source = "git@github.com:thesis/terraform-google-kubernetes-engine.git?ref=0.1.0" | ||
| project = "${module.project.project_id}" | ||
| region = "${var.region_data["region"]}" | ||
| vpc_network_name = "${module.vpc.vpc_network_name}" | ||
|
|
||
| gke_subnet { | ||
| name = "${local.gke_subnet_name}" | ||
| primary_ip_cidr_range = "${var.gke_subnet["primary_ip_cidr_range"]}" | ||
| services_secondary_range_name = "${var.gke_subnet["services_secondary_range_name"]}" | ||
| services_secondary_ip_cidr_range = "${var.gke_subnet["services_secondary_ip_cidr_range"]}" | ||
| cluster_secondary_range_name = "${var.gke_subnet["cluster_secondary_range_name"]}" | ||
| cluster_secondary_ip_cidr_range = "${var.gke_subnet["cluster_secondary_ip_cidr_range"]}" | ||
| } | ||
|
|
||
| gke_cluster { | ||
| name = "${var.gke_cluster["name"]}" | ||
| private_cluster = "${var.gke_cluster["private_cluster"]}" | ||
| master_ipv4_cidr_block = "${var.gke_cluster["master_ipv4_cidr_block"]}" | ||
| daily_maintenance_window_start_time = "${var.gke_cluster["daily_maintenance_window_start_time"]}" | ||
| network_policy_enabled = "${var.gke_cluster["network_policy_enabled"]}" | ||
| network_policy_provider = "${var.gke_cluster["network_policy_provider"]}" | ||
| logging_service = "${var.gke_cluster["logging_service"]}" | ||
| monitoring_service = "${var.gke_cluster["monitoring_service"]}" | ||
| } | ||
|
|
||
| gke_node_pool { | ||
| name = "${var.gke_node_pool["name"]}" | ||
| node_count = "${var.gke_node_pool["node_count"]}" | ||
| machine_type = "${var.gke_node_pool["machine_type"]}" | ||
| disk_type = "${var.gke_node_pool["disk_type"]}" | ||
| disk_size_gb = "${var.gke_node_pool["disk_size_gb"]}" | ||
| oauth_scopes = "${var.gke_node_pool["oauth_scopes"]}" | ||
| auto_repair = "${var.gke_node_pool["auto_repair"]}" | ||
| auto_upgrade = "${var.gke_node_pool["auto_upgrade"]}" | ||
| tags = "${module.nat_gateway_zone_a.routing_tag_regional}" | ||
| } | ||
|
|
||
| labels = "${local.labels}" | ||
| } |
Oops, something went wrong.