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

clusters improvement #1 and #2 #509

Merged
merged 12 commits into from
Feb 6, 2022
Merged

clusters improvement #1 and #2 #509

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
d7cb99d
shared_vpc_self_link variable from stage2
danielmarzini Feb 5, 2022
50eb22a
removing shared_vpc_self_link
danielmarzini Feb 5, 2022
20e560f
do not initial_node_count as node_count
danielmarzini Feb 5, 2022
2f9d110
moving project_id to clsuters_variable
danielmarzini Feb 5, 2022
5e9acbd
activate required binding onto multiple projects
danielmarzini Feb 5, 2022
30a602f
Merge branch 'fast-dev-gke' into fast-dev-gke-dmarzi
danielmarzini Feb 5, 2022
f54a6d8
remove old commented code
danielmarzini Feb 5, 2022
62dbf7f
remove gke-project-1 and its binding
danielmarzini Feb 5, 2022
0444d39
Create prod-gke-nodes-ew3.yaml
danielmarzini Feb 5, 2022
28ae4bf
Revert "Create prod-gke-nodes-ew3.yaml"
danielmarzini Feb 5, 2022
05b80c3
set single project scope
danielmarzini Feb 6, 2022
c5dee1f
Update gke-clusters.tf
danielmarzini Feb 6, 2022
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
2 changes: 1 addition & 1 deletion fast/stages/03-gke-multitenant/prod/gke-clusters.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ locals {
module "gke-cluster" {
source = "../../../../modules/gke-cluster"
for_each = local.clusters
project_id = module.gke-project-0.project_id
name = each.key
project_id = each.value.project_id
description = each.value.description
location = each.value.location
network = each.value.net.vpc
Expand Down
2 changes: 1 addition & 1 deletion fast/stages/03-gke-multitenant/prod/gke-nodepools.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ module "gke_1_nodepool" {
project_id = module.gke-project-0.project_id
cluster_name = module.gke-cluster[each.value.cluster].name
location = module.gke-cluster[each.value.cluster].location
initial_node_count = each.value.node_count
initial_node_count = each.value.initial_node_count
node_machine_type = each.value.node_type
# TODO(jccb): can we use spot instances here?
node_preemptible = each.value.preemptible
Expand Down
4 changes: 3 additions & 1 deletion fast/stages/03-gke-multitenant/prod/variables.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ variable "clusters" {
memory_min = number
memory_max = number
})
project_id = string
description = string
dns_domain = string
labels = map(string)
Expand Down Expand Up @@ -139,6 +140,7 @@ variable "nodepools" {
type = map(map(object({
node_count = number
node_type = string
initial_node_count = number
overrides = object({
image_type = string
max_pods_per_node = number
Expand All @@ -159,4 +161,4 @@ variable "vpc_host_project" {
# tfdoc:variable:source 02-networking
description = "Host project for the shared VPC."
type = string
}
}