From 00dd7233bfb7838db48c4c93e6cbac9d0d47818f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Johannes=20W=C3=BCrbach?= <johannes.wuerbach@googlemail.com>
Date: Thu, 12 Oct 2023 09:52:06 +0200
Subject: [PATCH] fix: add missing dependencies

---
 modules/base/main.tf   | 2 +-
 modules/gke/gsas.tf    | 2 ++
 modules/gke/outputs.tf | 6 ++++++
 3 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/modules/base/main.tf b/modules/base/main.tf
index 37943bd2..d26c60a4 100644
--- a/modules/base/main.tf
+++ b/modules/base/main.tf
@@ -48,7 +48,7 @@ module "k8s" {
 # ######################################################################
 module "res_defs" {
   source           = "../htc_res_defs"
-  k8s_cluster_name = var.gke_cluster_name
+  k8s_cluster_name = module.k8s.cluster_name
   k8s_loadbalancer = module.k8s.loadbalancer
   k8s_region       = var.region
   k8s_project_id   = var.project_id
diff --git a/modules/gke/gsas.tf b/modules/gke/gsas.tf
index 6cb3dc76..92056446 100644
--- a/modules/gke/gsas.tf
+++ b/modules/gke/gsas.tf
@@ -32,4 +32,6 @@ resource "google_project_iam_member" "gke_admin" {
 # https://registry.terraform.io/providers/hashicorp/google/latest/docs/resources/google_service_account_key#private_key
 resource "google_service_account_key" "gke_cluster_access_key" {
   service_account_id = google_service_account.gke_cluster_access.name
+
+  depends_on = [google_project_iam_member.gke_admin]
 }
diff --git a/modules/gke/outputs.tf b/modules/gke/outputs.tf
index a2ade710..05669323 100644
--- a/modules/gke/outputs.tf
+++ b/modules/gke/outputs.tf
@@ -1,5 +1,7 @@
 output "loadbalancer" {
   value = google_compute_address.public_ingress.address
+
+  depends_on = [helm_release.ingress_nginx]
 }
 
 output "project_id" {
@@ -23,6 +25,10 @@ output "credentials" {
   sensitive = true
 }
 
+output "cluster_name" {
+  value = google_container_cluster.gke.name
+}
+
 output "gar_repository_id" {
   value = var.gar_repository_id == null ? "" : google_artifact_registry_repository.repo[0].id
 }