From 018792190a9033639b29b932a35683e6689d4c74 Mon Sep 17 00:00:00 2001 From: pgvishnuram Date: Tue, 20 Jun 2023 13:34:55 +0530 Subject: [PATCH 1/7] update ubuntu base image --- terraform/variables.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/variables.tf b/terraform/variables.tf index 1734d2d..91c23ad 100644 --- a/terraform/variables.tf +++ b/terraform/variables.tf @@ -74,7 +74,7 @@ variable "bastion_image_family" { description = "The Name & Project of the Image Family with which Bastion will be created." default = { - name = "ubuntu-1804-lts" + name = "ubuntu-2204-lts" project = "ubuntu-os-cloud" } } From d73149f330ffe760e3098f1514bcb541dc031a6e Mon Sep 17 00:00:00 2001 From: pgvishnuram Date: Tue, 20 Jun 2023 13:37:32 +0530 Subject: [PATCH 2/7] update ci images --- .circleci/config.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 4ab7e0e..c14c132 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,12 +7,12 @@ orbs: executors: pre-commit-executor: docker: - - image: quay.io/astronomer/ci-pre-commit:2022-08 + - image: quay.io/astronomer/ci-pre-commit:2023-06 environment: TFENV_AUTO_INSTALL: true terraform-executor: docker: - - image: quay.io/astronomer/ci-terraform:2022-08 + - image: quay.io/astronomer/ci-terraform:2023-06 environment: TFENV_AUTO_INSTALL: true From c8ed047b9fc4d70622e84d8162add76dd98e5bea Mon Sep 17 00:00:00 2001 From: pgvishnuram Date: Tue, 20 Jun 2023 14:13:03 +0530 Subject: [PATCH 3/7] update base k8s version --- terraform/variables.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/variables.tf b/terraform/variables.tf index 91c23ad..b3a3d7b 100644 --- a/terraform/variables.tf +++ b/terraform/variables.tf @@ -9,7 +9,7 @@ variable "dns_managed_zone" { } variable "kube_version_gke" { - default = "1.22.17-gke.1400" # 1.23 will drop the ability to create COS node-pools + default = "1.24.12-gke.500" # 1.23 will drop the ability to create COS node-pools description = "The kubernetes version to use in GKE" } From 80b6fb045cbf24c31cd709d39d3a449525fd9348 Mon Sep 17 00:00:00 2001 From: pgvishnuram Date: Tue, 20 Jun 2023 15:31:56 +0530 Subject: [PATCH 4/7] replace COS with containerd --- .circleci/config.yml | 4 ++-- terraform/variables.tf | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c14c132..c6684f2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -71,12 +71,12 @@ jobs: - run: name: Run Terraform Apply command: | - DEPLOYMENT_ID=ci$(echo "${CIRCLE_PROJECT_REPONAME}${CIRCLE_WORKFLOW_ID}" | md5sum | awk '{print substr($1,0,5)}') + DEPLOYMENT_ID=ci$(echo "${CIRCLE_PROJECT_REPONAME}${CIRCLE_SHA1}" | md5sum | awk '{print substr($1,0,5)}') make init apply-auto-approve PROJECT_ID=<< parameters.project_id >> REGION=<< parameters.region >> DEPLOYMENT_ID=$DEPLOYMENT_ID ZONAL=<< parameters.zonal >> TF_STATE_BUCKET=<< parameters.tf_state_bucket >> - run: name: Run Terraform Destroy command: | - DEPLOYMENT_ID=ci$(echo "${CIRCLE_PROJECT_REPONAME}${CIRCLE_WORKFLOW_ID}" | md5sum | awk '{print substr($1,0,5)}') + DEPLOYMENT_ID=ci$(echo "${CIRCLE_PROJECT_REPONAME}${CIRCLE_SHA1}" | md5sum | awk '{print substr($1,0,5)}') make init destroy-auto-approve PROJECT_ID=<< parameters.project_id >> REGION=<< parameters.region >> DEPLOYMENT_ID=$DEPLOYMENT_ID ZONAL=<< parameters.zonal >> TF_STATE_BUCKET=<< parameters.tf_state_bucket >> when: on_fail diff --git a/terraform/variables.tf b/terraform/variables.tf index b3a3d7b..768c2ce 100644 --- a/terraform/variables.tf +++ b/terraform/variables.tf @@ -289,7 +289,7 @@ variable "enable_gvisor_blue" { variable "image_type_green_mt" { type = string - default = "COS" + default = "COS_CONTAINERD" description = "Base OS image. COS or COS_CONTAINERD" } From 5ef2695821d2a559677600b44bb01e0ee1ebb7c6 Mon Sep 17 00:00:00 2001 From: pgvishnuram Date: Tue, 20 Jun 2023 16:49:59 +0530 Subject: [PATCH 5/7] make COS_CONTAINERD as default --- terraform/variables.tf | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/terraform/variables.tf b/terraform/variables.tf index 768c2ce..b906dc1 100644 --- a/terraform/variables.tf +++ b/terraform/variables.tf @@ -152,7 +152,7 @@ variable "db_max_connections" { variable "image_type_blue_platform" { type = string - default = "COS" + default = "COS_CONTAINERD" description = "Base OS image. COS or COS_CONTAINERD" } @@ -196,7 +196,7 @@ variable "platform_node_pool_taints_blue" { variable "image_type_green_platform" { type = string - default = "COS" + default = "COS_CONTAINERD" description = "Base OS image. COS or COS_CONTAINERD" } @@ -241,7 +241,7 @@ variable "platform_node_pool_taints_green" { variable "image_type_blue_mt" { type = string - default = "COS" + default = "COS_CONTAINERD" description = "Base OS image. COS or COS_CONTAINERD" } @@ -337,7 +337,7 @@ variable "enable_gvisor_green" { variable "image_type_dynamic" { type = string - default = "COS" + default = "COS_CONTAINERD" description = "Base OS image. COS or COS_CONTAINERD" } @@ -385,7 +385,7 @@ variable "machine_type_dynamic" { variable "image_type_dynamic_blue" { type = string - default = "COS" + default = "COS_CONTAINERD" description = "Base OS image. COS or COS_CONTAINERD" } @@ -439,7 +439,7 @@ variable "enable_gvisor_dynamic_blue" { variable "image_type_dynamic_green" { type = string - default = "COS" + default = "COS_CONTAINERD" description = "Base OS image. COS or COS_CONTAINERD" } From 191e2fe7584be34b45db8757331aae4e425b52dd Mon Sep 17 00:00:00 2001 From: pgvishnuram Date: Tue, 20 Jun 2023 17:49:47 +0530 Subject: [PATCH 6/7] updates to ci [SKIP CI] --- .circleci/config.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index c6684f2..4bc991e 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -104,7 +104,7 @@ jobs: - run: name: Run Terraform Destroy command: | - DEPLOYMENT_ID=ci$(echo "${CIRCLE_PROJECT_REPONAME}${CIRCLE_WORKFLOW_ID}" | md5sum | awk '{print substr($1,0,5)}') + DEPLOYMENT_ID=ci$(echo "${CIRCLE_PROJECT_REPONAME}${CIRCLE_SHA1}" | md5sum | awk '{print substr($1,0,5)}') make init destroy-auto-approve PROJECT_ID=<< parameters.project_id >> REGION=<< parameters.region >> DEPLOYMENT_ID=$DEPLOYMENT_ID ZONAL=<< parameters.zonal >> TF_STATE_BUCKET=<< parameters.tf_state_bucket >> commands: From 4373895d2d612933ca45d5b3d75cec133d956343 Mon Sep 17 00:00:00 2001 From: pgvishnuram <81585115+pgvishnuram@users.noreply.github.com> Date: Tue, 20 Jun 2023 19:07:05 +0530 Subject: [PATCH 7/7] Update terraform/variables.tf [SKIP CI] Co-authored-by: Daniel Hoherd --- terraform/variables.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/terraform/variables.tf b/terraform/variables.tf index b906dc1..ec1f0b1 100644 --- a/terraform/variables.tf +++ b/terraform/variables.tf @@ -9,7 +9,7 @@ variable "dns_managed_zone" { } variable "kube_version_gke" { - default = "1.24.12-gke.500" # 1.23 will drop the ability to create COS node-pools + default = "1.24.12-gke.500" description = "The kubernetes version to use in GKE" }