fix: rollback customizations made in GoogleCloudPlatform#1566 (GoogleCloudPlatform#1573)

Undo GKE node pool customization.
Undo GKE provisioning in the non autopilot mode.
Apply namespace scope when provisioning kustomize manifests.

Author: minherz

kustomize/cloud-ops-sandbox/base/kustomization.yaml

@@ -21,7 +21,7 @@ locals {
     "cloudprofiler.googleapis.com"
   ]
   memorystore_apis = ["redis.googleapis.com"]
-  cluster_name     = var.enable_autopilot == true ? google_container_cluster.my_autopilot_cluster[0].name : google_container_cluster.my_cluster[0].name
+  cluster_name     = google_container_cluster.my_cluster.name
 }
 
 # Enable Google Cloud APIs
@@ -37,8 +37,7 @@ module "enable_google_apis" {
 }
 
 # Create GKE cluster
-resource "google_container_cluster" "my_autopilot_cluster" {
-  count = var.enable_autopilot == true ? 1 : 0
+resource "google_container_cluster" "my_cluster" {
 
   name     = var.name
   location = var.region
@@ -55,34 +54,6 @@ resource "google_container_cluster" "my_autopilot_cluster" {
   ]
 }
 
-# TODO: merge my_autopilot_cluster and my_cluster resource into one after
-# fixing https://github.com/hashicorp/terraform-provider-google/issues/13857
-resource "google_container_cluster" "my_cluster" {
-  count = var.enable_autopilot == false && var.gke_node_pool != null ? 1 : 0
-
-  name     = var.name
-  location = var.region
-
-  node_pool {
-    node_config {
-      machine_type = var.gke_node_pool.machine_type
-      oauth_scopes = var.gke_node_pool.oauth_scopes
-      labels       = var.gke_node_pool.labels
-    }
-
-    initial_node_count = var.gke_node_pool.initial_node_count
-
-    autoscaling {
-      min_node_count = var.gke_node_pool.autoscaling.min_node_count
-      max_node_count = var.gke_node_pool.autoscaling.max_node_count
-    }
-  }
-
-  depends_on = [
-    module.enable_google_apis
-  ]
-}
-
 # Get credentials for cluster
 module "gcloud" {
   source  = "terraform-google-modules/gcloud/google"
@@ -101,7 +72,7 @@ module "gcloud" {
 resource "null_resource" "apply_deployment" {
   provisioner "local-exec" {
     interpreter = ["bash", "-exc"]
-    command     = "kubectl apply -k ${var.filepath_manifest}"
+    command     = "kubectl apply -k ${var.filepath_manifest} -n ${var.namespace}"
   }
 
   depends_on = [

kustomize/cloud-ops-sandbox/kustomization.yaml

@@ -14,10 +14,10 @@
 
 output "cluster_location" {
   description = "Location of the cluster"
-  value       = var.enable_autopilot == true ? resource.google_container_cluster.my_autopilot_cluster[0].location : resource.google_container_cluster.my_cluster[0].location
+  value       = resource.google_container_cluster.my_cluster.location
 }
 
 output "cluster_name" {
   description = "Name of the cluster"
-  value       = var.name
+  value       = resource.google_container_cluster.my_cluster.name
 }

kustomize/cloud-ops-sandbox/without-loadgenerator/kustomization.yaml

@@ -45,29 +45,3 @@ variable "memorystore" {
   type        = bool
   description = "If true, Online Boutique's in-cluster Redis cache will be replaced with a Google Cloud Memorystore Redis cache"
 }
-
-variable "enable_autopilot" {
-  type        = bool
-  description = "If true, GKE cluster is provisioned in autopilot mode. Provisioning in autopilot mode ignores values set in 'gke_node_pool' variable"
-  default     = true
-}
-
-variable "gke_node_pool" {
-  type = object({
-    machine_type = string
-
-    oauth_scopes = list(string)
-
-    labels = map(string)
-
-    initial_node_count = number
-
-    autoscaling = object({
-      min_node_count = number
-      max_node_count = number
-    })
-  })
-  nullable    = true
-  description = "Defines machine type and size of the default GKE cluster node pool"
-  default     = null
-}