Skip to content

Commit 024a5fd

Browse files
committed
fix(cli): port forwarding
Signed-off-by: Jan Pokorný <JenomPokorny@gmail.com>
1 parent f14caa8 commit 024a5fd

3 files changed

Lines changed: 12 additions & 8 deletions

File tree

agents/chat/src/chat/tools/files/utils.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
from a2a.types import Message, Role
1212
from beeai_framework.backend import AnyMessage, AssistantMessage, UserMessage
1313

14-
from kagenti_adk.platform import File
15-
from kagenti_adk.util.file import PlatformFileUrl
14+
from agentstack_sdk.platform import File
15+
from agentstack_sdk.util.file import PlatformFileUrl
1616
from chat.tools.files.model import FileChatInfo
1717

1818

apps/adk-cli/src/kagenti_cli/commands/platform.py

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -441,11 +441,6 @@ async def start_cmd(
441441
kubeconfig_local = anyio.Path(Configuration().lima_home / vm_name / "copied-from-guest" / "kubeconfig.yaml")
442442
await kubeconfig_local.parent.mkdir(parents=True, exist_ok=True)
443443
await kubeconfig_local.write_text((await run_in_vm(vm_name, ["cat", "/var/lib/microshift/resources/kubeadmin/kubeconfig"], "Copying kubeconfig from Kagenti ADK platform")).stdout.decode())
444-
await run_in_vm(
445-
vm_name,
446-
["bash", "-c", 'command -v helm && exit 0; case $(uname -m) in x86_64) ARCH="amd64" ;; aarch64) ARCH="arm64" ;; esac; curl -fsSL "https://get.helm.sh/helm-v4.1.1-linux-${ARCH}.tar.gz" | tar -xzf - --strip-components=1 -C /usr/local/bin "linux-${ARCH}/helm"; chmod +x /usr/local/bin/helm'],
447-
"Installing Helm",
448-
)
449444
# --- Prepare kagenti-adk chart and import images before any deployments ---
450445
await run_in_vm(
451446
vm_name,
@@ -803,7 +798,13 @@ async def start_cmd(
803798
)
804799
await run_in_vm(
805800
vm_name,
806-
["bash", "-euxc", 'systemctl daemon-reload; systemctl start "kubectl-port-forward@kagenti-system:http-istio:8080:80" & systemctl start "kubectl-port-forward@kagenti-system:otel-collector:4318" &'],
801+
[
802+
"bash",
803+
"-euxc",
804+
"systemctl daemon-reload; "
805+
"systemctl enable --now kubectl-port-forward@kagenti-system:http-istio:8080:80; "
806+
"systemctl enable --now kubectl-port-forward@kagenti-system:otel-collector:4318; "
807+
],
807808
"Forwarding VM services to host",
808809
)
809810

apps/microshift-vm/rootfs/etc/systemd/system/kubectl-port-forward@.service

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,6 @@
22
ExecStart=/bin/bash -c 'IFS=":" read -ra p <<< "%i"; if [ $${#p[@]} -ge 3 ]; then ns=$${p[0]} svc=$${p[1]} hp=$${p[2]} tp=$${p[3]:-$${p[2]}}; else ns=default svc=$${p[0]} hp=$${p[1]} tp=$${p[1]}; fi; kubectl wait --kubeconfig=/var/lib/microshift/resources/kubeadmin/kubeconfig -n $$ns --for=jsonpath={.subsets[*].addresses[0].ip} ep/$$svc --timeout=300s && exec kubectl port-forward --kubeconfig=/var/lib/microshift/resources/kubeadmin/kubeconfig -n $$ns --address=127.0.0.1 svc/$$svc $$hp:$$tp'
33
Restart=on-failure
44
User=root
5+
6+
[Install]
7+
WantedBy=multi-user.target

0 commit comments

Comments
 (0)