Merge pull request #25 from sparkfabrik/task/suffix_split

refs platform/1680: Split random suffix among  postgres and cloud nat

Author: Syphon83

main.tf

@@ -41,7 +41,7 @@ provider "kubernetes" {
 
 locals {
   # Postgres DB Name
-  gitlab_db_name = var.postgresql_db_random_suffix ? "${var.gitlab_db_name}-${random_id.suffix[0].hex}" : var.gitlab_db_name
+  gitlab_db_name = var.postgresql_db_random_suffix ? "${var.gitlab_db_name}-${random_id.postgres_suffix[0].hex}" : var.gitlab_db_name
 
   buckets = [
     "artifacts",
@@ -62,8 +62,8 @@ locals {
   subnet_name_service_cidr = "gitlab-cluster-service-cidr"
 }
 
-resource "random_id" "suffix" {
-  count       = var.postgresql_db_random_suffix ? 2 : 1
+resource "random_id" "postgres_suffix" {
+  count       = var.postgresql_db_random_suffix ? 1 : 0
   byte_length = 4
 }
 
@@ -131,13 +131,17 @@ resource "google_compute_address" "gitlab" {
   count        = var.gitlab_address_name == "" ? 1 : 0
 }
 
+resource "random_id" "cloudnat_suffix" {
+  byte_length = 4
+}
+
 module "cloud_nat" {
   source           = "terraform-google-modules/cloud-nat/google"
   version          = "~> 2.2.0"
   project_id       = var.project_id
   region           = var.region
   router           = format("%s-router", var.project_id)
-  name             = "${var.project_id}-cloud-nat-${random_id.suffix[1].hex}"
+  name             = "${var.project_id}-cloud-nat-${random_id.cloudnat_suffix.hex}"
   network          = google_compute_network.gitlab.self_link
   create_router    = true
   min_ports_per_vm = "2048"