[terraform] Explicitly set CRDB version in terraform examples and tooling

deploy/infrastructure/dependencies/terraform-commons-dss/default_latest.tf

@@ -1,5 +1,4 @@
 locals {
   rid_db_schema = var.desired_rid_db_version == "latest" ? "4.0.0" : var.desired_rid_db_version
   scd_db_schema = var.desired_scd_db_version == "latest" ? "3.1.0" : var.desired_scd_db_version
-  image         = var.image
 }

deploy/infrastructure/dependencies/terraform-commons-dss/helm.tf

@@ -8,6 +8,9 @@ resource "local_file" "helm_chart_values" {
   filename = "${local.workspace_location}/helm_values.yml"
   content = yamlencode({
     cockroachdb = {
+      image = {
+        tag = var.crdb_image_tag
+      }
       fullnameOverride = local.helm_crdb_statefulset_name
 
       conf = {
@@ -50,7 +53,7 @@ resource "local_file" "helm_chart_values" {
     }
 
     dss = {
-      image = local.image
+      image = var.image
 
       conf = {
         pubKeys = [

deploy/infrastructure/dependencies/terraform-commons-dss/tanka.tf

@@ -10,7 +10,8 @@ resource "local_file" "tanka_config_main" {
     VAR_INGRESS_NAME             = var.ip_gateway
     VAR_CRDB_EXTERNAL_NODES      = join(",", [for a in var.crdb_external_nodes : "'${a}'"])
     VAR_STORAGE_CLASS            = var.kubernetes_storage_class
-    VAR_DOCKER_IMAGE_NAME        = local.image
+    VAR_DOCKER_IMAGE_NAME        = var.image
+    VAR_CRDB_DOCKER_IMAGE_NAME   = "cockroachdb/cockroach:${var.crdb_image_tag}"
     VAR_APP_HOSTNAME             = var.app_hostname
     VAR_PUBLIC_KEY_PEM_PATH      = var.authorization.public_key_pem_path != null ? var.authorization.public_key_pem_path : ""
     VAR_JWKS_ENDPOINT            = var.authorization.jwks != null ? var.authorization.jwks.endpoint : ""

deploy/infrastructure/dependencies/terraform-commons-dss/templates/main.jsonnet.tmp

@@ -13,6 +13,7 @@ local metadata = metadataBase {
   single_cluster: false,
   enableScd: ${VAR_ENABLE_SCD}, // <-- This boolean value is VAR_ENABLE_SCD
   cockroach+: {
+    image: '${VAR_CRDB_DOCKER_IMAGE_NAME}',
     hostnameSuffix: '${VAR_CRDB_HOSTNAME_SUFFIX}',
     locality: '${VAR_CRDB_LOCALITY}',
     nodeIPs: [${VAR_CRDB_NODE_IPS}],

deploy/infrastructure/dependencies/terraform-commons-dss/variables.gen.tf

@@ -160,6 +160,18 @@ variable "desired_scd_db_version" {
   default = "latest"
 }
 
+variable "crdb_image_tag" {
+  type        = string
+  description = <<-EOT
+    Version tag of the CockroachDB image.
+    Until v.16, the recommended CockroachDB version is v21.2.7.
+    From v.17, the recommended CockroachDB version is v24.1.3.
+
+    Example: v24.1.3
+  EOT
+}
+
+
 variable "crdb_cluster_name" {
   type        = string
   description = <<-EOT

deploy/infrastructure/modules/terraform-aws-dss/TFVARS.gen.md

@@ -237,6 +237,17 @@ Use `latest` to use the latest schema version.
 Example: `3.1.0`
 
 
+### crdb_image_tag
+
+*Type: `string`*
+
+Version tag of the CockroachDB image.
+Until v.16, the recommended CockroachDB version is v21.2.7.
+From v.17, the recommended CockroachDB version is v24.1.3.
+
+Example: v24.1.3
+
+
 ### crdb_cluster_name
 
 *Type: `string`*

deploy/infrastructure/modules/terraform-aws-dss/main.tf

@@ -20,6 +20,7 @@ module "terraform-commons-dss" {
   kubernetes_namespace           = var.kubernetes_namespace
   kubernetes_storage_class       = var.aws_kubernetes_storage_class
   app_hostname                   = var.app_hostname
+  crdb_image_tag                 = var.crdb_image_tag
   crdb_cluster_name              = var.crdb_cluster_name
   crdb_hostname_suffix           = var.crdb_hostname_suffix
   should_init                    = var.should_init

deploy/infrastructure/modules/terraform-aws-dss/terraform.dev.example.tfvars

@@ -26,6 +26,7 @@ authorization = {
 should_init = true
 
 # CockroachDB
+crdb_image_tag      = "v21.2.7"
 crdb_cluster_name   = "interuss_example"
 crdb_locality       = "interuss_dss-aws-ew1"
 crdb_external_nodes = []

deploy/infrastructure/modules/terraform-aws-dss/variables.gen.tf

@@ -255,6 +255,18 @@ variable "desired_scd_db_version" {
   default = "latest"
 }
 
+variable "crdb_image_tag" {
+  type        = string
+  description = <<-EOT
+    Version tag of the CockroachDB image.
+    Until v.16, the recommended CockroachDB version is v21.2.7.
+    From v.17, the recommended CockroachDB version is v24.1.3.
+
+    Example: v24.1.3
+  EOT
+}
+
+
 variable "crdb_cluster_name" {
   type        = string
   description = <<-EOT

deploy/infrastructure/modules/terraform-google-dss/TFVARS.gen.md

@@ -229,6 +229,17 @@ Use `latest` to use the latest schema version.
 Example: `3.1.0`
 
 
+### crdb_image_tag
+
+*Type: `string`*
+
+Version tag of the CockroachDB image.
+Until v.16, the recommended CockroachDB version is v21.2.7.
+From v.17, the recommended CockroachDB version is v24.1.3.
+
+Example: v24.1.3
+
+
 ### crdb_cluster_name
 
 *Type: `string`*

deploy/infrastructure/modules/terraform-google-dss/main.tf

@@ -19,6 +19,7 @@ module "terraform-commons-dss" {
   kubernetes_namespace           = var.kubernetes_namespace
   kubernetes_storage_class       = var.google_kubernetes_storage_class
   app_hostname                   = var.app_hostname
+  crdb_image_tag                 = var.crdb_image_tag
   crdb_cluster_name              = var.crdb_cluster_name
   crdb_hostname_suffix           = var.crdb_hostname_suffix
   should_init                    = var.should_init

deploy/infrastructure/modules/terraform-google-dss/terraform.dev.example.tfvars

@@ -27,6 +27,7 @@ authorization = {
 should_init = true
 
 # CockroachDB
+crdb_image_tag      = "v21.2.7"
 crdb_cluster_name   = "interuss_example"
 crdb_locality       = "interuss_dss-dev-w6a"
 crdb_external_nodes = []

deploy/infrastructure/modules/terraform-google-dss/variables.gen.tf

@@ -244,6 +244,18 @@ variable "desired_scd_db_version" {
   default = "latest"
 }
 
+variable "crdb_image_tag" {
+  type        = string
+  description = <<-EOT
+    Version tag of the CockroachDB image.
+    Until v.16, the recommended CockroachDB version is v21.2.7.
+    From v.17, the recommended CockroachDB version is v24.1.3.
+
+    Example: v24.1.3
+  EOT
+}
+
+
 variable "crdb_cluster_name" {
   type        = string
   description = <<-EOT

deploy/infrastructure/utils/variables.py

@@ -34,6 +34,7 @@
     "should_init",
     "desired_rid_db_version",
     "desired_scd_db_version",
+    "crdb_image_tag",
     "crdb_cluster_name",
     "crdb_locality",
     "crdb_external_nodes",

deploy/operations/ci/aws-1/main.tf

@@ -17,6 +17,7 @@ module "terraform-aws-dss" {
   aws_region                   = var.aws_region
   aws_route53_zone_id          = var.aws_route53_zone_id
   cluster_name                 = var.cluster_name
+  crdb_image_tag               = var.crdb_image_tag
   crdb_cluster_name            = var.crdb_cluster_name
   crdb_hostname_suffix         = var.crdb_hostname_suffix
   crdb_locality                = var.crdb_locality

deploy/operations/ci/aws-1/terraform.tfvars

@@ -23,6 +23,7 @@ authorization = {
   public_key_pem_path = "/test-certs/auth2.pem"
 }
 should_init         = true
+crdb_image_tag      = "v21.2.7"
 crdb_cluster_name   = "interuss-ci"
 crdb_locality       = "interuss_dss-ci-aws-ue1"
 crdb_external_nodes = []

deploy/operations/ci/aws-1/variables.gen.tf

@@ -255,6 +255,18 @@ variable "desired_scd_db_version" {
   default = "latest"
 }
 
+variable "crdb_image_tag" {
+  type        = string
+  description = <<-EOT
+    Version tag of the CockroachDB image.
+    Until v.16, the recommended CockroachDB version is v21.2.7.
+    From v.17, the recommended CockroachDB version is v24.1.3.
+
+    Example: v24.1.3
+  EOT
+}
+
+
 variable "crdb_cluster_name" {
   type        = string
   description = <<-EOT