diff --git a/kubelab-backend/pkg/k8s/deployment.go b/kubelab-backend/pkg/k8s/deployment.go index 105ecf8..936f298 100644 --- a/kubelab-backend/pkg/k8s/deployment.go +++ b/kubelab-backend/pkg/k8s/deployment.go @@ -155,17 +155,17 @@ func constructDeployment(name, namespace, image string, replicas int32, host str Name: "code-server", Image: env.Config.CodeServerImage, Env: []v1.EnvVar{ - { - Name: "PUID", - Value: "1001", - }, - { - Name: "PGID", - Value: "1001", - }, + // { + // Name: "PUID", + // Value: "1001", + // }, + // { + // Name: "PGID", + // Value: "1001", + // }, { Name: "DEFAULT_WORKSPACE", - Value: "/home/kubelab-agent", + Value: "/home/kubelab-agent/exercise", }, // { // Name: "PROXY_DOMAIN", @@ -184,7 +184,7 @@ func constructDeployment(name, namespace, image string, replicas int32, host str VolumeMounts: []v1.VolumeMount{ { Name: "kubeconfig-writable", - MountPath: "/home/kubelab-agent/.kube/config", + MountPath: "/config/.kube/config", SubPath: "kubeconfig", ReadOnly: true, }, diff --git a/kubelab-backend/vcluster-values.yaml b/kubelab-backend/vcluster-values.yaml index a335ecd..b4ddc07 100644 --- a/kubelab-backend/vcluster-values.yaml +++ b/kubelab-backend/vcluster-values.yaml @@ -26,3 +26,5 @@ isolation: ipBlock: cidr: 8.8.8.8/32 except: [] +syncer: + kubeConfigContextName: "kubelab-vcluster" diff --git a/kubelab-ui/src/lib/components/base/SideOver.svelte b/kubelab-ui/src/lib/components/base/SideOver.svelte index d02b432..ba5bf62 100644 --- a/kubelab-ui/src/lib/components/base/SideOver.svelte +++ b/kubelab-ui/src/lib/components/base/SideOver.svelte @@ -154,6 +154,7 @@ exercises.delete(sidebar_exercise_session.id); return new Set(exercises); // Required for Svelte's reactivity }); + confirmation = false; }); }); diff --git a/kubelab-ui/src/lib/components/labs/Exercise.svelte b/kubelab-ui/src/lib/components/labs/Exercise.svelte index d07f251..f865178 100644 --- a/kubelab-ui/src/lib/components/labs/Exercise.svelte +++ b/kubelab-ui/src/lib/components/labs/Exercise.svelte @@ -92,6 +92,7 @@ exercises.delete(exercise_id); return new Set(exercises); // Required for Svelte's reactivity }); + confirmation = false; }); } } diff --git a/kubelab-ui/src/lib/components/markdown/CodeComponent.svelte b/kubelab-ui/src/lib/components/markdown/CodeComponent.svelte index 0525907..c593db2 100644 --- a/kubelab-ui/src/lib/components/markdown/CodeComponent.svelte +++ b/kubelab-ui/src/lib/components/markdown/CodeComponent.svelte @@ -1,7 +1,7 @@ + + + + diff --git a/kubelab-ui/src/routes/labs/[id]/[id]/+page.svelte b/kubelab-ui/src/routes/labs/[id]/[id]/+page.svelte index 4e615f0..d4d37a0 100644 --- a/kubelab-ui/src/routes/labs/[id]/[id]/+page.svelte +++ b/kubelab-ui/src/routes/labs/[id]/[id]/+page.svelte @@ -25,6 +25,7 @@ import CodeSpanComponent from "$lib/components/markdown/CodeSpanComponent.svelte"; import CodeComponent from "$lib/components/markdown/CodeComponent.svelte"; import LinkComponent from "$lib/components/markdown/LinkComponent.svelte"; + import ListComponent from "$lib/components/markdown/ListComponent.svelte"; import horizontalView from "$lib/stores/tableView"; import { loadingExercises } from "$lib/stores/loading"; let Console: ComponentType = PlaceholderComponent; @@ -199,7 +200,8 @@ renderers={{ codespan: CodeSpanComponent, code: CodeComponent, - link: LinkComponent + link: LinkComponent, + list: ListComponent }} /> {/key} @@ -225,7 +227,8 @@ renderers={{ codespan: CodeSpanComponent, code: CodeComponent, - link: LinkComponent + link: LinkComponent, + list: ListComponent }} /> @@ -256,7 +259,8 @@ renderers={{ codespan: CodeSpanComponent, code: CodeComponent, - link: LinkComponent + link: LinkComponent, + list: ListComponent }} /> @@ -365,7 +369,8 @@ renderers={{ codespan: CodeSpanComponent, code: CodeComponent, - link: LinkComponent + link: LinkComponent, + list: ListComponent }} /> {/key} @@ -391,7 +396,8 @@ renderers={{ codespan: CodeSpanComponent, code: CodeComponent, - link: LinkComponent + link: LinkComponent, + list: ListComponent }} /> @@ -421,7 +427,8 @@ renderers={{ codespan: CodeSpanComponent, code: CodeComponent, - link: LinkComponent + link: LinkComponent, + list: ListComponent }} />