From d6186f51885de908da8651c10efdc2fd0879487f Mon Sep 17 00:00:00 2001 From: Jack P Date: Fri, 5 May 2023 18:42:00 +0100 Subject: [PATCH] update variables files for gke nodepool taints (#1358) * update variables files for gke node config taints to allow passing of node objects * forgot to run terraform fmt.. * update module docs --- blueprints/gke/multitenant-fleet/README.md | 10 +++++----- blueprints/gke/multitenant-fleet/variables.tf | 6 +++++- fast/stages/3-gke-multitenant/dev/README.md | 10 +++++----- fast/stages/3-gke-multitenant/dev/variables.tf | 6 +++++- 4 files changed, 20 insertions(+), 12 deletions(-) diff --git a/blueprints/gke/multitenant-fleet/README.md b/blueprints/gke/multitenant-fleet/README.md index c263317b80..0818479b4b 100644 --- a/blueprints/gke/multitenant-fleet/README.md +++ b/blueprints/gke/multitenant-fleet/README.md @@ -247,9 +247,9 @@ module "gke" { |---|---|:---:|:---:|:---:| | [billing_account_id](variables.tf#L17) | Billing account id. | string | ✓ | | | [folder_id](variables.tf#L132) | Folder used for the GKE project in folders/nnnnnnnnnnn format. | string | ✓ | | -| [prefix](variables.tf#L179) | Prefix used for resource names. | string | ✓ | | -| [project_id](variables.tf#L188) | ID of the project that will contain all the clusters. | string | ✓ | | -| [vpc_config](variables.tf#L200) | Shared VPC project and VPC details. | object({…}) | ✓ | | +| [prefix](variables.tf#L183) | Prefix used for resource names. | string | ✓ | | +| [project_id](variables.tf#L192) | ID of the project that will contain all the clusters. | string | ✓ | | +| [vpc_config](variables.tf#L204) | Shared VPC project and VPC details. | object({…}) | ✓ | | | [clusters](variables.tf#L22) | Clusters configuration. Refer to the gke-cluster module for type details. | map(object({…})) | | {} | | [fleet_configmanagement_clusters](variables.tf#L70) | Config management features enabled on specific sets of member clusters, in config name => [cluster name] format. | map(list(string)) | | {} | | [fleet_configmanagement_templates](variables.tf#L77) | Sets of config management configurations that can be applied to member clusters, in config name => {options} format. | map(object({…})) | | {} | @@ -258,8 +258,8 @@ module "gke" { | [group_iam](variables.tf#L137) | Project-level IAM bindings for groups. Use group emails as keys, list of roles as values. | map(list(string)) | | {} | | [iam](variables.tf#L144) | Project-level authoritative IAM bindings for users and service accounts in {ROLE => [MEMBERS]} format. | map(list(string)) | | {} | | [labels](variables.tf#L151) | Project-level labels. | map(string) | | {} | -| [nodepools](variables.tf#L157) | Nodepools configuration. Refer to the gke-nodepool module for type details. | map(map(object({…}))) | | {} | -| [project_services](variables.tf#L193) | Additional project services to enable. | list(string) | | [] | +| [nodepools](variables.tf#L157) | Nodepools configuration. Refer to the gke-nodepool module for type details. | map(map(object({…}))) | | {} | +| [project_services](variables.tf#L197) | Additional project services to enable. | list(string) | | [] | ## Outputs diff --git a/blueprints/gke/multitenant-fleet/variables.tf b/blueprints/gke/multitenant-fleet/variables.tf index 2cfd26a1bc..13760606e3 100644 --- a/blueprints/gke/multitenant-fleet/variables.tf +++ b/blueprints/gke/multitenant-fleet/variables.tf @@ -170,7 +170,11 @@ variable "nodepools" { service_account = optional(any) sole_tenant_nodegroup = optional(string) tags = optional(list(string)) - taints = optional(list(any)) + taints = optional(list(object({ + key = string + value = string + effect = string + }))) }))) default = {} nullable = false diff --git a/fast/stages/3-gke-multitenant/dev/README.md b/fast/stages/3-gke-multitenant/dev/README.md index 3cc4e33045..2152003a15 100644 --- a/fast/stages/3-gke-multitenant/dev/README.md +++ b/fast/stages/3-gke-multitenant/dev/README.md @@ -166,8 +166,8 @@ Leave all these variables unset (or set to `null`) to disable fleet management. | [billing_account](variables.tf#L29) | Billing account id. If billing account is not part of the same org set `is_org_level` to false. | object({…}) | ✓ | | 0-bootstrap | | [folder_ids](variables.tf#L153) | Folders to be used for the networking resources in folders/nnnnnnnnnnn format. If null, folder will be created. | object({…}) | ✓ | | 1-resman | | [host_project_ids](variables.tf#L168) | Host project for the shared VPC. | object({…}) | ✓ | | 2-networking | -| [prefix](variables.tf#L217) | Prefix used for resources that need unique names. | string | ✓ | | | -| [vpc_self_links](variables.tf#L233) | Self link for the shared VPC. | object({…}) | ✓ | | 2-networking | +| [prefix](variables.tf#L221) | Prefix used for resources that need unique names. | string | ✓ | | | +| [vpc_self_links](variables.tf#L237) | Self link for the shared VPC. | object({…}) | ✓ | | 2-networking | | [clusters](variables.tf#L42) | Clusters configuration. Refer to the gke-cluster module for type details. | map(object({…})) | | {} | | | [fleet_configmanagement_clusters](variables.tf#L90) | Config management features enabled on specific sets of member clusters, in config name => [cluster name] format. | map(list(string)) | | {} | | | [fleet_configmanagement_templates](variables.tf#L98) | Sets of config management configurations that can be applied to member clusters, in config name => {options} format. | map(object({…})) | | {} | | @@ -176,9 +176,9 @@ Leave all these variables unset (or set to `null`) to disable fleet management. | [group_iam](variables.tf#L161) | Project-level authoritative IAM bindings for groups in {GROUP_EMAIL => [ROLES]} format. Use group emails as keys, list of roles as values. | map(list(string)) | | {} | | | [iam](variables.tf#L176) | Project-level authoritative IAM bindings for users and service accounts in {ROLE => [MEMBERS]} format. | map(list(string)) | | {} | | | [labels](variables.tf#L183) | Project-level labels. | map(string) | | {} | | -| [nodepools](variables.tf#L189) | Nodepools configuration. Refer to the gke-nodepool module for type details. | map(map(object({…}))) | | {} | | -| [outputs_location](variables.tf#L211) | Path where providers, tfvars files, and lists for the following stages are written. Leave empty to disable. | string | | null | | -| [project_services](variables.tf#L226) | Additional project services to enable. | list(string) | | [] | | +| [nodepools](variables.tf#L189) | Nodepools configuration. Refer to the gke-nodepool module for type details. | map(map(object({…}))) | | {} | | +| [outputs_location](variables.tf#L215) | Path where providers, tfvars files, and lists for the following stages are written. Leave empty to disable. | string | | null | | +| [project_services](variables.tf#L230) | Additional project services to enable. | list(string) | | [] | | ## Outputs diff --git a/fast/stages/3-gke-multitenant/dev/variables.tf b/fast/stages/3-gke-multitenant/dev/variables.tf index db532dd0eb..a872b49d18 100644 --- a/fast/stages/3-gke-multitenant/dev/variables.tf +++ b/fast/stages/3-gke-multitenant/dev/variables.tf @@ -202,7 +202,11 @@ variable "nodepools" { service_account = optional(any) sole_tenant_nodegroup = optional(string) tags = optional(list(string)) - taints = optional(list(any)) + taints = optional(list(object({ + key = string + value = string + effect = string + }))) }))) default = {} nullable = false