Merge branch 'master' into feature/maintenance-exclusion

terraform-google-modules · Jun 6, 2022 · 5507045 · 5507045
2 parents 7e22154 + 4bba52f
commit 5507045
Show file tree

Hide file tree

Showing 21 changed files with 199 additions and 94 deletions.
diff --git a/README.md b/README.md
@@ -160,7 +160,9 @@ Then perform the following commands on the root folder:
 | issue\_client\_certificate | Issues a client certificate to authenticate to the cluster endpoint. To maximize the security of your cluster, leave this option disabled. Client certificates don't automatically rotate and aren't easily revocable. WARNING: changing this after cluster creation is destructive! | `bool` | `false` | no |
 | kubernetes\_version | The Kubernetes version of the masters. If set to 'latest' it will pull latest available version in the selected region. | `string` | `"latest"` | no |
 | logging\_service | The logging service that the cluster should write logs to. Available options include logging.googleapis.com, logging.googleapis.com/kubernetes (beta), and none | `string` | `"logging.googleapis.com/kubernetes"` | no |
+| maintenance\_end\_time | Time window specified for recurring maintenance operations in RFC3339 format | `string` | `""` | no |
 | maintenance\_exclusions | List of maintenance exclusions. A cluster can have up to three | `list(object({ name = string, start_time = string, end_time = string, exclusion_scope = string }))` | `[]` | no |
+| maintenance\_recurrence | Frequency of the recurring maintenance window in RFC5545 format. | `string` | `""` | no |
 | maintenance\_start\_time | Time window specified for daily or recurring maintenance operations in RFC3339 format | `string` | `"05:00"` | no |
 | master\_authorized\_networks | List of master authorized networks. If none are provided, disallow external access (except the cluster node IPs, which GKE automatically whitelists). | `list(object({ cidr_block = string, display_name = string }))` | `[]` | no |
 | monitoring\_service | The monitoring service that the cluster should write metrics to. Automatically send metrics from pods in the cluster to the Google Cloud Monitoring API. VM metrics will be collected by Google Compute Engine regardless of this setting Available options include monitoring.googleapis.com, monitoring.googleapis.com/kubernetes (beta) and none | `string` | `"monitoring.googleapis.com/kubernetes"` | no |

diff --git a/autogen/main/cluster.tf.tmpl b/autogen/main/cluster.tf.tmpl
@@ -234,16 +234,14 @@ resource "google_container_cluster" "primary" {
 
   datapath_provider = var.datapath_provider
 
-  {% if beta_cluster %}
   networking_mode = "VPC_NATIVE"
-  {% endif %}
+
   ip_allocation_policy {
     cluster_secondary_range_name  = var.ip_range_pods
     services_secondary_range_name = var.ip_range_services
   }
 
   maintenance_policy {
-  {% if beta_cluster %}
     dynamic "recurring_window" {
       for_each = local.cluster_maintenance_window_is_recurring
       content {
@@ -253,31 +251,28 @@ resource "google_container_cluster" "primary" {
       }
     }
 
-    dynamic "daily_maintenance_window" {
-      for_each = local.cluster_maintenance_window_is_daily
-      content {
-        start_time = var.maintenance_start_time
-      }
-    }
-
-  {% else %}
-    daily_maintenance_window {
-      start_time = var.maintenance_start_time
-    }
-  {% endif %}
-
     dynamic "maintenance_exclusion" {
       for_each = var.maintenance_exclusions
       content {
         exclusion_name = maintenance_exclusion.value.name
         start_time     = maintenance_exclusion.value.start_time
         end_time       = maintenance_exclusion.value.end_time
 
-        exclusion_options {
-          scope = maintenance_exclusion.value.exclusion_options == null ? "NO_UPGRADES" : maintenance_exclusion.value.exclusion_options
+        dynamic "exclusion_options" {
+          for_each = maintenance_exclusion.value["scope"] == null ? [] : [maintenance_exclusion.value["scope"]]
+          content {
+            scope = exclusion_options.value
+          }
         }
       }
     }
+
+    dynamic "daily_maintenance_window" {
+      for_each = local.cluster_maintenance_window_is_daily
+      content {
+        start_time = var.maintenance_start_time
+      }
+    }
   }
 
   {% if autopilot_cluster != true %}

diff --git a/autogen/main/main.tf.tmpl b/autogen/main/main.tf.tmpl
@@ -213,10 +213,8 @@ locals {
   # /BETA features
 {% endif %}
 
-{% if beta_cluster %}
   cluster_maintenance_window_is_recurring = var.maintenance_recurrence != "" && var.maintenance_end_time != "" ? [1] : []
   cluster_maintenance_window_is_daily     = length(local.cluster_maintenance_window_is_recurring) > 0 ? [] : [1]
-{% endif %}
 }
 
 /******************************************

diff --git a/autogen/main/variables.tf.tmpl b/autogen/main/variables.tf.tmpl
@@ -114,7 +114,6 @@ variable "maintenance_exclusions" {
   default = []
 }
 
-{% if beta_cluster %}
 variable "maintenance_end_time" {
   type        = string
   description = "Time window specified for recurring maintenance operations in RFC3339 format"
@@ -126,7 +125,6 @@ variable "maintenance_recurrence" {
   description = "Frequency of the recurring maintenance window in RFC5545 format."
   default     = ""
 }
-{% endif %}
 
 variable "ip_range_pods" {
   type        = string

diff --git a/cluster.tf b/cluster.tf
@@ -118,14 +118,21 @@ resource "google_container_cluster" "primary" {
 
   datapath_provider = var.datapath_provider
 
+  networking_mode = "VPC_NATIVE"
+
   ip_allocation_policy {
     cluster_secondary_range_name  = var.ip_range_pods
     services_secondary_range_name = var.ip_range_services
   }
 
   maintenance_policy {
-    daily_maintenance_window {
-      start_time = var.maintenance_start_time
+    dynamic "recurring_window" {
+      for_each = local.cluster_maintenance_window_is_recurring
+      content {
+        start_time = var.maintenance_start_time
+        end_time   = var.maintenance_end_time
+        recurrence = var.maintenance_recurrence
+      }
     }
 
     dynamic "maintenance_exclusion" {
@@ -135,11 +142,21 @@ resource "google_container_cluster" "primary" {
         start_time     = maintenance_exclusion.value.start_time
         end_time       = maintenance_exclusion.value.end_time
 
-        exclusion_options {
-          scope = maintenance_exclusion.value.exclusion_options == null ? "NO_UPGRADES" : maintenance_exclusion.value.exclusion_options
+        dynamic "exclusion_options" {
+          for_each = maintenance_exclusion.value["scope"] == null ? [] : [maintenance_exclusion.value["scope"]]
+          content {
+            scope = exclusion_options.value
+          }
         }
       }
     }
+
+    dynamic "daily_maintenance_window" {
+      for_each = local.cluster_maintenance_window_is_daily
+      content {
+        start_time = var.maintenance_start_time
+      }
+    }
   }
 
   lifecycle {

diff --git a/main.tf b/main.tf
@@ -143,6 +143,8 @@ locals {
     workload_pool = "${var.project_id}.svc.id.goog" }] : [{ workload_pool = var.identity_namespace
   }]
 
+  cluster_maintenance_window_is_recurring = var.maintenance_recurrence != "" && var.maintenance_end_time != "" ? [1] : []
+  cluster_maintenance_window_is_daily     = length(local.cluster_maintenance_window_is_recurring) > 0 ? [] : [1]
 }
 
 /******************************************

diff --git a/modules/beta-autopilot-private-cluster/cluster.tf b/modules/beta-autopilot-private-cluster/cluster.tf
@@ -92,6 +92,7 @@ resource "google_container_cluster" "primary" {
   datapath_provider = var.datapath_provider
 
   networking_mode = "VPC_NATIVE"
+
   ip_allocation_policy {
     cluster_secondary_range_name  = var.ip_range_pods
     services_secondary_range_name = var.ip_range_services
@@ -107,26 +108,28 @@ resource "google_container_cluster" "primary" {
       }
     }
 
-    dynamic "daily_maintenance_window" {
-      for_each = local.cluster_maintenance_window_is_daily
-      content {
-        start_time = var.maintenance_start_time
-      }
-    }
-
-
     dynamic "maintenance_exclusion" {
       for_each = var.maintenance_exclusions
       content {
         exclusion_name = maintenance_exclusion.value.name
         start_time     = maintenance_exclusion.value.start_time
         end_time       = maintenance_exclusion.value.end_time
 
-        exclusion_options {
-          scope = maintenance_exclusion.value.exclusion_options == null ? "NO_UPGRADES" : maintenance_exclusion.value.exclusion_options
+        dynamic "exclusion_options" {
+          for_each = maintenance_exclusion.value["scope"] == null ? [] : [maintenance_exclusion.value["scope"]]
+          content {
+            scope = exclusion_options.value
+          }
         }
       }
     }
+
+    dynamic "daily_maintenance_window" {
+      for_each = local.cluster_maintenance_window_is_daily
+      content {
+        start_time = var.maintenance_start_time
+      }
+    }
   }
 
 

diff --git a/modules/beta-autopilot-public-cluster/cluster.tf b/modules/beta-autopilot-public-cluster/cluster.tf
@@ -92,6 +92,7 @@ resource "google_container_cluster" "primary" {
   datapath_provider = var.datapath_provider
 
   networking_mode = "VPC_NATIVE"
+
   ip_allocation_policy {
     cluster_secondary_range_name  = var.ip_range_pods
     services_secondary_range_name = var.ip_range_services
@@ -107,26 +108,28 @@ resource "google_container_cluster" "primary" {
       }
     }
 
-    dynamic "daily_maintenance_window" {
-      for_each = local.cluster_maintenance_window_is_daily
-      content {
-        start_time = var.maintenance_start_time
-      }
-    }
-
-
     dynamic "maintenance_exclusion" {
       for_each = var.maintenance_exclusions
       content {
         exclusion_name = maintenance_exclusion.value.name
         start_time     = maintenance_exclusion.value.start_time
         end_time       = maintenance_exclusion.value.end_time
 
-        exclusion_options {
-          scope = maintenance_exclusion.value.exclusion_options == null ? "NO_UPGRADES" : maintenance_exclusion.value.exclusion_options
+        dynamic "exclusion_options" {
+          for_each = maintenance_exclusion.value["scope"] == null ? [] : [maintenance_exclusion.value["scope"]]
+          content {
+            scope = exclusion_options.value
+          }
         }
       }
     }
+
+    dynamic "daily_maintenance_window" {
+      for_each = local.cluster_maintenance_window_is_daily
+      content {
+        start_time = var.maintenance_start_time
+      }
+    }
   }
 
 

diff --git a/modules/beta-private-cluster-update-variant/cluster.tf b/modules/beta-private-cluster-update-variant/cluster.tf
@@ -203,6 +203,7 @@ resource "google_container_cluster" "primary" {
   datapath_provider = var.datapath_provider
 
   networking_mode = "VPC_NATIVE"
+
   ip_allocation_policy {
     cluster_secondary_range_name  = var.ip_range_pods
     services_secondary_range_name = var.ip_range_services
@@ -218,26 +219,28 @@ resource "google_container_cluster" "primary" {
       }
     }
 
-    dynamic "daily_maintenance_window" {
-      for_each = local.cluster_maintenance_window_is_daily
-      content {
-        start_time = var.maintenance_start_time
-      }
-    }
-
-
     dynamic "maintenance_exclusion" {
       for_each = var.maintenance_exclusions
       content {
         exclusion_name = maintenance_exclusion.value.name
         start_time     = maintenance_exclusion.value.start_time
         end_time       = maintenance_exclusion.value.end_time
 
-        exclusion_options {
-          scope = maintenance_exclusion.value.exclusion_options == null ? "NO_UPGRADES" : maintenance_exclusion.value.exclusion_options
+        dynamic "exclusion_options" {
+          for_each = maintenance_exclusion.value["scope"] == null ? [] : [maintenance_exclusion.value["scope"]]
+          content {
+            scope = exclusion_options.value
+          }
         }
       }
     }
+
+    dynamic "daily_maintenance_window" {
+      for_each = local.cluster_maintenance_window_is_daily
+      content {
+        start_time = var.maintenance_start_time
+      }
+    }
   }
 
   lifecycle {

diff --git a/modules/beta-private-cluster/cluster.tf b/modules/beta-private-cluster/cluster.tf
@@ -203,6 +203,7 @@ resource "google_container_cluster" "primary" {
   datapath_provider = var.datapath_provider
 
   networking_mode = "VPC_NATIVE"
+
   ip_allocation_policy {
     cluster_secondary_range_name  = var.ip_range_pods
     services_secondary_range_name = var.ip_range_services
@@ -218,26 +219,28 @@ resource "google_container_cluster" "primary" {
       }
     }
 
-    dynamic "daily_maintenance_window" {
-      for_each = local.cluster_maintenance_window_is_daily
-      content {
-        start_time = var.maintenance_start_time
-      }
-    }
-
-
     dynamic "maintenance_exclusion" {
       for_each = var.maintenance_exclusions
       content {
         exclusion_name = maintenance_exclusion.value.name
         start_time     = maintenance_exclusion.value.start_time
         end_time       = maintenance_exclusion.value.end_time
 
-        exclusion_options {
-          scope = maintenance_exclusion.value.exclusion_options == null ? "NO_UPGRADES" : maintenance_exclusion.value.exclusion_options
+        dynamic "exclusion_options" {
+          for_each = maintenance_exclusion.value["scope"] == null ? [] : [maintenance_exclusion.value["scope"]]
+          content {
+            scope = exclusion_options.value
+          }
         }
       }
     }
+
+    dynamic "daily_maintenance_window" {
+      for_each = local.cluster_maintenance_window_is_daily
+      content {
+        start_time = var.maintenance_start_time
+      }
+    }
   }
 
   lifecycle {

diff --git a/modules/beta-public-cluster-update-variant/cluster.tf b/modules/beta-public-cluster-update-variant/cluster.tf
@@ -203,6 +203,7 @@ resource "google_container_cluster" "primary" {
   datapath_provider = var.datapath_provider
 
   networking_mode = "VPC_NATIVE"
+
   ip_allocation_policy {
     cluster_secondary_range_name  = var.ip_range_pods
     services_secondary_range_name = var.ip_range_services
@@ -218,26 +219,28 @@ resource "google_container_cluster" "primary" {
       }
     }
 
-    dynamic "daily_maintenance_window" {
-      for_each = local.cluster_maintenance_window_is_daily
-      content {
-        start_time = var.maintenance_start_time
-      }
-    }
-
-
     dynamic "maintenance_exclusion" {
       for_each = var.maintenance_exclusions
       content {
         exclusion_name = maintenance_exclusion.value.name
         start_time     = maintenance_exclusion.value.start_time
         end_time       = maintenance_exclusion.value.end_time
 
-        exclusion_options {
-          scope = maintenance_exclusion.value.exclusion_options == null ? "NO_UPGRADES" : maintenance_exclusion.value.exclusion_options
+        dynamic "exclusion_options" {
+          for_each = maintenance_exclusion.value["scope"] == null ? [] : [maintenance_exclusion.value["scope"]]
+          content {
+            scope = exclusion_options.value
+          }
         }
       }
     }
+
+    dynamic "daily_maintenance_window" {
+      for_each = local.cluster_maintenance_window_is_daily
+      content {
+        start_time = var.maintenance_start_time
+      }
+    }
   }
 
   lifecycle {