From bf83e89205afe3c126f8971f14e3c870906b6aa9 Mon Sep 17 00:00:00 2001 From: Fernando Rubbo Date: Wed, 11 Sep 2019 08:53:52 -0300 Subject: [PATCH 01/22] 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/22] 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/22] 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/22] 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/22] 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 b5036789baff68e09e2d922eae1c86c968caf589 Mon Sep 17 00:00:00 2001 From: kkouttane Date: Thu, 12 Dec 2024 09:33:34 +0000 Subject: [PATCH 06/22] Update project IDs and buckets --- environments/dev/terraform.tfvars | 2 +- environments/prod/terraform.tfvars | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/environments/dev/terraform.tfvars b/environments/dev/terraform.tfvars index cb8a5a1bbc..85a4374dd2 100644 --- a/environments/dev/terraform.tfvars +++ b/environments/dev/terraform.tfvars @@ -1 +1 @@ -project="PROJECT_ID" \ No newline at end of file +project="gleaming-mason-444507-t9" diff --git a/environments/prod/terraform.tfvars b/environments/prod/terraform.tfvars index cb8a5a1bbc..85a4374dd2 100644 --- a/environments/prod/terraform.tfvars +++ b/environments/prod/terraform.tfvars @@ -1 +1 @@ -project="PROJECT_ID" \ No newline at end of file +project="gleaming-mason-444507-t9" From b673ec6d7764e7283a5f77ca7ca965d607b3cd9d Mon Sep 17 00:00:00 2001 From: KOUTTANE KHALID <85079472+khalidkouttane@users.noreply.github.com> Date: Thu, 12 Dec 2024 10:56:35 +0100 Subject: [PATCH 07/22] Correction de la cible de pare-feu http --- modules/firewall/main.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/firewall/main.tf b/modules/firewall/main.tf index 5e40f7089f..1d2e549134 100644 --- a/modules/firewall/main.tf +++ b/modules/firewall/main.tf @@ -27,6 +27,6 @@ resource "google_compute_firewall" "allow-http" { ports = ["80"] } - target_tags = ["http-server2"] + target_tags = ["http-server"] source_ranges = ["0.0.0.0/0"] } From 1542c738e275c13427d5735b0fa18aa9b1fac768 Mon Sep 17 00:00:00 2001 From: KOUTTANE KHALID <85079472+khalidkouttane@users.noreply.github.com> Date: Thu, 12 Dec 2024 11:09:52 +0100 Subject: [PATCH 08/22] Update cloudbuild.yaml --- cloudbuild.yaml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 2bca928879..415aaf6311 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -11,8 +11,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. - - +options: + logging: CLOUD_LOGGING_ONLY steps: - id: 'branch name' name: 'alpine' From 4f0280f01a08d7c506799e4d4943e8202716016c Mon Sep 17 00:00:00 2001 From: KOUTTANE KHALID <85079472+khalidkouttane@users.noreply.github.com> Date: Thu, 12 Dec 2024 11:14:31 +0100 Subject: [PATCH 09/22] Update cloudbuild.yaml --- cloudbuild.yaml | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index 415aaf6311..c7feb8c367 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -11,8 +11,6 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. -options: - logging: CLOUD_LOGGING_ONLY steps: - id: 'branch name' name: 'alpine' @@ -89,4 +87,9 @@ steps: echo "Branch '$BRANCH_NAME' does not represent an official environment." echo "*******************************************************************************" fi -# [END tf-apply] + +options: + logging: CLOUD_LOGGING_ONLY +# [END tf-apply] + + From f35b5528bd3152634c7d2fd6de0e6b50327c320b Mon Sep 17 00:00:00 2001 From: KOUTTANE KHALID <85079472+khalidkouttane@users.noreply.github.com> Date: Thu, 12 Dec 2024 11:15:39 +0100 Subject: [PATCH 10/22] Update cloudbuild.yaml --- cloudbuild.yaml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/cloudbuild.yaml b/cloudbuild.yaml index c7feb8c367..901a8a8a07 100644 --- a/cloudbuild.yaml +++ b/cloudbuild.yaml @@ -11,6 +11,8 @@ # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. # See the License for the specific language governing permissions and # limitations under the License. +options: + logging: CLOUD_LOGGING_ONLY steps: - id: 'branch name' name: 'alpine' @@ -87,9 +89,6 @@ steps: echo "Branch '$BRANCH_NAME' does not represent an official environment." echo "*******************************************************************************" fi - -options: - logging: CLOUD_LOGGING_ONLY # [END tf-apply] From 73c0f4b74fcff7e21f2b9e115716ce9cc69bc13f Mon Sep 17 00:00:00 2001 From: KOUTTANE KHALID <85079472+khalidkouttane@users.noreply.github.com> Date: Thu, 12 Dec 2024 11:37:21 +0100 Subject: [PATCH 11/22] Update backend.tf --- environments/dev/backend.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environments/dev/backend.tf b/environments/dev/backend.tf index 33a807a336..81369de30c 100644 --- a/environments/dev/backend.tf +++ b/environments/dev/backend.tf @@ -15,7 +15,7 @@ terraform { backend "gcs" { - bucket = "PROJECT_ID-tfstate" + bucket = "gleaming-mason-444507-t9" prefix = "env/dev" } } From c7d8de3bc6abe201c3ee90dff2e86f8a2f6c5254 Mon Sep 17 00:00:00 2001 From: KOUTTANE KHALID <85079472+khalidkouttane@users.noreply.github.com> Date: Thu, 12 Dec 2024 11:38:21 +0100 Subject: [PATCH 12/22] Update backend.tf --- environments/prod/backend.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environments/prod/backend.tf b/environments/prod/backend.tf index 7ed343b1a2..34f5afc3ca 100644 --- a/environments/prod/backend.tf +++ b/environments/prod/backend.tf @@ -15,7 +15,7 @@ terraform { backend "gcs" { - bucket = "PROJECT_ID-tfstate" + bucket = "gleaming-mason-444507-t9" prefix = "env/prod" } } From 32902703a0e6c1b28f1edb517064f0a6d5e093ee Mon Sep 17 00:00:00 2001 From: KOUTTANE KHALID <85079472+khalidkouttane@users.noreply.github.com> Date: Thu, 12 Dec 2024 11:38:51 +0100 Subject: [PATCH 13/22] Update backend.tf --- environments/prod/backend.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environments/prod/backend.tf b/environments/prod/backend.tf index 7ed343b1a2..34f5afc3ca 100644 --- a/environments/prod/backend.tf +++ b/environments/prod/backend.tf @@ -15,7 +15,7 @@ terraform { backend "gcs" { - bucket = "PROJECT_ID-tfstate" + bucket = "gleaming-mason-444507-t9" prefix = "env/prod" } } From f55439b943d12f0d425f5bce181bb9da1dfa0574 Mon Sep 17 00:00:00 2001 From: KOUTTANE KHALID <85079472+khalidkouttane@users.noreply.github.com> Date: Thu, 12 Dec 2024 11:39:08 +0100 Subject: [PATCH 14/22] Update backend.tf --- environments/dev/backend.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environments/dev/backend.tf b/environments/dev/backend.tf index 33a807a336..81369de30c 100644 --- a/environments/dev/backend.tf +++ b/environments/dev/backend.tf @@ -15,7 +15,7 @@ terraform { backend "gcs" { - bucket = "PROJECT_ID-tfstate" + bucket = "gleaming-mason-444507-t9" prefix = "env/dev" } } From 38b9a80c90e6d5499486ac6655289d0e6995cb0f Mon Sep 17 00:00:00 2001 From: KOUTTANE KHALID <85079472+khalidkouttane@users.noreply.github.com> Date: Thu, 12 Dec 2024 11:41:04 +0100 Subject: [PATCH 15/22] Update backend.tf --- environments/dev/backend.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environments/dev/backend.tf b/environments/dev/backend.tf index 81369de30c..a9d38570a7 100644 --- a/environments/dev/backend.tf +++ b/environments/dev/backend.tf @@ -15,7 +15,7 @@ terraform { backend "gcs" { - bucket = "gleaming-mason-444507-t9" + bucket = " gleaming-mason-444507-t9-tfstate" prefix = "env/dev" } } From 51cfa2fb3698c6a423c6700cc13831161978f521 Mon Sep 17 00:00:00 2001 From: KOUTTANE KHALID <85079472+khalidkouttane@users.noreply.github.com> Date: Thu, 12 Dec 2024 11:41:23 +0100 Subject: [PATCH 16/22] Update backend.tf --- environments/prod/backend.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environments/prod/backend.tf b/environments/prod/backend.tf index 34f5afc3ca..7a3c593921 100644 --- a/environments/prod/backend.tf +++ b/environments/prod/backend.tf @@ -15,7 +15,7 @@ terraform { backend "gcs" { - bucket = "gleaming-mason-444507-t9" + bucket = " gleaming-mason-444507-t9-tfstate" prefix = "env/prod" } } From c43ade0647224741dcd44ff79f58471e9302a313 Mon Sep 17 00:00:00 2001 From: KOUTTANE KHALID <85079472+khalidkouttane@users.noreply.github.com> Date: Thu, 12 Dec 2024 11:41:41 +0100 Subject: [PATCH 17/22] Update backend.tf --- environments/prod/backend.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environments/prod/backend.tf b/environments/prod/backend.tf index 34f5afc3ca..7a3c593921 100644 --- a/environments/prod/backend.tf +++ b/environments/prod/backend.tf @@ -15,7 +15,7 @@ terraform { backend "gcs" { - bucket = "gleaming-mason-444507-t9" + bucket = " gleaming-mason-444507-t9-tfstate" prefix = "env/prod" } } From 663d894c1e514512b90ee90197161dda21430351 Mon Sep 17 00:00:00 2001 From: KOUTTANE KHALID <85079472+khalidkouttane@users.noreply.github.com> Date: Thu, 12 Dec 2024 11:41:58 +0100 Subject: [PATCH 18/22] Update backend.tf --- environments/dev/backend.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environments/dev/backend.tf b/environments/dev/backend.tf index 81369de30c..a9d38570a7 100644 --- a/environments/dev/backend.tf +++ b/environments/dev/backend.tf @@ -15,7 +15,7 @@ terraform { backend "gcs" { - bucket = "gleaming-mason-444507-t9" + bucket = " gleaming-mason-444507-t9-tfstate" prefix = "env/dev" } } From 0c55121f26f8569fcab2102c9b3676524e1e04eb Mon Sep 17 00:00:00 2001 From: KOUTTANE KHALID <85079472+khalidkouttane@users.noreply.github.com> Date: Thu, 12 Dec 2024 17:43:43 +0100 Subject: [PATCH 19/22] Update backend.tf --- environments/dev/backend.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environments/dev/backend.tf b/environments/dev/backend.tf index a9d38570a7..4e79dbbfdf 100644 --- a/environments/dev/backend.tf +++ b/environments/dev/backend.tf @@ -15,7 +15,7 @@ terraform { backend "gcs" { - bucket = " gleaming-mason-444507-t9-tfstate" + bucket = "gleaming-mason-444507-t9-tfstate" prefix = "env/dev" } } From 7afd3716e3d816187cb9b723f71bb623b3905931 Mon Sep 17 00:00:00 2001 From: KOUTTANE KHALID <85079472+khalidkouttane@users.noreply.github.com> Date: Thu, 12 Dec 2024 17:44:00 +0100 Subject: [PATCH 20/22] Update backend.tf --- environments/prod/backend.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environments/prod/backend.tf b/environments/prod/backend.tf index 7a3c593921..2eb5421af7 100644 --- a/environments/prod/backend.tf +++ b/environments/prod/backend.tf @@ -15,7 +15,7 @@ terraform { backend "gcs" { - bucket = " gleaming-mason-444507-t9-tfstate" + bucket = "gleaming-mason-444507-t9-tfstate" prefix = "env/prod" } } From bcdc3881d7d9c421213a998a12093410b33c1751 Mon Sep 17 00:00:00 2001 From: KOUTTANE KHALID <85079472+khalidkouttane@users.noreply.github.com> Date: Thu, 12 Dec 2024 17:44:35 +0100 Subject: [PATCH 21/22] Update backend.tf --- environments/prod/backend.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environments/prod/backend.tf b/environments/prod/backend.tf index 7a3c593921..2eb5421af7 100644 --- a/environments/prod/backend.tf +++ b/environments/prod/backend.tf @@ -15,7 +15,7 @@ terraform { backend "gcs" { - bucket = " gleaming-mason-444507-t9-tfstate" + bucket = "gleaming-mason-444507-t9-tfstate" prefix = "env/prod" } } From 2a2c781871921b4af600f3f4f070a9ed98b971d7 Mon Sep 17 00:00:00 2001 From: KOUTTANE KHALID <85079472+khalidkouttane@users.noreply.github.com> Date: Thu, 12 Dec 2024 17:44:49 +0100 Subject: [PATCH 22/22] Update backend.tf --- environments/dev/backend.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/environments/dev/backend.tf b/environments/dev/backend.tf index a9d38570a7..4e79dbbfdf 100644 --- a/environments/dev/backend.tf +++ b/environments/dev/backend.tf @@ -15,7 +15,7 @@ terraform { backend "gcs" { - bucket = " gleaming-mason-444507-t9-tfstate" + bucket = "gleaming-mason-444507-t9-tfstate" prefix = "env/dev" } }