Skip to content

feat(demo): visible deploy progress + richer console #671

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Timur Tukaev (tym83) wants to merge 1 commit into
base: main
Choose a base branch
from
Open

feat(demo): visible deploy progress + richer console #671

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion demo-src/overlay/apps/console/src/demo/fixtures/instances.json
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion demo-src/overlay/apps/console/src/demo/fixtures/resourcequotas-all.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
{"apiVersion": "v1", "items": [{"apiVersion": "v1", "kind": "ResourceQuota", "metadata": {"annotations": {"meta.helm.sh/release-name": "tenant-workshop00", "meta.helm.sh/release-namespace": "tenant-root"}, "creationTimestamp": "2026-08-29T01:50:38Z", "labels": {"app.kubernetes.io/managed-by": "Helm", "helm.toolkit.fluxcd.io/name": "tenant-workshop00", "helm.toolkit.fluxcd.io/namespace": "tenant-root"}, "name": "tenant-quota", "namespace": "tenant-workshop00", "resourceVersion": "47216026", "uid": "ab3a4b2f-2729-432d-869a-d2d12bf5ed1d"}, "spec": {"hard": {"limits.cpu": "32", "limits.memory": "64Gi", "requests.cpu": "3200m", "requests.memory": "68719476736"}}, "status": {"hard": {"limits.cpu": "32", "limits.memory": "64Gi", "requests.cpu": "3200m", "requests.memory": "68719476736"}, "used": {"limits.cpu": "6500m", "limits.memory": "3172Mi", "requests.cpu": "610m", "requests.memory": "2871001088"}}}], "kind": "List", "metadata": {"resourceVersion": ""}}
{"apiVersion": "v1", "items": [{"apiVersion": "v1", "kind": "ResourceQuota", "metadata": {"annotations": {"meta.helm.sh/release-name": "tenant-workshop00", "meta.helm.sh/release-namespace": "tenant-root"}, "creationTimestamp": "2026-08-29T01:50:38Z", "labels": {"app.kubernetes.io/managed-by": "Helm", "helm.toolkit.fluxcd.io/name": "tenant-workshop00", "helm.toolkit.fluxcd.io/namespace": "tenant-root"}, "name": "tenant-quota", "namespace": "tenant-workshop00", "resourceVersion": "47216026", "uid": "ab3a4b2f-2729-432d-869a-d2d12bf5ed1d"}, "spec": {"hard": {"limits.cpu": "32", "limits.memory": "64Gi", "requests.cpu": "3200m", "requests.memory": "68719476736"}}, "status": {"hard": {"limits.cpu": "32", "limits.memory": "64Gi", "requests.cpu": "3200m", "requests.memory": "68719476736"}, "used": {"limits.cpu": "21", "limits.memory": "36Gi", "requests.cpu": "4200m", "requests.memory": "36Gi"}}}], "kind": "List", "metadata": {"resourceVersion": ""}}
52 changes: 1 addition & 51 deletions demo-src/overlay/apps/console/src/demo/fixtures/resourcequotas.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,51 +1 @@
{
"apiVersion": "v1",
"items": [
{
"apiVersion": "v1",
"kind": "ResourceQuota",
"metadata": {
"annotations": {
"meta.helm.sh/release-name": "tenant-workshop00",
"meta.helm.sh/release-namespace": "tenant-root"
},
"creationTimestamp": "2026-08-29T01:50:38Z",
"labels": {
"app.kubernetes.io/managed-by": "Helm",
"helm.toolkit.fluxcd.io/name": "tenant-workshop00",
"helm.toolkit.fluxcd.io/namespace": "tenant-root"
},
"name": "tenant-quota",
"namespace": "tenant-workshop00",
"resourceVersion": "47160179",
"uid": "ab3a4b2f-2729-432d-869a-d2d12bf5ed1d"
},
"spec": {
"hard": {
"limits.cpu": "32",
"limits.memory": "64Gi",
"requests.cpu": "3200m",
"requests.memory": "68719476736"
}
},
"status": {
"hard": {
"limits.cpu": "32",
"limits.memory": "64Gi",
"requests.cpu": "3200m",
"requests.memory": "68719476736"
},
"used": {
"limits.cpu": "6500m",
"limits.memory": "3172Mi",
"requests.cpu": "610m",
"requests.memory": "2871001088"
}
}
}
],
"kind": "List",
"metadata": {
"resourceVersion": ""
}
}
{"apiVersion": "v1", "items": [{"apiVersion": "v1", "kind": "ResourceQuota", "metadata": {"annotations": {"meta.helm.sh/release-name": "tenant-workshop00", "meta.helm.sh/release-namespace": "tenant-root"}, "creationTimestamp": "2026-08-29T01:50:38Z", "labels": {"app.kubernetes.io/managed-by": "Helm", "helm.toolkit.fluxcd.io/name": "tenant-workshop00", "helm.toolkit.fluxcd.io/namespace": "tenant-root"}, "name": "tenant-quota", "namespace": "tenant-workshop00", "resourceVersion": "47160179", "uid": "ab3a4b2f-2729-432d-869a-d2d12bf5ed1d"}, "spec": {"hard": {"limits.cpu": "32", "limits.memory": "64Gi", "requests.cpu": "3200m", "requests.memory": "68719476736"}}, "status": {"hard": {"limits.cpu": "32", "limits.memory": "64Gi", "requests.cpu": "3200m", "requests.memory": "68719476736"}, "used": {"limits.cpu": "21", "limits.memory": "36Gi", "requests.cpu": "4200m", "requests.memory": "36Gi"}}}], "kind": "List", "metadata": {"resourceVersion": ""}}
35 changes: 30 additions & 5 deletions demo-src/overlay/apps/console/src/demo/handlers.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,13 @@ const PLURAL_TO_KIND: Record<string, string> = {
clickhouses: "ClickHouse", mongodbs: "MongoDB", natses: "NATS", buckets: "Bucket",
}

// --- Живой стор инстансов: показывает деплой «в процессе» ---
// Демо статично, но при создании инстанс должен появиться в состоянии установки
// и через несколько секунд стать Ready — иначе деплой выглядит фейково.
type Cond = { type: string; status: string; reason?: string; message?: string }
type Inst = Obj & { apiVersion?: string; spec?: unknown; status?: { conditions?: Cond[] } }
const liveInstances: Inst[] = JSON.parse(JSON.stringify(instances.items)) as Inst[]

const list = (items: Obj[], kind: string) => ({
apiVersion: "apps.cozystack.io/v1alpha1",
kind: `${kind}List`,
Expand Down Expand Up @@ -134,14 +141,14 @@ export const handlers = [
// инстансы конкретного типа в namespace
http.get(`${COZY}/namespaces/:ns/:resource`, ({ params, request }) => {
const kind = PLURAL_TO_KIND[params.resource as string]
const items = kind ? (instances.items as Obj[]).filter((i) => i.kind === kind) : []
const items = kind ? liveInstances.filter((i) => i.kind === kind) : []
return isWatch(request) ? watchStream(items) : HttpResponse.json(list(items, kind ?? "Unknown"))
}),

// одиночный инстанс
http.get(`${COZY}/namespaces/:ns/:resource/:name`, ({ params }) => {
const kind = PLURAL_TO_KIND[params.resource as string]
const obj = (instances.items as Obj[]).find((i) => i.kind === kind && i.metadata.name === params.name)
const obj = liveInstances.find((i) => i.kind === kind && i.metadata.name === params.name)
return obj ? HttpResponse.json(obj) : new HttpResponse(null, { status: 404 })
}),

Expand Down Expand Up @@ -229,9 +236,27 @@ export const handlers = [
http.get("/apis/metrics.k8s.io/v1beta1/namespaces/:ns/pods", () =>
HttpResponse.json({ kind: "PodMetricsList", apiVersion: "metrics.k8s.io/v1beta1", items: [] })),

// создание инстанса в демо: возвращаем как будто создано (в список не добавляем — статичная витрина)
http.post(`${COZY}/namespaces/:ns/:resource`, async ({ request }) => {
const obj = await request.json()
// Создание инстанса: появляется в состоянии установки и через ~9 c становится Ready.
http.post(`${COZY}/namespaces/:ns/:resource`, async ({ params, request }) => {
const kind = PLURAL_TO_KIND[params.resource as string] ?? "Unknown"
const sent = (await request.json()) as { metadata?: { name?: string }; spec?: unknown }
const name = sent?.metadata?.name || `new-${kind.toLowerCase()}`
const obj: Inst = {
apiVersion: "apps.cozystack.io/v1alpha1", kind,
metadata: { name, namespace: NS,
creationTimestamp: new Date().toISOString(),
uid: crypto.randomUUID(),
labels: { "apps.cozystack.io/application.kind": kind, "apps.cozystack.io/application.name": name },
} as Obj["metadata"],
spec: sent?.spec ?? {},
status: { conditions: [{ type: "Ready", status: "False", reason: "Installing", message: "Разворачивается…" }] },
}
liveInstances.push(obj)
// Через ~9 c установка «завершается»: следующий рефетч списка покажет Ready.
setTimeout(() => {
const c = obj.status?.conditions?.find((x) => x.type === "Ready")
if (c) { c.status = "True"; c.reason = "InstallSucceeded"; c.message = "" }
}, 9000)
return HttpResponse.json(obj, { status: 201 })
}),

Expand Down
2 changes: 1 addition & 1 deletion static/demo/404.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<link rel="icon" type="image/svg+xml" href="/demo/favicon.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Cozystack</title>
<script type="module" crossorigin src="/demo/assets/index-8AWN6dv8.js"></script>
<script type="module" crossorigin src="/demo/assets/index-BMinVbmc.js"></script>
<link rel="modulepreload" crossorigin href="/demo/assets/chunk-BEqpzyXh.js">
<link rel="modulepreload" crossorigin href="/demo/assets/preload-helper-CrqUGr72.js">
<link rel="modulepreload" crossorigin href="/demo/assets/jsx-runtime-BwJb0T-f.js">
Expand Down
27 changes: 22 additions & 5 deletions static/demo/assets/browser-rhRgLFx8.js → static/demo/assets/browser-CwlhVzdm.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion static/demo/assets/index-8AWN6dv8.js → static/demo/assets/index-BMinVbmc.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion static/demo/index.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<link rel="icon" type="image/svg+xml" href="/demo/favicon.svg" />
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<title>Cozystack</title>
<script type="module" crossorigin src="/demo/assets/index-8AWN6dv8.js"></script>
<script type="module" crossorigin src="/demo/assets/index-BMinVbmc.js"></script>
<link rel="modulepreload" crossorigin href="/demo/assets/chunk-BEqpzyXh.js">
<link rel="modulepreload" crossorigin href="/demo/assets/preload-helper-CrqUGr72.js">
<link rel="modulepreload" crossorigin href="/demo/assets/jsx-runtime-BwJb0T-f.js">
Expand Down