fix bug in runtime chart

pluralsh · Dec 30, 2023 · 37ceb2e · 37ceb2e
1 parent 320a4bf
commit 37ceb2e
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 6 deletions.
diff --git a/charts/runtime/Chart.yaml b/charts/runtime/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: runtime
 description: Sets up the basic dependencies needed to get a network stack running
 type: application
-version: 0.1.5
+version: 0.1.6
 appVersion: "0.1.0"
 dependencies:
 - name: external-dns

diff --git a/charts/runtime/templates/operator-svc.yaml b/charts/runtime/templates/operator-svc.yaml
@@ -3,7 +3,7 @@ kind: Service
 metadata:
   name: plural-operator
   labels:
-{{ include "bootstrap.labels" . | indent 4 }}
+{{ include "runtime.labels" . | indent 4 }}
 spec:
   type: NodePort
   ports:

diff --git a/templates/setup/console.tf b/templates/setup/console.tf
@@ -23,5 +23,5 @@ resource "helm_release" "console" {
     data.local_sensitive_file.console
   ]
 
-  depends_on = [ null_resource.console, module.mgmt.cluster ]
+  depends_on = [ module.mgmt.cluster ]
 }
diff --git a/terraform/clouds/gcp/network.tf b/terraform/clouds/gcp/network.tf
@@ -28,6 +28,7 @@ module "gcp-network" {
 }
 
 resource "google_compute_global_address" "private_ip_alloc" {
+  count         = var.create_db ? 1 : 0
   name          = var.allocated_range
   purpose       = "VPC_PEERING"
   address_type  = "INTERNAL"
@@ -38,7 +39,8 @@ resource "google_compute_global_address" "private_ip_alloc" {
 
 
 resource "google_service_networking_connection" "postgres" {
+  count                   = var.create_db ? 1 : 0
   network                 = module.gcp-network.network_id
   service                 = "servicenetworking.googleapis.com"
-  reserved_peering_ranges = [google_compute_global_address.private_ip_alloc.name]
+  reserved_peering_ranges = [google_compute_global_address.private_ip_alloc[0].name]
 }
diff --git a/terraform/clouds/gcp/postgres.tf b/terraform/clouds/gcp/postgres.tf
@@ -37,7 +37,7 @@ module "pg" {
     private_network               = module.gcp-network.network_id
     psc_enabled                   = false
     require_ssl                   = false
-    allocated_ip_range            = var.allocated_range
+    allocated_ip_range            = google_compute_global_address.private_ip_alloc[0].name
     ssl_mode                      = "ENCRYPTED_ONLY"
   }
 

diff --git a/test/main.tf b/test/main.tf
@@ -2,6 +2,8 @@ module "gcp" {
     source = "../terraform/clouds/gcp"
     project_id = "pluralsh-test-384515"
     cluster_name = "bootstrap-test"
+    network = "plrl-network"
+    subnetwork = "plrl-subnetwork"
     runtime_values_file = "../helm-values/runtime.yaml"
     deletion_protection = false
 }
@@ -31,5 +33,5 @@ resource "helm_release" "console" {
     data.local_sensitive_file.console.content
   ]
 
-  depends_on = [ null_resource.console, module.gcp.cluster ]
+  depends_on = [ module.gcp.cluster ]
 }