terraform: allow image to be empty (#2595)

* make image optional in the high level modules * align azure variable description * set defaults in convenience modules Signed-off-by: Moritz Sanft <[email protected]> --------- Signed-off-by: Moritz Sanft <[email protected]> Co-authored-by: Adrian Stobbe <[email protected]>
edgelesssys · Nov 13, 2023 · 8f2f8bd · 8f2f8bd
1 parent 8e4feb7
commit 8f2f8bd
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 5 deletions.
diff --git a/.github/actions/upload_terraform_module/action.yml b/.github/actions/upload_terraform_module/action.yml
@@ -18,7 +18,11 @@ runs:
     - name: Stamp version
       shell: bash
       run: |
-        sed -i "s/@@CONSTELLATION_VERSION@@/${{ inputs.version }}/g" terraform-module/constellation-cluster/variables.tf
+        sed -i "s/@@CONSTELLATION_VERSION@@/${{ inputs.version }}/g" \
+          terraform-module/constellation-cluster/variables.tf \
+          terraform-module/aws-constellation/variables.tf \
+          terraform-module/azure-constellation/variables.tf \
+          terraform-module/gcp-constellation/variables.tf
 
     - name: Zip terraform dir
       shell: bash

diff --git a/terraform/aws-constellation/variables.tf b/terraform/aws-constellation/variables.tf
@@ -5,7 +5,8 @@ variable "name" {
 
 variable "image" {
   type        = string
-  description = "Node image reference or semantic release version."
+  description = "Node image reference or semantic release version. When not set, the latest default version will be used."
+  default     = "@@CONSTELLATION_VERSION@@"
 }
 
 variable "microservice_version" {

diff --git a/terraform/azure-constellation/variables.tf b/terraform/azure-constellation/variables.tf
@@ -5,7 +5,8 @@ variable "name" {
 
 variable "image" {
   type        = string
-  description = "Node image reference or semantical release version."
+  description = "Node image reference or semantic release version. When not set, the latest default version will be used."
+  default     = "@@CONSTELLATION_VERSION@@"
 }
 
 variable "microservice_version" {

diff --git a/terraform/constellation-cluster/variables.tf b/terraform/constellation-cluster/variables.tf
@@ -7,7 +7,6 @@ variable "constellation_version" {
 variable "image" {
   type        = string
   description = "The node image reference or semantic release version."
-  default     = "@@CONSTELLATION_VERSION@@"
 }
 
 variable "csp" {

diff --git a/terraform/gcp-constellation/variables.tf b/terraform/gcp-constellation/variables.tf
@@ -15,7 +15,8 @@ variable "service_account_id" {
 
 variable "image" {
   type        = string
-  description = "Node image reference or semantic release version."
+  description = "Node image reference or semantic release version. When not set, the latest default version will be used."
+  default     = "@@CONSTELLATION_VERSION@@"
 }
 
 variable "microservice_version" {