Improve instructions

interuss · Jan 19, 2023 · 4470768 · 4470768
1 parent 4c1fafa
commit 4470768
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/deploy/infrastructure/dependencies/terraform-commons-dss/default_latest.tf b/deploy/infrastructure/dependencies/terraform-commons-dss/default_latest.tf
@@ -1,5 +1,5 @@
 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
-  latest = var.image == "latest" ? "docker.io/interuss/dss:v0.6.0" : var.image
+  image = var.image == "latest" ? "docker.io/interuss/dss:v0.6.0" : var.image
 }
diff --git a/deploy/infrastructure/dependencies/terraform-commons-dss/main.tf b/deploy/infrastructure/dependencies/terraform-commons-dss/main.tf
@@ -14,7 +14,7 @@ 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      = var.image
+    VAR_DOCKER_IMAGE_NAME      = local.image
     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 : ""

diff --git a/deploy/infrastructure/modules/terraform-google-dss/terraform.dev.example.tfvars b/deploy/infrastructure/modules/terraform-google-dss/terraform.dev.example.tfvars
@@ -1,10 +1,11 @@
 # This file is an example, please adapt it to your configuration.
-# See terraform.example.tfvars for full set of variables and related descriptions.
+# See TFVARS.md for full set of variables and related descriptions.
 
 # Google account
 google_project_name = "interuss-deploy-example"
 google_zone         = "europe-west6-a"
 
+
 # DNS
 google_dns_managed_zone_name = "interuss-example-com"
 app_hostname                 = "dss.interuss.example.com"

diff --git a/deploy/infrastructure/utils/variables.py b/deploy/infrastructure/utils/variables.py
@@ -178,7 +178,7 @@ def get_tfvars_md_content(
 
     if has_internal_vars:
         content += f"## Internal variables\n\n"
-        content += f"This module uses dedicated variables, see [{INTERNAL_VARIABLES_FILENAME}](./{INTERNAL_VARIABLES_FILENAME}) for details"
+        content += f"This module requires additional variables, see [{INTERNAL_VARIABLES_FILENAME}](./{INTERNAL_VARIABLES_FILENAME}) for details"
 
     return content