fix: pin version of log aggregator to version of codeflare

Author: starpit

Diff for: plugins/plugin-codeflare/src/controller/catchall.ts

@@ -14,9 +14,18 @@
  * limitations under the License.
  */
 
+import { version } from "@kui-shell/client/package.json"
 import { doMadwizard } from "@kui-shell/plugin-madwizard"
 
+/** Extra environment variables for the madwizard run */
+function env() {
+  return {
+    // sync/pin log aggregator version to our version
+    LOG_AGGREGATOR_TAG: version,
+  }
+}
+
 /**
  * Our catch-all command handler: send to madwizard.
  */
-export default doMadwizard(true, "guide", true)
+export default doMadwizard(true, "guide", true, undefined, env)

Diff for: plugins/plugin-codeflare/src/tray/menus/profiles/log-aggregator.ts

@@ -17,16 +17,20 @@
 import { CreateWindowFunction } from "@kui-shell/core"
 
 import windowOptions from "../../window"
+import { bootIcon, shutDownIcon } from "../../icons"
 
 /** Handler for redeploying the server-side log aggregator up a profile */
-async function stopLogAggregator(profile: string, createWindow: CreateWindowFunction) {
+async function logAggregator(task: "deploy" | "undeploy", profile: string, createWindow: CreateWindowFunction) {
   createWindow(
     // re: -y, this means run in non-interactive mode (-y is short for --yes)
-    ["codeflare", "gui", "guide", "-y", "--profile", profile, "ml/ray/aggregator/in-cluster/client-side/undeploy"],
+    ["codeflare", "gui", "guide", "-y", "--profile", profile, `ml/ray/aggregator/in-cluster/client-side/${task}`],
     windowOptions({ title: "Stopping Log Aggregator " + profile })
   )
 }
 
 export default function bootMenuItem(profile: string, createWindow: CreateWindowFunction) {
-  return { label: "Stop Log Aggregator", click: () => stopLogAggregator(profile, createWindow) }
+  return [
+    { label: "Start Log Aggregator", icon: bootIcon, click: () => logAggregator("deploy", profile, createWindow) },
+    { label: "Stop Log Aggregator", icon: shutDownIcon, click: () => logAggregator("undeploy", profile, createWindow) },
+  ]
 }

Diff for: plugins/plugin-codeflare/src/tray/menus/profiles/tasks.ts

@@ -17,17 +17,19 @@
 import { MenuItemConstructorOptions } from "electron"
 import { CreateWindowFunction } from "@kui-shell/core"
 
+import section from "../section"
+
 import boot from "./boot"
 import shutdown from "./shutdown"
-import stopLogAggregator from "./log-aggregator"
+import logAggregator from "./log-aggregator"
 
 export default function tasks(profile: string, createWindow: CreateWindowFunction): MenuItemConstructorOptions[] {
   return [
     boot(profile, createWindow),
     shutdown(profile, createWindow),
     {
       label: "Advanced",
-      submenu: [stopLogAggregator(profile, createWindow)],
+      submenu: [...section("Log Aggregator", logAggregator(profile, createWindow))],
     },
   ]
 }

Diff for: plugins/plugin-madwizard/src/plugin.ts

@@ -61,14 +61,24 @@ export function doMadwizard(
   readonly: boolean,
   task: Task,
   withFilepath = false,
-  cb?: (filepath: string, tab: Tab) => Promise<true | ReactResponse["react"]>
+  cb?: (filepath: string, tab: Tab) => Promise<true | ReactResponse["react"]>,
+
+  /** Inject environment variables into the madwizard run */
+  envFn?: () => Record<string, string>
 ) {
   return async ({ tab, argvNoOptions, parsedOptions }: Arguments<Options>) => {
     if (withFilepath && !argvNoOptions[1]) {
       // TODO codeflare should not be in plugin-madwizard
       argvNoOptions.push(process.env.GUIDEBOOK || "ml/codeflare")
     }
 
+    if (envFn) {
+      // TODO add support to madwizard!
+      Object.entries(envFn()).forEach(([key, value]) => {
+        process.env[key] = value
+      })
+    }
+
     if (!parsedOptions.u) {
       // CLI path
       const { cli } = await import("madwizard/dist/fe/cli/index.js")