Skip to content

Commit 8b058ca

Browse files
amir20amir20
authored
feat: adds shell support for k8s mode (#3747)
1 parent 8c4fcc6 commit 8b058ca

File tree

6 files changed

+154
-8
lines changed

6 files changed

+154
-8
lines changed

‎assets/components/ContainerViewer/ContainerActionsToolbar.vue‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -135,7 +135,7 @@
135135
</li>
136136
</template>
137137

138-
<template v-if="enableShell && host.type !== 'k8s'">
138+
<template v-if="enableShell">
139139
<li class="line"></li>
140140
<li>
141141
<a @click.prevent="showDrawer(Terminal, { container, action: 'attach' }, 'lg')">
@@ -157,7 +157,6 @@
157157
<script lang="ts" setup>
158158
import { Container } from "@/models/Container";
159159
import { allLevels } from "@/composable/logContext";
160-
const { hosts } = useHosts();
161160
import LogAnalytics from "../LogViewer/LogAnalytics.vue";
162161
import Terminal from "@/components/Terminal.vue";
163162
@@ -169,7 +168,6 @@ const showDrawer = useDrawer();
169168
const { container } = defineProps<{ container: Container }>();
170169
const clear = defineEmit();
171170
const { actionStates, start, stop, restart } = useContainerActions(toRef(() => container));
172-
const host = computed(() => hosts.value[container.host]);
173171
174172
onKeyStroke("f", (e) => {
175173
if (hasComplexLogs.value) {

‎docs/guide/shell.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,4 @@ services:
2727
:::
2828
2929
> [!NOTE]
30-
> Shell access only works in Docker containers. This includes agents, remote, swarm and local mode. Support for Kubernetes is planned, but it is not yet available.
30+
> Shell access should work across all container types, including Docker, Kubernetes, and other orchestration platforms.

‎go.mod‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -79,9 +79,11 @@ require (
7979
github.com/mattn/go-colorable v0.1.14 // indirect
8080
github.com/mattn/go-isatty v0.0.20 // indirect
8181
github.com/moby/docker-image-spec v1.3.1 // indirect
82+
github.com/moby/spdystream v0.5.0 // indirect
8283
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
8384
github.com/modern-go/reflect2 v1.0.2 // indirect
8485
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
86+
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
8587
github.com/pkg/errors v0.9.1 // indirect
8688
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
8789
github.com/segmentio/asm v1.2.0 // indirect

‎go.sum‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@ github.com/alexflint/go-scalar v1.2.0 h1:WR7JPKkeNpnYIOfHRa7ivM21aWAdHD0gEWHCx+W
1010
github.com/alexflint/go-scalar v1.2.0/go.mod h1:LoFvNMqS1CPrMVltza4LvnGKhaSpc3oyLEBUZVhhS2o=
1111
github.com/andybalholm/cascadia v1.3.3 h1:AG2YHrzJIm4BZ19iwJ/DAua6Btl3IwJX+VI4kktS1LM=
1212
github.com/andybalholm/cascadia v1.3.3/go.mod h1:xNd9bqTn98Ln4DwST8/nG+H0yuB8Hmgu1YHNnWw0GeA=
13+
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
14+
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
1315
github.com/bahlo/generic-list-go v0.2.0 h1:5sz/EEAK+ls5wF+NeqDpk5+iNdMDXrh3z3nPnH1Wvgk=
1416
github.com/bahlo/generic-list-go v0.2.0/go.mod h1:2KvAjgMlE5NNynlg/5iLrrCCZ2+5xWbdbCW3pNTGyYg=
1517
github.com/beme/abide v0.0.0-20190723115211-635a09831760 h1:FvTM5NSN5HYvfKpgL+8x73U5v063vHsd7AX05eV1DnM=
@@ -124,6 +126,8 @@ github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWE
124126
github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
125127
github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
126128
github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
129+
github.com/moby/spdystream v0.5.0 h1:7r0J1Si3QO/kjRitvSLVVFUjxMEb/YLj6S9FF62JBCU=
130+
github.com/moby/spdystream v0.5.0/go.mod h1:xBAYlnt/ay+11ShkdFKNAG7LsyK/tmNBVvVOwrfMgdI=
127131
github.com/moby/term v0.0.0-20201216013528-df9cb8a40635 h1:rzf0wL0CHVc8CEsgyygG0Mn9CNCCPZqOPaz8RiiHYQk=
128132
github.com/moby/term v0.0.0-20201216013528-df9cb8a40635/go.mod h1:FBS0z0QWA44HXygs7VXDUOGoN/1TV3RuWkLO04am3wc=
129133
github.com/modern-go/concurrent v0.0.0-20180228061459-e0a39a4cb421/go.mod h1:6dJC0mAP4ikYIbvyc7fijjWJddQyLn8Ig3JB5CqoB9Q=
@@ -135,6 +139,8 @@ github.com/morikuni/aec v1.0.0 h1:nP9CBfwrvYnBRgY6qfDQkygYDmYwOilePFkwzv4dU8A=
135139
github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7PXmsc=
136140
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
137141
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
142+
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus=
143+
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
138144
github.com/onsi/ginkgo/v2 v2.21.0 h1:7rg/4f3rB88pb5obDgNZrNHrQ4e6WpjonchcpuBRnZM=
139145
github.com/onsi/ginkgo/v2 v2.21.0/go.mod h1:7Du3c42kxCUegi0IImZ1wUQzMBVecgIHjR1C+NkhLQo=
140146
github.com/onsi/gomega v1.35.1 h1:Cwbd75ZBPxFSuZ6T+rN/WCb/gOc6YgFBXLlZLhC7Ds4=

‎internal/k8s/client.go‎

Lines changed: 85 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,10 @@ import (
1717
"github.com/rs/zerolog/log"
1818

1919
"k8s.io/client-go/kubernetes"
20+
"k8s.io/client-go/kubernetes/scheme"
2021
"k8s.io/client-go/rest"
2122
"k8s.io/client-go/tools/clientcmd"
23+
"k8s.io/client-go/tools/remotecommand"
2224
)
2325

2426
type K8sClient struct {
@@ -245,11 +247,92 @@ func (k *K8sClient) ContainerActions(ctx context.Context, action container.Conta
245247
}
246248

247249
func (k *K8sClient) ContainerAttach(ctx context.Context, id string) (io.WriteCloser, io.Reader, error) {
248-
panic("not implemented")
250+
namespace, podName, containerName := parsePodContainerID(id)
251+
log.Debug().Str("container", containerName).Str("pod", podName).Msg("Executing command in pod")
252+
req := k.Clientset.CoreV1().RESTClient().Post().
253+
Resource("pods").
254+
Name(podName).
255+
Namespace(namespace).
256+
SubResource("attach")
257+
258+
option := &corev1.PodAttachOptions{
259+
Container: containerName,
260+
Stdin: true,
261+
Stdout: true,
262+
Stderr: true,
263+
TTY: true,
264+
}
265+
266+
req.VersionedParams(
267+
option,
268+
scheme.ParameterCodec,
269+
)
270+
271+
exec, err := remotecommand.NewSPDYExecutor(k.config, "POST", req.URL())
272+
if err != nil {
273+
return nil, nil, err
274+
}
275+
276+
stdinReader, stdinWriter := io.Pipe()
277+
stdoutReader, stdoutWriter := io.Pipe()
278+
279+
go func() {
280+
err := exec.StreamWithContext(ctx, remotecommand.StreamOptions{
281+
Stdin: stdinReader,
282+
Stdout: stdoutWriter,
283+
Tty: true,
284+
})
285+
if err != nil {
286+
log.Error().Err(err).Msg("Error streaming command")
287+
}
288+
}()
289+
290+
return stdinWriter, stdoutReader, nil
249291
}
250292

251293
func (k *K8sClient) ContainerExec(ctx context.Context, id string, cmd []string) (io.WriteCloser, io.Reader, error) {
252-
panic("not implemented")
294+
namespace, podName, containerName := parsePodContainerID(id)
295+
log.Debug().Str("container", containerName).Str("pod", podName).Msg("Executing command in pod")
296+
req := k.Clientset.CoreV1().RESTClient().Post().
297+
Resource("pods").
298+
Name(podName).
299+
Namespace(namespace).
300+
SubResource("exec")
301+
302+
option := &corev1.PodExecOptions{
303+
Command: cmd,
304+
Container: containerName,
305+
Stdin: true,
306+
Stdout: true,
307+
Stderr: true,
308+
TTY: true,
309+
}
310+
311+
req.VersionedParams(
312+
option,
313+
scheme.ParameterCodec,
314+
)
315+
316+
exec, err := remotecommand.NewSPDYExecutor(k.config, "POST", req.URL())
317+
if err != nil {
318+
return nil, nil, err
319+
}
320+
321+
stdinReader, stdinWriter := io.Pipe()
322+
stdoutReader, stdoutWriter := io.Pipe()
323+
324+
go func() {
325+
err := exec.StreamWithContext(ctx, remotecommand.StreamOptions{
326+
Stdin: stdinReader,
327+
Stdout: stdoutWriter,
328+
Tty: true,
329+
})
330+
if err != nil {
331+
log.Error().Err(err).Msg("Error streaming command")
332+
}
333+
}()
334+
335+
return stdinWriter, stdoutReader, nil
253336
}
254337

255338
// Helper function to parse pod and container names from container ID

‎internal/support/k8s/k8s_service.go‎

Lines changed: 59 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package k8s_support
33
import (
44
"context"
55
"io"
6+
"sync"
67

78
"github.com/rs/zerolog/log"
89

@@ -92,9 +93,65 @@ func (k *K8sClientService) SubscribeContainersStarted(ctx context.Context, conta
9293
}
9394

9495
func (k *K8sClientService) Attach(ctx context.Context, container container.Container, stdin io.Reader, stdout io.Writer) error {
95-
panic("not implemented")
96+
cancelCtx, cancel := context.WithCancel(ctx)
97+
writer, reader, err := k.client.ContainerAttach(cancelCtx, container.ID)
98+
if err != nil {
99+
cancel()
100+
return err
101+
}
102+
103+
var wg sync.WaitGroup
104+
wg.Add(2)
105+
106+
go func() {
107+
defer writer.Close()
108+
defer cancel()
109+
defer wg.Done()
110+
if _, err := io.Copy(writer, stdin); err != nil {
111+
log.Error().Err(err).Msg("error copying stdin")
112+
}
113+
}()
114+
115+
go func() {
116+
defer cancel()
117+
defer wg.Done()
118+
if _, err := io.Copy(stdout, reader); err != nil {
119+
log.Error().Err(err).Msg("error copying stdout")
120+
}
121+
}()
122+
123+
wg.Wait()
124+
return nil
96125
}
97126

98127
func (k *K8sClientService) Exec(ctx context.Context, container container.Container, cmd []string, stdin io.Reader, stdout io.Writer) error {
99-
panic("not implemented")
128+
cancelCtx, cancel := context.WithCancel(ctx)
129+
writer, reader, err := k.client.ContainerExec(cancelCtx, container.ID, cmd)
130+
if err != nil {
131+
cancel()
132+
return err
133+
}
134+
135+
var wg sync.WaitGroup
136+
wg.Add(2)
137+
138+
go func() {
139+
defer writer.Close()
140+
defer cancel()
141+
defer wg.Done()
142+
if _, err := io.Copy(writer, stdin); err != nil {
143+
log.Error().Err(err).Msg("error copying stdin")
144+
}
145+
}()
146+
147+
go func() {
148+
defer cancel()
149+
defer wg.Done()
150+
if _, err := io.Copy(stdout, reader); err != nil {
151+
log.Error().Err(err).Msg("error copying stdout")
152+
}
153+
}()
154+
155+
wg.Wait()
156+
return nil
100157
}

0 commit comments

Comments
 (0)