From 0dc214b8d64da62c3d7058e892b054e3e11f3eff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vin=C3=ADcius=20Miguel?=
 <36349314+vrmiguel@users.noreply.github.com>
Date: Tue, 10 Sep 2024 14:17:07 -0300
Subject: [PATCH] controller: allow optional fields in ImagePerPgVersion

---
 tembo-operator/Cargo.lock      |  2 +-
 tembo-operator/Cargo.toml      |  2 +-
 tembo-operator/src/defaults.rs | 14 +++++++-------
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/tembo-operator/Cargo.lock b/tembo-operator/Cargo.lock
index 2e5845059..786613cab 100644
--- a/tembo-operator/Cargo.lock
+++ b/tembo-operator/Cargo.lock
@@ -503,7 +503,7 @@ dependencies = [
 
 [[package]]
 name = "controller"
-version = "0.49.9"
+version = "0.49.10"
 dependencies = [
  "actix-web",
  "anyhow",
diff --git a/tembo-operator/Cargo.toml b/tembo-operator/Cargo.toml
index 61581448e..2bdd5d61c 100644
--- a/tembo-operator/Cargo.toml
+++ b/tembo-operator/Cargo.toml
@@ -1,7 +1,7 @@
 [package]
 name = "controller"
 description = "Tembo Operator for Postgres"
-version = "0.49.9"
+version = "0.49.10"
 edition = "2021"
 default-run = "controller"
 license = "Apache-2.0"
diff --git a/tembo-operator/src/defaults.rs b/tembo-operator/src/defaults.rs
index 9e804bdc2..f2d235e01 100644
--- a/tembo-operator/src/defaults.rs
+++ b/tembo-operator/src/defaults.rs
@@ -19,11 +19,11 @@ use utoipa::ToSchema;
 #[derive(Clone, Debug, Default, Serialize, Deserialize, JsonSchema, PartialEq, ToSchema)]
 pub struct ImagePerPgVersion {
     #[serde(rename = "14")]
-    pub pg14: String,
+    pub pg14: Option<String>,
     #[serde(rename = "15")]
-    pub pg15: String,
+    pub pg15: Option<String>,
     #[serde(rename = "16")]
-    pub pg16: String,
+    pub pg16: Option<String>,
 }
 
 pub fn default_replicas() -> i32 {
@@ -67,16 +67,16 @@ pub fn default_repository() -> String {
 
 pub fn default_images() -> ImagePerPgVersion {
     ImagePerPgVersion {
-        pg14: "standard-cnpg:14-a0a5ab5".to_string(),
-        pg15: "standard-cnpg:15-a0a5ab5".to_string(),
-        pg16: "standard-cnpg:16-a0a5ab5".to_string(),
+        pg14: Some("standard-cnpg:14-a0a5ab5".to_string()),
+        pg15: Some("standard-cnpg:15-a0a5ab5".to_string()),
+        pg16: Some("standard-cnpg:16-a0a5ab5".to_string()),
     }
 }
 
 pub fn default_image_uri() -> String {
     let repo = default_repository();
     let image = default_images();
-    let image_for_pg_15 = image.pg15;
+    let image_for_pg_15 = image.pg15.expect("Expected default image to support Pg 15");
     format!("{}/{}", repo, image_for_pg_15)
 }