Fix issue with GKE cluster notifications topic, change pubsub module …

…output to static.
GoogleCloudPlatform · Mar 2, 2023 · fb64054 · fb64054
1 parent a5fd32e
commit fb64054
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/modules/gke-cluster/main.tf b/modules/gke-cluster/main.tf
@@ -406,9 +406,10 @@ resource "google_compute_network_peering_routes_config" "gke_master" {
 
 resource "google_pubsub_topic" "notifications" {
   count = (
-    try(var.enable_features.upgrade_notifications.topic_id, null) == null ? 0 : 1
+    try(var.enable_features.upgrade_notifications.topic_id, null) == null ? 1 : 0
   )
-  name = "gke-pubsub-notifications"
+  project = var.project_id
+  name    = "gke-pubsub-notifications"
   labels = {
     content = "gke-notifications"
   }

diff --git a/modules/pubsub/main.tf b/modules/pubsub/main.tf
@@ -33,6 +33,7 @@ locals {
       options = try(v.options, v, null) == null ? var.defaults : v.options
     }
   }
+  topic_id_static = "projects/${var.project_id}/topics/${var.name}"
 }
 
 resource "google_pubsub_schema" "default" {

diff --git a/modules/pubsub/outputs.tf b/modules/pubsub/outputs.tf
@@ -16,8 +16,9 @@
 
 output "id" {
   description = "Topic id."
-  value       = google_pubsub_topic.default.id
+  value       = local.topic_id_static
   depends_on = [
+    google_pubsub_topic.default,
     google_pubsub_topic_iam_binding.default
   ]
 }