Merge pull request #36 from MaterializeInc/default_to_not_overriding_orchestratord_version

alex-hunt-materialize · web-flow · commit 7d3973a910f3 · 2025-03-27T11:54:49.000Z
Do not override orchestratord version by default.
diff --git a/examples/aws/main.tf b/examples/aws/main.tf
@@ -6,9 +6,9 @@ locals {
       }
     }
     operator = {
-      image = {
+      image = var.orchestratord_version == null ? {} : {
         tag = var.orchestratord_version
-      }
+      },
       cloudProvider = {
         type   = "aws"
         region = data.aws_region.current.name
diff --git a/examples/aws/variables.tf b/examples/aws/variables.tf
@@ -41,7 +41,7 @@ variable "helm_values" {
 variable "orchestratord_version" {
   description = "Version of the Materialize orchestrator to install"
   type        = string
-  default     = "v0.138.0"
+  default     = null
 }
 
 variable "operator_namespace" {
diff --git a/examples/gcp/main.tf b/examples/gcp/main.tf
@@ -50,9 +50,9 @@ module "operator" {
   operator_namespace = var.operator_namespace
 
   helm_values = {
-    image = {
+    image = var.orchestratord_version == null ? {} : {
       tag = var.orchestratord_version
-    }
+    },
     observability = {
       podMetrics = {
         enabled = true
diff --git a/examples/gcp/variables.tf b/examples/gcp/variables.tf
@@ -19,7 +19,7 @@ variable "region" {
 variable "orchestratord_version" {
   description = "Version of the Materialize orchestrator to install"
   type        = string
-  default     = "v0.138.0"
+  default     = null
 }
 
 variable "instance_configs" {

Original file line number	Diff line number	Diff line change
`@@ -6,9 +6,9 @@ locals {`
`6`	`6`	`}`
`7`	`7`	`}`
`8`	`8`	`operator = {`
`9`		`- image = {`
	`9`	`+ image = var.orchestratord_version == null ? {} : {`
`10`	`10`	`tag = var.orchestratord_version`
`11`		`- }`
	`11`	`+ },`
`12`	`12`	`cloudProvider = {`
`13`	`13`	`type = "aws"`
`14`	`14`	`region = data.aws_region.current.name`
Original file line number	Diff line number	Diff line change
`@@ -41,7 +41,7 @@ variable "helm_values" {`
`41`	`41`	`variable "orchestratord_version" {`
`42`	`42`	`description = "Version of the Materialize orchestrator to install"`
`43`	`43`	`type = string`
`44`		`- default = "v0.138.0"`
	`44`	`+ default = null`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`variable "operator_namespace" {`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ variable "region" {`
`19`	`19`	`variable "orchestratord_version" {`
`20`	`20`	`description = "Version of the Materialize orchestrator to install"`
`21`	`21`	`type = string`
`22`		`- default = "v0.138.0"`
	`22`	`+ default = null`
`23`	`23`	`}`
`24`	`24`
`25`	`25`	`variable "instance_configs" {`