diff --git a/.gitlab-ci/jobs/networking/aws/dependencies/terraform/env/ci/ci.tf b/.gitlab-ci/jobs/networking/aws/dependencies/terraform/env/ci/ci.tf index 292d16415c10259f0efca190f42c003eb0f8eaad..3b8ab4d9ba64d3db34387c68fb233e4472d805d1 100644 --- a/.gitlab-ci/jobs/networking/aws/dependencies/terraform/env/ci/ci.tf +++ b/.gitlab-ci/jobs/networking/aws/dependencies/terraform/env/ci/ci.tf @@ -14,7 +14,7 @@ module "ci" { # Set by CI - "TF_VAR_env=$(echo $CI_COMMIT_REF_SLUG | cut -c 1-7)-$(echo $CI_COMMIT_SHA | cut -c 1-7)" env = var.env # Set by CI - "TF_VAR_ci_pipeline_url=$ci_pipeline_url" - ci_pipeline_url = var.ci_pipeline_url + ci_pipeline_url = var.ci_pipeline_url # Calculated in CI vpc_cidr = var.vpc_cidr diff --git a/.gitlab-ci/jobs/networking/aws/dependencies/terraform/env/ci/variables.tf b/.gitlab-ci/jobs/networking/aws/dependencies/terraform/env/ci/variables.tf index ceff7b2a47bf6305f33e483292739cb7c920ddcb..429085660957d648fe465011bc5c930e8edef823 100644 --- a/.gitlab-ci/jobs/networking/aws/dependencies/terraform/env/ci/variables.tf +++ b/.gitlab-ci/jobs/networking/aws/dependencies/terraform/env/ci/variables.tf @@ -1,3 +1,3 @@ variable "vpc_cidr" {} variable "env" {} -variable "ci_pipeline_url" {} \ No newline at end of file +variable "ci_pipeline_url" {} \ No newline at end of file diff --git a/.gitlab-ci/jobs/networking/aws/dependencies/terraform/main/main.tf b/.gitlab-ci/jobs/networking/aws/dependencies/terraform/main/main.tf index e2599d7bb058b3da3c853c4ee4c461951e285414..d576adf87465a210089aa01f222572b9c495ef6c 100644 --- a/.gitlab-ci/jobs/networking/aws/dependencies/terraform/main/main.tf +++ b/.gitlab-ci/jobs/networking/aws/dependencies/terraform/main/main.tf @@ -27,10 +27,10 @@ locals { name = "umbrella-${var.env}" tags = { - "terraform" = "true", - "env" = var.env, - "project" = "umbrella", - "ci_pipeline_url" = var.ci_pipeline_url + "terraform" = "true", + "env" = var.env, + "project" = "umbrella", + "ci_pipeline_url" = var.ci_pipeline_url } } diff --git a/.gitlab-ci/jobs/rke2/dependencies/terraform/env/ci-airgap/ci-airgap.tf b/.gitlab-ci/jobs/rke2/dependencies/terraform/env/ci-airgap/ci-airgap.tf index d2cfd0022a49e1db51a36ee3cd1c117d93660214..88e812d4e14da45c76753de20f4ecf69d2ecb12e 100644 --- a/.gitlab-ci/jobs/rke2/dependencies/terraform/env/ci-airgap/ci-airgap.tf +++ b/.gitlab-ci/jobs/rke2/dependencies/terraform/env/ci-airgap/ci-airgap.tf @@ -22,10 +22,10 @@ data "terraform_remote_state" "networking" { module "ci" { source = "../../main" - env = var.env - ci_pipeline_url = var.ci_pipeline_url - vpc_id = data.terraform_remote_state.networking.outputs.vpc_id - subnets = data.terraform_remote_state.networking.outputs.intra_subnets + env = var.env + ci_pipeline_url = var.ci_pipeline_url + vpc_id = data.terraform_remote_state.networking.outputs.vpc_id + subnets = data.terraform_remote_state.networking.outputs.intra_subnets download = false server_ami = "ami-00aab2121681e4a31" diff --git a/.gitlab-ci/jobs/rke2/dependencies/terraform/env/ci-airgap/variables.tf b/.gitlab-ci/jobs/rke2/dependencies/terraform/env/ci-airgap/variables.tf index a08cca4124653165b9a1eba2ac36bfe463c61e11..2ae56f77d590b6f00553ed72a2315ad73a81249c 100644 --- a/.gitlab-ci/jobs/rke2/dependencies/terraform/env/ci-airgap/variables.tf +++ b/.gitlab-ci/jobs/rke2/dependencies/terraform/env/ci-airgap/variables.tf @@ -3,4 +3,4 @@ variable "aws_region" { } variable "env" {} -variable "ci_pipeline_url" {} \ No newline at end of file +variable "ci_pipeline_url" {} \ No newline at end of file diff --git a/.gitlab-ci/jobs/rke2/dependencies/terraform/env/ci/ci.tf b/.gitlab-ci/jobs/rke2/dependencies/terraform/env/ci/ci.tf index bc3d092afeab35c4476e38b0cdd2e9cf19a9be9f..fed3a12ec886c8e8391230a72991fe1321fb976b 100644 --- a/.gitlab-ci/jobs/rke2/dependencies/terraform/env/ci/ci.tf +++ b/.gitlab-ci/jobs/rke2/dependencies/terraform/env/ci/ci.tf @@ -23,7 +23,7 @@ module "ci" { source = "../../main" env = var.env - ci_pipeline_url = var.ci_pipeline_url + ci_pipeline_url = var.ci_pipeline_url vpc_id = data.terraform_remote_state.networking.outputs.vpc_id private_subnets = data.terraform_remote_state.networking.outputs.private_subnets public_subnets = data.terraform_remote_state.networking.outputs.public_subnets diff --git a/.gitlab-ci/jobs/rke2/dependencies/terraform/env/ci/variables.tf b/.gitlab-ci/jobs/rke2/dependencies/terraform/env/ci/variables.tf index a08cca4124653165b9a1eba2ac36bfe463c61e11..2ae56f77d590b6f00553ed72a2315ad73a81249c 100644 --- a/.gitlab-ci/jobs/rke2/dependencies/terraform/env/ci/variables.tf +++ b/.gitlab-ci/jobs/rke2/dependencies/terraform/env/ci/variables.tf @@ -3,4 +3,4 @@ variable "aws_region" { } variable "env" {} -variable "ci_pipeline_url" {} \ No newline at end of file +variable "ci_pipeline_url" {} \ No newline at end of file diff --git a/.gitlab-ci/jobs/rke2/dependencies/terraform/main/main.tf b/.gitlab-ci/jobs/rke2/dependencies/terraform/main/main.tf index 755d58168213a2b74f8d115303d06b77b119e59c..ba780e665dee8a546a293fb6bcd8d0ebf4a9bba4 100644 --- a/.gitlab-ci/jobs/rke2/dependencies/terraform/main/main.tf +++ b/.gitlab-ci/jobs/rke2/dependencies/terraform/main/main.tf @@ -2,10 +2,10 @@ locals { name = "umbrella-${var.env}" tags = { - "project" = "umbrella" - "env" = var.env - "terraform" = "true", - "ci_pipeline_url" = var.ci_pipeline_url + "project" = "umbrella" + "env" = var.env + "terraform" = "true", + "ci_pipeline_url" = var.ci_pipeline_url } }