update ubuntu base image (#73)

* update ubuntu base image * update ci images * update base k8s version * replace COS with containerd * make COS_CONTAINERD as default * updates to ci [SKIP CI] * Update terraform/variables.tf [SKIP CI] Co-authored-by: Daniel Hoherd <[email protected]> --------- Co-authored-by: Daniel Hoherd <[email protected]>
astronomer · Jun 20, 2023 · 125d212 · 125d212
1 parent 755ae87
commit 125d212
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 14 deletions.
diff --git 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
 
@@ -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
 
@@ -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:

diff --git 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"
   description = "The kubernetes version to use in GKE"
 }
 
@@ -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"
   }
 }
@@ -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"
 }
 
@@ -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"
 }
 
@@ -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"
 }