feat: add support new v3 google provider (#10)

ouzi-dev · Feb 18, 2020 · c687e42 · c687e42
1 parent 1a0f0f9
commit c687e42
Show file tree

Hide file tree

Showing 4 changed files with 27 additions and 14 deletions.
diff --git a/main.tf b/main.tf
@@ -1,11 +1,11 @@
 module "network" {
-  source             = "./modules/network"
-  region             = var.region
-  cluster_name       = var.cluster_name
-  node_cidr_range    = var.node_cidr_range
-  pod_cidr_range     = var.pod_cidr_range
-  service_cidr_range = var.service_cidr_range
-  master_cidr_range  = var.master_cidr_range
+  source                    = "./modules/network"
+  region                    = var.region
+  cluster_name              = var.cluster_name
+  node_cidr_range           = var.node_cidr_range
+  pod_cidr_range            = var.pod_cidr_range
+  service_cidr_range        = var.service_cidr_range
+  master_cidr_range         = var.master_cidr_range
   workers_ports_from_master = var.network_allow_workers_ports_from_master
 }
 
@@ -26,6 +26,8 @@ module "cluster" {
   disable_network_policy              = var.disable_network_policy
   authenticator_groups_security_group = var.authenticator_groups_security_group
   enable_calico                       = var.enable_calico
+  logging_service                     = var.logging_service
+  monitoring_service                  = var.monitoring_service
 }
 
 module "default_workers" {

diff --git a/modules/gke-cluster/main.tf b/modules/gke-cluster/main.tf
@@ -9,7 +9,9 @@ resource "google_container_cluster" "k8s-cluster" {
   min_master_version = var.master_version
   enable_legacy_abac = false
 
-  logging_service = var.logging_service
+  logging_service    = var.logging_service
+  monitoring_service = var.monitoring_service
+
   lifecycle {
     ignore_changes = [min_master_version]
   }
@@ -59,9 +61,6 @@ resource "google_container_cluster" "k8s-cluster" {
     http_load_balancing {
       disabled = var.disable_lb
     }
-    kubernetes_dashboard {
-      disabled = var.disable_dashboard
-    }
     network_policy_config {
       disabled = var.disable_network_policy
     }

diff --git a/modules/gke-cluster/variables.tf b/modules/gke-cluster/variables.tf
@@ -49,7 +49,11 @@ variable "enable_calico" {
 }
 
 variable "logging_service" {
-  default = "none"
+  default = "logging.googleapis.com/kubernetes"
+}
+
+variable "monitoring_service" {
+  default = "monitoring.googleapis.com/kubernetes"
 }
 
 variable "authenticator_groups_security_group" {

diff --git a/variables.tf b/variables.tf
@@ -66,7 +66,7 @@ variable "machine_disk_size" {
 
 variable "machine_disk_type" {
   description = "Disk type for the primary pool of workers"
-  default = "pd-standard"
+  default     = "pd-standard"
 }
 
 variable "machine_is_preemptible" {
@@ -107,7 +107,7 @@ variable "enable_calico" {
 }
 
 variable "network_allow_workers_ports_from_master" {
-  type = list
+  type    = list
   default = ["443", "6443", "8443"]
 }
 
@@ -117,4 +117,12 @@ variable "init_nodes" {
 variable "authenticator_groups_security_group" {
   type    = string
   default = null
+}
+
+variable "logging_service" {
+  default = "logging.googleapis.com/kubernetes"
+}
+
+variable "monitoring_service" {
+  default = "monitoring.googleapis.com/kubernetes"
 }