Merge pull request #174 from smarunich/1.5.x-backport

backport fixes

Author: smarunich

infra/gcp/main.tf

@@ -16,14 +16,14 @@ resource "google_project" "tsb" {
   labels = {
     name        = "${var.name_prefix}_project"
     environment = "${var.name_prefix}_tsb"
-    owner       = "${var.tsb_image_sync_username}"
+    owner       = replace(var.tsb_image_sync_username, "/\\W+/", "-")
   }
 }
 
 module "gcp_base" {
   source      = "../../modules/gcp/base"
   count       = var.gcp_k8s_region == null ? 0 : 1
-  owner       = "${var.tsb_image_sync_username}"
+  owner       = replace(var.tsb_image_sync_username, "/\\W+/", "-")
   name_prefix = "${var.name_prefix}-${var.cluster_id}"
   project_id  = var.gcp_project_id == null ? google_project.tsb[0].project_id : var.gcp_project_id
   region      = var.gcp_k8s_region
@@ -35,7 +35,7 @@ module "gcp_base" {
 module "gcp_jumpbox" {
   source                    = "../../modules/gcp/jumpbox"
   count                     = var.gcp_k8s_region == null ? 0 : 1
-  owner                     = "${var.tsb_image_sync_username}"
+  owner       = replace(var.tsb_image_sync_username, "/\\W+/", "-")
   name_prefix               = "${var.name_prefix}-${var.cluster_id}"
   region                    = var.gcp_k8s_region
   project_id                = var.gcp_project_id == null ? google_project.tsb[0].project_id : var.gcp_project_id
@@ -53,7 +53,7 @@ module "gcp_jumpbox" {
 module "gcp_k8s" {
   source       = "../../modules/gcp/k8s"
   count        = var.gcp_k8s_region == null ? 0 : 1
-  owner        = "${var.tsb_image_sync_username}"
+  owner       = replace(var.tsb_image_sync_username, "/\\W+/", "-")
   name_prefix  = "${var.name_prefix}-${var.cluster_id}"
   cluster_name = var.cluster_name == null ? "gke-${var.gcp_k8s_region}-${var.name_prefix}" : var.cluster_name
   project_id   = var.gcp_project_id == null ? google_project.tsb[0].project_id : var.gcp_project_id

modules/gcp/k8s/main.tf

@@ -61,6 +61,9 @@ module "gke_auth" {
   cluster_name         = google_container_cluster.tsb.name
   location             = var.region
   use_private_endpoint = false
+  depends_on = [
+    google_project_service.container
+  ]
 }
 
 resource "local_file" "kubeconfig" {