From 3f535e9299d287d7d06437d3dc078229cec548c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vin=C3=ADcius=20Miguel?=
 <36349314+vrmiguel@users.noreply.github.com>
Date: Wed, 21 Aug 2024 15:30:10 -0300
Subject: [PATCH 1/2] operator(apps): don't duplicate `TEMBO_INSTANCE_ID`,
 `TEMBO_ORG_ID`

---
 tembo-operator/src/app_service/manager.rs | 33 ++++++++++++++---------
 1 file changed, 20 insertions(+), 13 deletions(-)

diff --git a/tembo-operator/src/app_service/manager.rs b/tembo-operator/src/app_service/manager.rs
index 63ed9d712..5af50491b 100644
--- a/tembo-operator/src/app_service/manager.rs
+++ b/tembo-operator/src/app_service/manager.rs
@@ -24,7 +24,7 @@ use kube::{
     Client, Resource,
 };
 use lazy_static::lazy_static;
-use std::{collections::BTreeMap, sync::Arc, time::Duration};
+use std::{collections::BTreeMap, ops::Not, sync::Arc, time::Duration};
 
 use crate::{
     app_service::ingress::{generate_ingress_tcp_routes, reconcile_ingress_tcp},
@@ -432,21 +432,28 @@ fn generate_deployment(
         }
     }
 
+    let has_instance_id = env_vars.iter().any(|env| env.name == "TEMBO_INSTANCE_ID");
+    let has_org_id = env_vars.iter().any(|env| env.name == "TEMBO_ORG_ID");
+
     // Check for tembo.io/instance_id and tembo.io/organization_id annotations
-    if let Some(instance_id) = annotations.get("tembo.io/instance_id") {
-        env_vars.push(EnvVar {
-            name: "TEMBO_INSTANCE_ID".to_string(),
-            value: Some(instance_id.clone()),
-            ..EnvVar::default()
-        });
+    if has_instance_id.not() {
+        if let Some(instance_id) = annotations.get("tembo.io/instance_id") {
+            env_vars.push(EnvVar {
+                name: "TEMBO_INSTANCE_ID".to_string(),
+                value: Some(instance_id.clone()),
+                ..EnvVar::default()
+            });
+        }
     }
 
-    if let Some(organization_id) = annotations.get("tembo.io/organization_id") {
-        env_vars.push(EnvVar {
-            name: "TEMBO_ORG_ID".to_string(),
-            value: Some(organization_id.clone()),
-            ..EnvVar::default()
-        });
+    if has_org_id.not() {
+        if let Some(organization_id) = annotations.get("tembo.io/organization_id") {
+            env_vars.push(EnvVar {
+                name: "TEMBO_ORG_ID".to_string(),
+                value: Some(organization_id.clone()),
+                ..EnvVar::default()
+            });
+        }
     }
 
     // Add the pre-loaded forwarded environment variables

From a646aa3951e9ade344ba083c3ffed869e27f5411 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Vin=C3=ADcius=20Miguel?=
 <36349314+vrmiguel@users.noreply.github.com>
Date: Wed, 21 Aug 2024 16:26:52 -0300
Subject: [PATCH 2/2] Add logs

---
 tembo-operator/src/app_service/manager.rs | 4 ++++
 tembo-operator/src/extensions/toggle.rs   | 2 +-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/tembo-operator/src/app_service/manager.rs b/tembo-operator/src/app_service/manager.rs
index 5af50491b..cd227c0a8 100644
--- a/tembo-operator/src/app_service/manager.rs
+++ b/tembo-operator/src/app_service/manager.rs
@@ -444,6 +444,8 @@ fn generate_deployment(
                 ..EnvVar::default()
             });
         }
+    } else {
+        tracing::info!("Not applying TEMBO_INSTANCE_ID to env since it's already present");
     }
 
     if has_org_id.not() {
@@ -454,6 +456,8 @@ fn generate_deployment(
                 ..EnvVar::default()
             });
         }
+    } else {
+        tracing::info!("Not applying TEMBO_ORG_ID to env since it's already present");
     }
 
     // Add the pre-loaded forwarded environment variables
diff --git a/tembo-operator/src/extensions/toggle.rs b/tembo-operator/src/extensions/toggle.rs
index ba6b92887..a9005fb13 100644
--- a/tembo-operator/src/extensions/toggle.rs
+++ b/tembo-operator/src/extensions/toggle.rs
@@ -495,7 +495,7 @@ async fn get_trunk_project_version(
     if let Some(extension_version) = &location_to_toggle.version {
         let maybe_trunk_project = get_trunk_project_metadata_for_version(
             trunk_project_name,
-            trunk::Version::Extension(&extension_version),
+            trunk::Version::Extension(extension_version),
         )
         .await;