Change app schema to support multiple container images in an app

twizmwazin · Jan 22, 2025 · 604cc12 · 604cc12
1 parent 999578a
commit 604cc12
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 21 deletions.
diff --git a/src/backend/kubernetes.rs b/src/backend/kubernetes.rs
@@ -62,7 +62,7 @@ impl AppControllerBackend for KubernetesBackend {
                 "app-controller-interaction-model".to_string(),
                 config.interaction_model.to_string(),
             ),
-            ("app-controller-image".to_string(), config.image.to_string()),
+            ("app-controller-images".to_string(), config.images.join(",")),
         ]);
 
         let service = Service {
@@ -132,16 +132,20 @@ impl AppControllerBackend for KubernetesBackend {
                             }),
                             ..Default::default()
                         }]),
-                        containers: vec![Container {
-                            name: name.clone(),
-                            image: Some(config.image.clone()),
-                            env: Some(vec![EnvVar {
-                                name: "DISPLAY".to_string(),
-                                value: Some(":0.0".to_string()),
+                        containers: config
+                            .images
+                            .iter()
+                            .map(|image| Container {
+                                name: image.clone(),
+                                image: Some(image.clone()),
+                                env: Some(vec![EnvVar {
+                                    name: "DISPLAY".to_string(),
+                                    value: Some(":0.0".to_string()),
+                                    ..Default::default()
+                                }]),
                                 ..Default::default()
-                            }]),
-                            ..Default::default()
-                        }],
+                            })
+                            .collect(),
                         ..Default::default()
                     }),
                 },
@@ -240,12 +244,14 @@ impl AppControllerBackend for KubernetesBackend {
                 )?,
             )
             .map_err(|e| BackendError::InternalError(e.to_string()))?,
-            image: annotations
-                .get("app-controller-image")
+            images: annotations
+                .get("app-controller-images")
                 .ok_or(BackendError::InternalError(
-                    "Missing app-controller-image annotation in deployment".to_string(),
-                ))
-                .map(|s| s.to_string())?,
+                    "Missing app-controller-images annotation in deployment".to_string(),
+                ))?
+                .split(',')
+                .map(|s| s.to_string())
+                .collect(),
         };
 
         Ok(App { id, config })
@@ -291,13 +297,15 @@ impl AppControllerBackend for KubernetesBackend {
                         )),
                         )?,
                     )?,
-                    image: annotations
-                        .get("app-controller-image")
+                    images: annotations
+                        .get("app-controller-images")
                         .ok_or(BackendError::InternalError(format!(
-                            "Missing app-controller-image annotation for deployment {}",
+                            "Missing app-controller-images annotation for deployment {}",
                             name
                         )))?
-                        .to_string(),
+                        .split(',')
+                        .map(|s| s.to_string())
+                        .collect(),
                 };
                 Ok::<App, BackendError>(App {
                     id: id.into(),

diff --git a/src/types.rs b/src/types.rs
@@ -20,8 +20,8 @@ pub struct AppConfig {
     pub name: String,
     /// Interaction model to use for the app.
     pub interaction_model: InteractionModel,
-    /// Container image to use for the app.
-    pub image: String,
+    /// Container images to use for the app.
+    pub images: Vec<String>,
 }
 
 /// Status of a app.