From bf83e89205afe3c126f8971f14e3c870906b6aa9 Mon Sep 17 00:00:00 2001 From: Fernando Rubbo Date: Wed, 11 Sep 2019 08:53:52 -0300 Subject: [PATCH 01/10] Update README.md --- README.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 9f4d6e4a64..d44cdb1cc6 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,8 @@ -# Configuring your **dev** environment +# Managing infrastructure as code with Terraform, Cloud Build, and GitOps + +This is the repo for the [Managing infrastructure as code with Terraform, Cloud Build, and GitOps](https://cloud.google.com/solutions/managing-infrastructure-as-code) tutorial. This tutorial explains how to manage infrastructure as code with Terraform and Cloud Build using the popular GitOps methodology. + +## Configuring your **dev** environment Just for demostration, this step will: 1. Configure an apache2 http server on network '**dev**' and subnet '**dev**-subnet-01' @@ -12,7 +16,7 @@ terraform apply terraform destroy ``` -# Promoting your environment to **production** +## Promoting your environment to **production** Once you have tested your app (in this example an apache2 http server), you can promote your configuration to prodution. This step will: 1. Configure an apache2 http server on network '**prod**' and subnet '**prod**-subnet-01' From e6bcec81715f52a9a9c7f547926fe4a05c102268 Mon Sep 17 00:00:00 2001 From: fernandorubbo Date: Thu, 10 Jun 2021 14:25:56 +0000 Subject: [PATCH 02/10] Moving to terraform 1.0.0 --- cloudbuild.yaml | 6 +++--- environments/dev/main.tf | 2 +- environments/dev/versions.tf | 2 +- environments/prod/main.tf | 2 +- environments/prod/versions.tf | 2 +- modules/firewall/versions.tf | 2 +- modules/http_server/versions.tf | 2 +- modules/vpc/main.tf | 2 +- modules/vpc/versions.tf | 2 +- 9 files changed, 11 insertions(+), 11 deletions(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 84f5365cec..a2e241289d 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -25,7 +25,7 @@ steps: echo "***********************" - id: 'tf init' - name: 'hashicorp/terraform:0.11.14' + name: 'hashicorp/terraform:1.0.0' entrypoint: 'sh' args: - '-c' @@ -50,7 +50,7 @@ steps: # [START tf-plan] - id: 'tf plan' - name: 'hashicorp/terraform:0.11.14' + name: 'hashicorp/terraform:1.0.0' entrypoint: 'sh' args: - '-c' @@ -76,7 +76,7 @@ steps: # [START tf-apply] - id: 'tf apply' - name: 'hashicorp/terraform:0.11.14' + name: 'hashicorp/terraform:1.0.0' entrypoint: 'sh' args: - '-c' diff --git a/environments/dev/main.tf b/environments/dev/main.tf index a77cb88e91..a28b76be75 100644 --- a/environments/dev/main.tf +++ b/environments/dev/main.tf @@ -14,7 +14,7 @@ locals { - "env" = "dev" + env = "dev" } provider "google" { diff --git a/environments/dev/versions.tf b/environments/dev/versions.tf index aecd2473e3..4cc81b29fa 100644 --- a/environments/dev/versions.tf +++ b/environments/dev/versions.tf @@ -14,5 +14,5 @@ terraform { - required_version = "~> 0.11.0" + required_version = "~> 1.0.0" } diff --git a/environments/prod/main.tf b/environments/prod/main.tf index 642fe67ba2..0c7726235e 100644 --- a/environments/prod/main.tf +++ b/environments/prod/main.tf @@ -14,7 +14,7 @@ locals { - "env" = "prod" + env = "prod" } provider "google" { diff --git a/environments/prod/versions.tf b/environments/prod/versions.tf index aecd2473e3..4cc81b29fa 100644 --- a/environments/prod/versions.tf +++ b/environments/prod/versions.tf @@ -14,5 +14,5 @@ terraform { - required_version = "~> 0.11.0" + required_version = "~> 1.0.0" } diff --git a/modules/firewall/versions.tf b/modules/firewall/versions.tf index aecd2473e3..4cc81b29fa 100644 --- a/modules/firewall/versions.tf +++ b/modules/firewall/versions.tf @@ -14,5 +14,5 @@ terraform { - required_version = "~> 0.11.0" + required_version = "~> 1.0.0" } diff --git a/modules/http_server/versions.tf b/modules/http_server/versions.tf index aecd2473e3..4cc81b29fa 100644 --- a/modules/http_server/versions.tf +++ b/modules/http_server/versions.tf @@ -14,5 +14,5 @@ terraform { - required_version = "~> 0.11.0" + required_version = "~> 1.0.0" } diff --git a/modules/vpc/main.tf b/modules/vpc/main.tf index 36b08f5b43..8fce4ab20d 100644 --- a/modules/vpc/main.tf +++ b/modules/vpc/main.tf @@ -15,7 +15,7 @@ module "vpc" { source = "terraform-google-modules/network/google" - version = "0.6.0" + version = "3.3.0" project_id = "${var.project}" network_name = "${var.env}" diff --git a/modules/vpc/versions.tf b/modules/vpc/versions.tf index aecd2473e3..4cc81b29fa 100644 --- a/modules/vpc/versions.tf +++ b/modules/vpc/versions.tf @@ -14,5 +14,5 @@ terraform { - required_version = "~> 0.11.0" + required_version = "~> 1.0.0" } From d8fc5e5d71ab526a46a7ae31ca642175c488fe3f Mon Sep 17 00:00:00 2001 From: nardo-google Date: Tue, 27 Sep 2022 14:59:31 +0200 Subject: [PATCH 03/10] Update main.tf debian-9 not available anymore. not sure if there's an option in terraform to say "take latest image". So I picket 11. --- modules/http_server/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/http_server/main.tf b/modules/http_server/main.tf index 6f05187f34..e790ce329e 100644 --- a/modules/http_server/main.tf +++ b/modules/http_server/main.tf @@ -27,7 +27,7 @@ resource "google_compute_instance" "http_server" { boot_disk { initialize_params { - image = "debian-cloud/debian-9" + image = "debian-cloud/debian-11" } } From 552f3b97c06a3600913880c5599b7bac345ae4a6 Mon Sep 17 00:00:00 2001 From: nardo-google Date: Tue, 27 Sep 2022 23:13:16 +0200 Subject: [PATCH 04/10] Update cloudbuild.yaml fixed typo: oficial -> official --- cloudbuild.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index a2e241289d..ca83a0086e 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -86,7 +86,7 @@ steps: terraform apply -auto-approve else echo "***************************** SKIPPING APPLYING *******************************" - echo "Branch '$BRANCH_NAME' does not represent an oficial environment." + echo "Branch '$BRANCH_NAME' does not represent an official environment." echo "*******************************************************************************" fi # [END tf-apply] From 31923ef0e60f5d5bebcde22bced9acc65ea5d09c Mon Sep 17 00:00:00 2001 From: Mark Chandler <141208723+mc-k1@users.noreply.github.com> Date: Fri, 2 Feb 2024 15:47:14 +1100 Subject: [PATCH 05/10] Fix typo in cloudbuild.yaml TERRAFORM was spelt incorrectly. --- cloudbuild.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index ca83a0086e..2bca928879 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -65,7 +65,7 @@ steps: env=${dir%*/} env=${env#*/} echo "" - echo "*************** TERRAFOM PLAN ******************" + echo "*************** TERRAFORM PLAN ******************" echo "******* At environment: ${env} ********" echo "*************************************************" terraform plan || exit 1 From 804b508a2a9182308b1692aa717b4dd63497b6f8 Mon Sep 17 00:00:00 2001 From: monsut568 Date: Mon, 15 Jul 2024 13:45:20 +0000 Subject: [PATCH 06/10] Update project IDs and buckets --- environments/dev/backend.tf | 2 +- environments/dev/terraform.tfvars | 2 +- environments/prod/backend.tf | 2 +- environments/prod/terraform.tfvars | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/environments/dev/backend.tf b/environments/dev/backend.tf index 33a807a336..ba2d1737e2 100644 --- a/environments/dev/backend.tf +++ b/environments/dev/backend.tf @@ -15,7 +15,7 @@ terraform { backend "gcs" { - bucket = "PROJECT_ID-tfstate" + bucket = "terraform-test1-429512-tfstate" prefix = "env/dev" } } diff --git a/environments/dev/terraform.tfvars b/environments/dev/terraform.tfvars index cb8a5a1bbc..15a102d731 100644 --- a/environments/dev/terraform.tfvars +++ b/environments/dev/terraform.tfvars @@ -1 +1 @@ -project="PROJECT_ID" \ No newline at end of file +project="terraform-test1-429512" \ No newline at end of file diff --git a/environments/prod/backend.tf b/environments/prod/backend.tf index 7ed343b1a2..7b5a29976a 100644 --- a/environments/prod/backend.tf +++ b/environments/prod/backend.tf @@ -15,7 +15,7 @@ terraform { backend "gcs" { - bucket = "PROJECT_ID-tfstate" + bucket = "terraform-test1-429512-tfstate" prefix = "env/prod" } } diff --git a/environments/prod/terraform.tfvars b/environments/prod/terraform.tfvars index cb8a5a1bbc..15a102d731 100644 --- a/environments/prod/terraform.tfvars +++ b/environments/prod/terraform.tfvars @@ -1 +1 @@ -project="PROJECT_ID" \ No newline at end of file +project="terraform-test1-429512" \ No newline at end of file From 1dc873ab3dd06c2b990bdf0f61d4df0e66af4304 Mon Sep 17 00:00:00 2001 From: "kouma.nakashima" Date: Mon, 15 Jul 2024 22:57:48 +0900 Subject: [PATCH 07/10] Update versions.tf --- environments/dev/versions.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environments/dev/versions.tf b/environments/dev/versions.tf index 4cc81b29fa..d13db1e7e0 100644 --- a/environments/dev/versions.tf +++ b/environments/dev/versions.tf @@ -14,5 +14,5 @@ terraform { - required_version = "~> 1.0.0" + required_version = "~> 1.5.7" } From 23b4636945122502fc673ef8c70c03cf0c0da3b8 Mon Sep 17 00:00:00 2001 From: "kouma.nakashima" Date: Mon, 15 Jul 2024 23:04:13 +0900 Subject: [PATCH 08/10] Update versions.tf --- environments/dev/versions.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environments/dev/versions.tf b/environments/dev/versions.tf index d13db1e7e0..4cc81b29fa 100644 --- a/environments/dev/versions.tf +++ b/environments/dev/versions.tf @@ -14,5 +14,5 @@ terraform { - required_version = "~> 1.5.7" + required_version = "~> 1.0.0" } From 877ddfd5cc77dccfac53a683de3ca9cbfe474574 Mon Sep 17 00:00:00 2001 From: "kouma.nakashima" Date: Mon, 15 Jul 2024 23:05:13 +0900 Subject: [PATCH 09/10] Update cloudbuild.yaml --- cloudbuild.yaml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 2bca928879..f57a062133 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -90,3 +90,9 @@ steps: echo "*******************************************************************************" fi # [END tf-apply] + +steps: + - name: gcr.io/cloud-builders/gsutil + args: ["-m", "rsync", "-r", "-c", "-d", ".", "gs://terraform-test1-429512-tfstate"] +options: + logging: CLOUD_LOGGING_ONLY From 6fb28e4a9947d85473c4e13c7d30324e03312a59 Mon Sep 17 00:00:00 2001 From: "kouma.nakashima" Date: Mon, 15 Jul 2024 23:13:47 +0900 Subject: [PATCH 10/10] Update cloudbuild.yaml --- cloudbuild.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index f57a062133..d7b3842758 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -91,8 +91,7 @@ steps: fi # [END tf-apply] -steps: - - name: gcr.io/cloud-builders/gsutil - args: ["-m", "rsync", "-r", "-c", "-d", ".", "gs://terraform-test1-429512-tfstate"] +- name: gcr.io/cloud-builders/gsutil + args: ["-m", "rsync", "-r", "-c", "-d", ".", "gs://terraform-test1-429512-tfstate"] options: logging: CLOUD_LOGGING_ONLY