@khal-os/cli 1.0.43 → 1.0.45

package/dist/index.js

@@ -14892,7 +14892,7 @@ function isInCluster() {
   _inClusterCached = existsSync5(IN_CLUSTER_TOKEN_PATH) && !!process.env.KUBERNETES_SERVICE_HOST;
   return _inClusterCached;
 }
-var exec2, IN_CLUSTER_TOKEN_PATH = "/var/run/secrets/kubernetes.io/serviceaccount/token", _inClusterCached, DEFAULT_KUBECONFIG = "/etc/rancher/k3s/k3s.yaml", DEFAULT_NATS_URL = "nats://nats:4222", DEFAULT_RESOURCES, SANDBOX_RUNTIME_CLASS = "sysbox-runc", SANDBOX_PVC_SIZE = "20Gi", SANDBOX_STORAGE_CLASS = "local-path", SANDBOX_SSH_PORT = 22, SANDBOX_NAMESPACE = "khal-sandbox", SANDBOX_HELM_CHART, SANDBOX_RESOURCES, KubernetesRuntime;
+var exec2, IN_CLUSTER_TOKEN_PATH = "/var/run/secrets/kubernetes.io/serviceaccount/token", _inClusterCached, DEFAULT_KUBECONFIG = "/etc/rancher/k3s/k3s.yaml", DEFAULT_NATS_URL = "nats://nats:4222", DEFAULT_RESOURCES, SANDBOX_RUNTIME_CLASS = "sysbox-runc", SANDBOX_PVC_SIZE = "20Gi", SANDBOX_STORAGE_CLASS = "local-path", SANDBOX_SSH_PORT = 22, SANDBOX_NAMESPACE = "khal-sandbox", SANDBOX_HELM_CHART, SANDBOX_RESOURCES, SANDBOX_HELM_TIMEOUT_S, SANDBOX_POD_READY_TIMEOUT_MS, KubernetesRuntime;
 var init_kubernetes = __esm(() => {
   exec2 = promisify(execFile);
   DEFAULT_RESOURCES = {
@@ -14901,9 +14901,11 @@ var init_kubernetes = __esm(() => {
   };
   SANDBOX_HELM_CHART = process.env.KHAL_SANDBOX_CHART_PATH ?? "helm/khal-sandbox";
   SANDBOX_RESOURCES = {
-    requests: { cpu: "500m", memory: "1Gi" },
-    limits: { cpu: "2", memory: "4Gi" }
+    requests: { cpu: "250m", memory: "512Mi" },
+    limits: { cpu: "1", memory: "2Gi" }
   };
+  SANDBOX_HELM_TIMEOUT_S = Number(process.env.KHAL_SANDBOX_HELM_TIMEOUT_S ?? 360);
+  SANDBOX_POD_READY_TIMEOUT_MS = Number(process.env.KHAL_SANDBOX_POD_READY_TIMEOUT_S ?? 360) * 1000;
   KubernetesRuntime = class KubernetesRuntime extends BaseRuntime {
     type = "kubernetes";
     kubeconfig;
@@ -14926,6 +14928,7 @@ var init_kubernetes = __esm(() => {
     helmChart;
     helmRelease;
     domainSuffix;
+    imagePullSecret;
     sysboxAvailable;
     constructor(config) {
       super(config);
@@ -14954,9 +14957,10 @@ var init_kubernetes = __esm(() => {
         this.podName = `sandbox-${safeUser}-0`.slice(0, 63);
         this.serviceName = `sandbox-${safeUser}`.slice(0, 63);
         this.helmRelease = `sandbox-${safeUser}`.slice(0, 53);
-        this.image = kc.image ?? "khal-os/sandbox:latest";
+        this.image = kc.image ?? process.env.KHAL_SANDBOX_IMAGE ?? "khal-os/sandbox:latest";
         this.instanceId = kc.instanceId ?? `sandbox-${safeUser}`;
         this.resources = kc.resources ?? SANDBOX_RESOURCES;
+        this.imagePullSecret = kc.imagePullSecret ?? process.env.KHAL_SANDBOX_PULL_SECRET ?? "ocir-secret";
       } else {
         this.runtimeClassName = kc.runtimeClassName;
         this.namespace = `khal-${id}`.slice(0, 63).replace(/[^a-z0-9-]/g, "-");
@@ -14966,6 +14970,7 @@ var init_kubernetes = __esm(() => {
         this.image = kc.image ?? `khal-os/${slug}:latest`;
         this.instanceId = id;
         this.resources = kc.resources ?? DEFAULT_RESOURCES;
+        this.imagePullSecret = kc.imagePullSecret;
       }
     }
     async ensureDeps() {
@@ -15052,7 +15057,7 @@ var init_kubernetes = __esm(() => {
         this.namespace,
         "--wait",
         "--timeout",
-        "180s",
+        `${SANDBOX_HELM_TIMEOUT_S}s`,
         ...setArgs
       ];
       this.emit({
@@ -15062,20 +15067,25 @@ var init_kubernetes = __esm(() => {
         message: `helm ${helmArgs.join(" ")}`
       });
       try {
-        await exec2("helm", helmArgs, { timeout: 240000 });
+        await exec2("helm", helmArgs, { timeout: (SANDBOX_HELM_TIMEOUT_S + 30) * 1000 });
       } catch (err) {
         const msg = err instanceof Error ? err.message : String(err);
         throw new Error(`helm upgrade --install ${this.helmRelease} failed: ${msg}`);
       }
-      await this.waitForPod(240000);
+      await this.waitForPod(SANDBOX_POD_READY_TIMEOUT_MS);
     }
     buildHelmValues() {
       const sets = [];
       const set = (key, value) => {
         sets.push("--set", `${key}=${value}`);
       };
-      set("image.repository", this.image.split(":")[0]);
-      set("image.tag", this.image.split(":")[1] ?? "latest");
+      const lastColon = this.image.lastIndexOf(":");
+      const repo = lastColon > 0 ? this.image.slice(0, lastColon) : this.image;
+      const tag = lastColon > 0 ? this.image.slice(lastColon + 1) : "latest";
+      set("image.repository", repo);
+      set("image.tag", tag);
+      if (this.imagePullSecret)
+        set("image.pullSecret", this.imagePullSecret);
       if (this.userId)
         set("user.id", this.userId);
       const natsHost = this.parseNatsHost();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@khal-os/cli",
-  "version": "1.0.43",
+  "version": "1.0.45",
   "private": false,
   "type": "module",
   "main": "./dist/index.js",