diff --git a/apps/base/customer1/apigateway.yaml b/apps/base/customer1/apigateway.yaml index 437bf85..9c6c73c 100644 --- a/apps/base/customer1/apigateway.yaml +++ b/apps/base/customer1/apigateway.yaml @@ -12,7 +12,7 @@ spec: tls: mode: Terminate options: - networking.gke.io/pre-shared-certs: customer1-n8n-cert + networking.gke.io/pre-shared-certs: devops-lab-cert allowedRoutes: namespaces: from: All diff --git a/modules/gke.tf b/modules/gke.tf index dc34b95..c4d76e4 100644 --- a/modules/gke.tf +++ b/modules/gke.tf @@ -2,6 +2,7 @@ resource "google_container_cluster" "primary" { name = "devops-lab-cluster" location = "us-central1-a" + remove_default_node_pool = true initial_node_count = 1 datapath_provider = "ADVANCED_DATAPATH" diff --git a/modules/nodepool.tf b/modules/nodepool.tf index 1b0a59a..17d05e6 100644 --- a/modules/nodepool.tf +++ b/modules/nodepool.tf @@ -3,21 +3,21 @@ resource "google_container_node_pool" "cluster" { name = "devops-lab-nodepool" location = "us-central1-a" cluster = google_container_cluster.primary.name - + initial_node_count = 1 network_config { pod_range = "pod-ranges" } - initial_node_count = 2 autoscaling { min_node_count = 1 - max_node_count = 16 + max_node_count = 5 } node_config { machine_type = "e2-standard-2" - disk_size_gb = 25 - disk_type = "pd-ssd" + spot = true + disk_size_gb = 20 + disk_type = "pd-standard" oauth_scopes = [ "https://www.googleapis.com/auth/cloud-platform" ] diff --git a/modules/providers.tf b/modules/providers.tf index 4c8d5cc..5e8aea4 100644 --- a/modules/providers.tf +++ b/modules/providers.tf @@ -1,14 +1,14 @@ +data "google_client_config" "default" {} provider "google" { credentials = file("~/.config/gcloud/application_default_credentials.json") project = "devops-lab-cluster" region = "us-central1" # Or your desired region/location } -data "google_client_config" "default" {} provider "helm" { - kubernetes = { + kubernetes { host = "https://${google_container_cluster.primary.endpoint}" token = data.google_client_config.default.access_token cluster_ca_certificate = base64decode(google_container_cluster.primary.master_auth[0].cluster_ca_certificate) @@ -17,7 +17,7 @@ provider "helm" { provider "flux" { kubernetes = { - + host = "https://${google_container_cluster.primary.endpoint}" token = data.google_client_config.default.access_token cluster_ca_certificate = base64decode(google_container_cluster.primary.master_auth[0].cluster_ca_certificate)