diff --git a/aks/index.md b/aks/index.md index b764da8..4051a5f 100644 --- a/aks/index.md +++ b/aks/index.md @@ -42,7 +42,7 @@ No required inputs. The following input variables are optional (have default values): -### aks\_cluster\_name +### aks_cluster_name Description: n/a @@ -66,7 +66,7 @@ Type: `string` Default: `""` -### node\_count +### node_count Description: n/a @@ -74,7 +74,7 @@ Type: `number` Default: `1` -### resource\_group\_name +### resource_group_name Description: n/a @@ -82,7 +82,7 @@ Type: `string` Default: `"tf-aks-gh"` -### sp\_client\_id +### sp_client_id Description: n/a @@ -90,7 +90,7 @@ Type: `string` Default: `""` -### sp\_client\_secret +### sp_client_secret Description: n/a @@ -98,7 +98,7 @@ Type: `string` Default: `""` -### vm\_size +### vm_size Description: n/a diff --git a/aks/variables.tf b/aks/variables.tf index da0bf29..3e8f556 100644 --- a/aks/variables.tf +++ b/aks/variables.tf @@ -10,7 +10,7 @@ variable "location" { variable "member" { default = "" - type = string + type = string } variable "node_count" { diff --git a/eks/index.md b/eks/index.md index 0862a2b..bd6606b 100644 --- a/eks/index.md +++ b/eks/index.md @@ -47,7 +47,7 @@ No required inputs. The following input variables are optional (have default values): -### AWS\_ACCESS\_KEY\_ID +### AWS_ACCESS_KEY_ID Description: Access key ID @@ -55,7 +55,7 @@ Type: `string` Default: `""` -### AWS\_SECRET\_ACCESS\_KEY +### AWS_SECRET_ACCESS_KEY Description: AWS secret access key @@ -63,7 +63,7 @@ Type: `string` Default: `""` -### aws\_region +### aws_region Description: The region in which the EKS cluster will be deployed. @@ -71,14 +71,6 @@ Type: `string` Default: `"us-west-2"` -### member - -Description: n/a - -Type: `string` - -Default: `""` - ## Outputs The following outputs are exported: diff --git a/gke/function.tf b/gke/function.tf index 5a54a33..1cf03a2 100644 --- a/gke/function.tf +++ b/gke/function.tf @@ -34,10 +34,10 @@ resource "google_cloudfunctions_function" "hello-world" { # IAM entry for members to invoke the function resource "google_cloudfunctions_function_iam_binding" "binding" { - project = google_cloudfunctions_function.hello-world.project - region = google_cloudfunctions_function.hello-world.region + project = google_cloudfunctions_function.hello-world.project + region = google_cloudfunctions_function.hello-world.region cloud_function = google_cloudfunctions_function.hello-world.name - role = "roles/viewer" + role = "roles/viewer" members = [ var.cf_member, ] diff --git a/gke/main.tf b/gke/main.tf index e7b787e..d6c2a0b 100644 --- a/gke/main.tf +++ b/gke/main.tf @@ -33,8 +33,8 @@ resource "google_container_cluster" "primary" { private_cluster_config { enable_private_endpoint = true - enable_private_nodes = true - master_ipv4_cidr_block = "10.0.0.0/28" + enable_private_nodes = true + master_ipv4_cidr_block = "10.0.0.0/28" } # We can't create a cluster with no node pool defined, but we want to only use # separately managed node pools. So we create the smallest possible default diff --git a/gke/variables.tf b/gke/variables.tf index 0b54ee5..3ec52b1 100644 --- a/gke/variables.tf +++ b/gke/variables.tf @@ -10,14 +10,14 @@ variable "AWS_SECRET_ACCESS_KEY" { } variable "cf_member" { - default = "" + default = "" description = "Function executor" } variable "project_id" { default = "" description = "Google Cloud Project ID" - type = string + type = string } variable "region" { diff --git a/main.tf b/main.tf index 9f15856..9d6b4fb 100644 --- a/main.tf +++ b/main.tf @@ -41,8 +41,8 @@ module "eks" { } module "gke" { - cf_member = var.cf_member + cf_member = var.cf_member project_id = var.project_id - region = var.region - source = "./gke" + region = var.region + source = "./gke" } diff --git a/variables.tf b/variables.tf index 3bdc69c..f4e0c45 100644 --- a/variables.tf +++ b/variables.tf @@ -16,7 +16,7 @@ variable "AWS_SECRET_ACCESS_KEY" { } variable "cf_member" { - default = "" + default = "" description = "Cloud Function invoker" }