Fix operator setup image selection (#1832)

* Sadly it can't be compile time * Lint * 🤦 * 🤦 🤦
metalbear-co · Aug 22, 2023 · a301ff6 · a301ff6
1 parent 26e653e
commit a301ff6
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/changelog.d/+operator-setup.fixed.md b/changelog.d/+operator-setup.fixed.md
@@ -0,0 +1 @@
+Fix operator setup so `MIRRORD_OPERATOR_IMAGE` will function properly.
diff --git a/mirrord/operator/src/setup.rs b/mirrord/operator/src/setup.rs
@@ -301,13 +301,16 @@ impl OperatorDeployment {
 
         let container = Container {
             name: OPERATOR_NAME.to_owned(),
-            image: match option_env!("MIRRORD_OPERATOR_IMAGE") {
-                Some(image) => Some(image.to_owned()),
-                None => Some(format!(
-                    "ghcr.io/metalbear-co/operator:{}",
-                    env!("CARGO_PKG_VERSION")
-                )),
-            },
+            image: Some(
+                std::env::var("MIRRORD_OPERATOR_IMAGE")
+                    .ok()
+                    .unwrap_or_else(|| {
+                        format!(
+                            "ghcr.io/metalbear-co/operator:{}",
+                            env!("CARGO_PKG_VERSION")
+                        )
+                    }),
+            ),
             image_pull_policy: Some("IfNotPresent".to_owned()),
             env: Some(envs),
             ports: Some(vec![ContainerPort {