refactor(web): improve job kind handling in schedule components

- Removed hardcoded job kind checks in schedule components and replaced them with a utility function `isRefreshJobKind` for better maintainability.
- Updated the `ui-labels` module to include additional job kinds and their corresponding labels.
- Adjusted the `DashboardRecentJobsGrid`, `OperationsJobsGrid`, and `ScheduleJobsGrid` components to reflect these changes, enhancing the clarity and consistency of job kind representation.

apps/web/src/components/dashboard/dashboard-modules-grid.tsx

@@ -167,7 +167,7 @@ export function DashboardModulesGrid({
       description="Поиск, сортировка и быстрый переход к настройке"
       className="min-w-0"
       actions={
-        <Button variant="outline" size="sm" render={<Link to="/modules/new" />}>
+        <Button variant="outline" size="sm" render={<Link to="/modules" search={{ create: true }} />}>
           <PlusIcon />
           Создать
         </Button>

apps/web/src/components/dashboard/dashboard-quick-links.tsx

@@ -16,7 +16,8 @@ const ACTIONS: QuickActionItem[] = [
     id: 'new-module',
     title: 'Создать модуль',
     description: 'Новый модуль маршрутизации и источники префиксов.',
-    to: '/modules/new',
+    to: '/modules',
+    search: { create: true },
     icon: <Plus aria-hidden />,
     iconClassName: 'text-primary',
   },

apps/web/src/components/dashboard/dashboard-recent-jobs-grid.tsx

@@ -29,7 +29,6 @@ export function DashboardRecentJobsGrid({
         cell: ({ row }) => (
           <DataGridPrimaryCell
             title={jobKindRu(row.original.kind)}
-            accent="mono"
             subtitle={
               row.original.meta?.module_id
                 ? (nameById.get(String(row.original.meta.module_id)) ?? undefined)

apps/web/src/components/lookup/lookup-add-step.tsx

@@ -128,7 +128,7 @@ export function LookupAddStep({
         <AlertTitle>Нет подходящего модуля</AlertTitle>
         <AlertDescription>
           Создайте модуль типа {wantedType}, затем повторите добавление.{' '}
-          <Button variant="link" size="sm" className="h-auto p-0" render={<Link to="/modules/new" />}>
+          <Button variant="link" size="sm" className="h-auto p-0" render={<Link to="/modules" search={{ create: true }} />}>
             Перейти к модулям
           </Button>
         </AlertDescription>

apps/web/src/components/modules/module-create-dialog.tsx

@@ -0,0 +1,289 @@
+import { useEffect, useState } from 'react'
+import { toast } from 'sonner'
+
+import { Button } from '@evobgp/ui/components/button'
+import { Checkbox } from '@evobgp/ui/components/checkbox'
+import { Input } from '@evobgp/ui/components/input'
+import { Label } from '@evobgp/ui/components/label'
+
+import { FormDrawer } from '@/components/form-drawer'
+import { LoadingButton } from '@/components/loading-button'
+import { CommunitySelect } from '@/components/modules/community-select'
+import { SelectField } from '@/components/select-field'
+import { dohProfileShortLabel } from '@/lib/modules/helpers'
+import { dohPolicyRu, moduleTypeRu } from '@/lib/ui-labels'
+import { useCreateModuleMutation } from '@/queries/modules'
+import type {
+  BgpCommunity,
+  DohProfile,
+  DohResolverPolicy,
+  ModuleCreate,
+  ModuleRow,
+  ModuleType,
+} from '@/types/api'
+
+interface ModuleCreateDialogProps {
+  open: boolean
+  onOpenChange: (open: boolean) => void
+  communities: BgpCommunity[]
+  dohProfiles: DohProfile[]
+  onCreated?: (mod: ModuleRow) => void
+}
+
+/** @see https://reui.io/preview/base/form-7 */
+/** @see https://reui.io/preview/base/sheet-8 */
+
+const MODULE_TYPE_ITEMS: { value: ModuleType; label: string }[] = [
+  { value: 'IP_RANGES', label: moduleTypeRu('IP_RANGES') },
+  { value: 'AS_PREFIXES', label: moduleTypeRu('AS_PREFIXES') },
+  { value: 'CDN_CIDRS', label: moduleTypeRu('CDN_CIDRS') },
+  { value: 'DOMAINS', label: moduleTypeRu('DOMAINS') },
+]
+
+const DOH_POLICY_ITEMS: { value: DohResolverPolicy; label: string }[] = [
+  { value: 'primary_only', label: dohPolicyRu('primary_only') },
+  { value: 'failover', label: dohPolicyRu('failover') },
+  { value: 'union', label: dohPolicyRu('union') },
+]
+
+export function ModuleCreateDialog({
+  open,
+  onOpenChange,
+  communities,
+  dohProfiles,
+  onCreated,
+}: ModuleCreateDialogProps) {
+  const createMutation = useCreateModuleMutation()
+
+  const [type, setType] = useState<ModuleType>('IP_RANGES')
+  const [name, setName] = useState('')
+  const [enabled, setEnabled] = useState(true)
+  const [priority, setPriority] = useState('0')
+  const [refreshIntervalSec, setRefreshIntervalSec] = useState('')
+  const [cronExpr, setCronExpr] = useState('')
+  const [defaultCommunityId, setDefaultCommunityId] = useState<string | null>(null)
+  const [dohResolverPolicy, setDohResolverPolicy] = useState<DohResolverPolicy>('primary_only')
+  const [dohProfileIds, setDohProfileIds] = useState<string[]>([])
+
+  const isDomains = type === 'DOMAINS'
+
+  useEffect(() => {
+    if (!open) return
+    setType('IP_RANGES')
+    setName('')
+    setEnabled(true)
+    setPriority('0')
+    setRefreshIntervalSec('')
+    setCronExpr('')
+    setDefaultCommunityId(null)
+    setDohResolverPolicy('primary_only')
+    setDohProfileIds([])
+  }, [open])
+
+  function toggleDohProfile(id: string, checked: boolean) {
+    setDohProfileIds((prev) => {
+      if (checked) {
+        if (prev.includes(id)) return prev
+        return [...prev, id]
+      }
+      return prev.filter((x) => x !== id)
+    })
+  }
+
+  async function save() {
+    const trimmedName = name.trim()
+    if (!trimmedName) {
+      toast.error('Укажите название модуля')
+      return
+    }
+
+    const priorityNum = Number(priority)
+    if (!Number.isFinite(priorityNum) || !Number.isInteger(priorityNum)) {
+      toast.error('Приоритет должен быть целым числом')
+      return
+    }
+
+    let refresh: number | undefined
+    if (refreshIntervalSec.trim() !== '') {
+      const n = Number(refreshIntervalSec)
+      if (!Number.isFinite(n) || !Number.isInteger(n) || n < 0) {
+        toast.error('Интервал обновления должен быть целым числом ≥ 0')
+        return
+      }
+      refresh = n
+    }
+
+    const body: ModuleCreate = {
+      type,
+      name: trimmedName,
+      enabled,
+      priority: priorityNum,
+    }
+    if (refresh !== undefined) {
+      body.refresh_interval_sec = refresh
+    }
+    const cron = cronExpr.trim()
+    if (cron) {
+      body.cron_expr = cron
+    }
+    if (defaultCommunityId) {
+      body.default_community_id = defaultCommunityId
+    }
+    if (isDomains) {
+      body.doh_resolver_policy = dohResolverPolicy
+      body.doh_profile_ids = dohProfileIds
+    }
+
+    try {
+      const created = await createMutation.mutateAsync(body)
+      onOpenChange(false)
+      onCreated?.(created)
+    } catch {
+      // toast in mutation
+    }
+  }
+
+  return (
+    <FormDrawer
+      open={open}
+      onOpenChange={onOpenChange}
+      title="Новый модуль"
+      description="Тип задаётся один раз. Записи добавляются на карточке модуля."
+      className="sm:max-w-md"
+      footer={
+        <>
+          <Button variant="outline" type="button" onClick={() => onOpenChange(false)}>
+            Отмена
+          </Button>
+          <LoadingButton type="button" loading={createMutation.isPending} onClick={() => void save()}>
+            Создать
+          </LoadingButton>
+        </>
+      }
+    >
+      <SelectField
+        id="mod-create-type"
+        label="Тип"
+        items={MODULE_TYPE_ITEMS}
+        value={type}
+        onValueChange={(v) => {
+          if (v) setType(v)
+        }}
+      />
+
+      <div className="flex flex-col gap-2">
+        <Label htmlFor="mod-create-name">Название</Label>
+        <Input
+          id="mod-create-name"
+          value={name}
+          onChange={(e) => setName(e.target.value)}
+          placeholder="Имя модуля"
+        />
+      </div>
+
+      <div className="flex flex-row items-center justify-between gap-4 rounded-lg border border-border bg-muted/30 p-3">
+        <div className="grid min-w-0 flex-1 gap-1 pr-2">
+          <Label htmlFor="mod-create-enabled">Включён</Label>
+          <p className="text-xs text-muted-foreground">
+            Выключенный модуль не участвует в обновлении и применении.
+          </p>
+        </div>
+        <Checkbox
+          id="mod-create-enabled"
+          checked={enabled}
+          onCheckedChange={(v) => setEnabled(v === true)}
+        />
+      </div>
+
+      <div className="flex flex-col gap-2">
+        <Label htmlFor="mod-create-priority">Приоритет</Label>
+        <Input
+          id="mod-create-priority"
+          type="number"
+          value={priority}
+          onChange={(e) => setPriority(e.target.value)}
+        />
+      </div>
+
+      <div className="flex flex-col gap-2">
+        <Label htmlFor="mod-create-interval">Интервал обновления (сек)</Label>
+        <Input
+          id="mod-create-interval"
+          type="number"
+          min={0}
+          placeholder="пусто = по умолчанию"
+          value={refreshIntervalSec}
+          onChange={(e) => setRefreshIntervalSec(e.target.value)}
+        />
+      </div>
+
+      <div className="flex flex-col gap-2">
+        <Label htmlFor="mod-create-cron">Cron (опционально)</Label>
+        <Input
+          id="mod-create-cron"
+          placeholder="0 * * * *"
+          value={cronExpr}
+          onChange={(e) => setCronExpr(e.target.value)}
+        />
+      </div>
+
+      <CommunitySelect
+        id="mod-create-community"
+        label="Community по умолчанию"
+        value={defaultCommunityId}
+        onValueChange={setDefaultCommunityId}
+        communities={communities}
+        nullable
+      />
+
+      {isDomains ? (
+        <>
+          <SelectField
+            id="mod-create-doh-policy"
+            label="Политика DoH"
+            items={DOH_POLICY_ITEMS}
+            value={dohResolverPolicy}
+            onValueChange={(v) => {
+              if (v) setDohResolverPolicy(v)
+            }}
+          />
+
+          <div className="flex flex-col gap-2">
+            <Label>DoH профили</Label>
+            {dohProfiles.length === 0 ? (
+              <p className="text-muted-foreground text-sm">Нет профилей в справочнике</p>
+            ) : (
+              <div className="flex flex-col gap-2 rounded-lg border border-border p-3">
+                {dohProfiles.map((p) => {
+                  const checked = dohProfileIds.includes(p.id)
+                  return (
+                    <label
+                      key={p.id}
+                      htmlFor={`mod-create-doh-${p.id}`}
+                      className="flex cursor-pointer items-start gap-3"
+                    >
+                      <Checkbox
+                        id={`mod-create-doh-${p.id}`}
+                        checked={checked}
+                        onCheckedChange={(v) => toggleDohProfile(p.id, v === true)}
+                        className="mt-0.5"
+                      />
+                      <span className="flex min-w-0 flex-col gap-0.5">
+                        <span className="text-sm font-medium">
+                          {dohProfileShortLabel(p.id, dohProfiles)}
+                        </span>
+                        <span className="text-muted-foreground truncate text-xs" title={p.url}>
+                          {p.url}
+                        </span>
+                      </span>
+                    </label>
+                  )
+                })}
+              </div>
+            )}
+          </div>
+        </>
+      ) : null}
+    </FormDrawer>
+  )
+}

apps/web/src/components/operations/operations-jobs-grid.tsx

@@ -43,7 +43,6 @@ export function OperationsJobsGrid({
         cell: ({ row }) => (
           <DataGridPrimaryCell
             title={jobKindRu(row.original.kind)}
-            accent="mono"
             subtitle={
               row.original.meta?.module_id
                 ? (nameById.get(String(row.original.meta.module_id)) ??

apps/web/src/components/patterns/projects-empty-state.tsx

@@ -1,21 +1,28 @@
-import { Link } from '@tanstack/react-router'
 import { Boxes, Plus } from 'lucide-react'
 
 import { IllustratedEmptyState } from '@/components/patterns/illustrated-empty-state'
 import { Button } from '@evobgp/ui/components/button'
 
 /** empty-state-3 pattern for first module. */
-export function ProjectsEmptyState() {
+export function ProjectsEmptyState({
+  canCreate = true,
+  onCreate,
+}: {
+  canCreate?: boolean
+  onCreate?: () => void
+}) {
   return (
     <IllustratedEmptyState
       icon={Boxes}
       title="Создайте первый модуль"
       description="Модули задают источники префиксов: AS, CDN, домены и IP-диапазоны."
       action={
-        <Button size="sm" render={<Link to="/modules/new" />}>
+        canCreate && onCreate ? (
-          <Plus />
+          <Button size="sm" onClick={onCreate}>
-          Новый модуль
+            <Plus />
-        </Button>
+            Новый модуль
+          </Button>
+        ) : undefined
       }
     />
   )

apps/web/src/components/schedule/schedule-agenda-panel.tsx

@@ -16,7 +16,7 @@ import {
   SelectValue,
 } from '@evobgp/ui/components/select'
 import { cn } from '@evobgp/ui/lib/utils'
-import { jobKindRu } from '@/lib/ui-labels'
+import { isRefreshJobKind, jobKindRu } from '@/lib/ui-labels'
 import type { JobRow } from '@/types/api'
 
 import { ScheduleCalendarView } from './schedule-calendar-view'
@@ -34,7 +34,7 @@ function jobTimestamp(job: JobRow): string | undefined {
 }
 
 function matchesFilter(job: JobRow, filter: JobFilter): boolean {
-  if (filter === 'refresh') return job.kind === 'module_refresh'
+  if (filter === 'refresh') return isRefreshJobKind(job.kind)
   if (filter === 'failed')
     return ['failed', 'error', 'cancelled'].includes(job.status.toLowerCase())
   return true

apps/web/src/components/schedule/schedule-jobs-card.tsx

@@ -4,6 +4,7 @@ import { FrameDataGrid } from '@/components/reui-kit'
 import { QueryState } from '@/components/query-state'
 import { TableSkeleton } from '@/components/skeletons'
 import { Tabs, TabsList, TabsTrigger } from '@evobgp/ui/components/tabs'
+import { isRefreshJobKind } from '@/lib/ui-labels'
 import type { JobRow } from '@/types/api'
 
 import { ScheduleJobsGrid } from './schedule-jobs-grid'
@@ -11,7 +12,7 @@ import { ScheduleJobsGrid } from './schedule-jobs-grid'
 type JobTab = 'all' | 'refresh' | 'failed'
 
 function filterJobs(items: JobRow[], tab: JobTab): JobRow[] {
-  if (tab === 'refresh') return items.filter((j) => j.kind === 'module_refresh')
+  if (tab === 'refresh') return items.filter((j) => isRefreshJobKind(j.kind))
   if (tab === 'failed')
     return items.filter((j) => ['failed', 'error', 'cancelled'].includes(j.status.toLowerCase()))
   return items
@@ -20,7 +21,7 @@ function filterJobs(items: JobRow[], tab: JobTab): JobRow[] {
 function tabCounts(items: JobRow[]) {
   return {
     all: items.length,
-    refresh: items.filter((j) => j.kind === 'module_refresh').length,
+    refresh: items.filter((j) => isRefreshJobKind(j.kind)).length,
     failed: items.filter((j) => ['failed', 'error', 'cancelled'].includes(j.status.toLowerCase()))
       .length,
   }

apps/web/src/components/schedule/schedule-jobs-grid.tsx

@@ -21,7 +21,7 @@ export function ScheduleJobsGrid({
       {
         accessorKey: 'kind',
         header: ({ column }) => <DataGridColumnHeader column={column} title="Вид" />,
-        cell: ({ row }) => <DataGridPrimaryCell title={jobKindRu(row.original.kind)} accent="mono" />,
+        cell: ({ row }) => <DataGridPrimaryCell title={jobKindRu(row.original.kind)} />,
         meta: { headerTitle: 'Вид' },
       },
       {

apps/web/src/lib/ui-labels.ts

@@ -30,9 +30,28 @@ export function moduleTypeRu(type: string): string {
 
 const JOB_KIND_RU: Record<string, string> = {
   module_refresh: 'Обновление модуля',
+  tenant_refresh: 'Обновление тенанта',
+  peer_reconcile: 'Согласование пиров',
+  deploy_apply: 'Применение на спикеры',
   apply: 'Применение конфигурации',
+  revision_rollback: 'Откат ревизии',
   rollback: 'Откат ревизии',
   bird_reload: 'Перезагрузка BIRD',
+  postgres_metrics_refresh: 'Метрики PostgreSQL',
+  postgres_slow_query_aggregate: 'Медленные запросы PostgreSQL',
+  postgres_table_bloat_estimate: 'Bloat таблиц PostgreSQL',
+  postgres_index_usage_analyze: 'Использование индексов PostgreSQL',
+  postgres_autovacuum_lag_detect: 'Отставание autovacuum',
+  postgres_vacuum: 'VACUUM PostgreSQL',
+  postgres_vacuum_analyze: 'VACUUM ANALYZE PostgreSQL',
+  postgres_analyze: 'ANALYZE PostgreSQL',
+  postgres_reindex: 'REINDEX PostgreSQL',
+  postgres_cleanup: 'Очистка PostgreSQL',
+  maintenance_policy_run: 'Политика обслуживания',
+}
+
+export function isRefreshJobKind(kind: string): boolean {
+  return kind === 'module_refresh' || kind === 'tenant_refresh'
 }
 
 export function jobKindRu(kind: string): string {

apps/web/src/queries/modules.ts

@@ -4,6 +4,7 @@ import { toast } from 'sonner'
 import { apiJSON, apiMutate } from '@/lib/api-client'
 import { overviewKeys } from '@/queries/overview'
 import type {
+  ModuleCreate,
   ModulePatch,
   ModuleRow,
   ModulesResponse,
@@ -64,6 +65,18 @@ export function moduleEntriesQueryOptions(id: string, type: ModuleRow['type']) {
   })
 }
 
+export function useCreateModuleMutation() {
+  const qc = useQueryClient()
+  return useMutation({
+    mutationFn: (body: ModuleCreate) => apiMutate<ModuleRow>('/v1/modules', 'POST', body),
+    onSuccess: (data) => {
+      toast.success('Модуль создан')
+      invalidateModules(qc, data.id)
+    },
+    onError: (e) => toast.error(e instanceof Error ? e.message : 'Не удалось создать модуль'),
+  })
+}
+
 export function useUpdateModuleMutation() {
   const qc = useQueryClient()
   return useMutation({

apps/web/src/routes/_auth/modules/index.tsx

@@ -1,4 +1,4 @@
-import { Link, createFileRoute } from '@tanstack/react-router'
+import { createFileRoute } from '@tanstack/react-router'
 import { useQuery } from '@tanstack/react-query'
 import { Plus, RefreshCw } from 'lucide-react'
 
@@ -6,18 +6,45 @@ import { Button } from '@evobgp/ui/components/button'
 
 import { FrameDataGrid } from '@/components/reui-kit'
 import { ProjectsEmptyState } from '@/components/patterns/projects-empty-state'
+import { ModuleCreateDialog } from '@/components/modules/module-create-dialog'
 import { ModulesListGrid } from '@/components/modules/modules-list-grid'
 import { PageHeader } from '@/components/page-header'
 import { QueryState } from '@/components/query-state'
 import { TableSkeleton } from '@/components/skeletons'
+import { sessionCanWriteModules } from '@/lib/auth'
+import { authSessionQueryOptions } from '@/queries/auth'
+import {
+  directoriesCommunitiesQueryOptions,
+  directoriesDohQueryOptions,
+} from '@/queries/directories'
 import { modulesListQueryOptions } from '@/queries/modules'
 
+function parseCreateFlag(value: unknown): boolean {
+  return value === true || value === '1' || value === 'true'
+}
+
 export const Route = createFileRoute('/_auth/modules/')({
   component: ModulesListComponent,
+  validateSearch: (search: Record<string, unknown>): { create?: boolean } => {
+    if (parseCreateFlag(search.create)) return { create: true }
+    return {}
+  },
 })
 
 function ModulesListComponent() {
+  const { create } = Route.useSearch()
+  const navigate = Route.useNavigate()
   const query = useQuery(modulesListQueryOptions())
+  const sessionQ = useQuery(authSessionQueryOptions())
+  const canWrite = sessionCanWriteModules(sessionQ.data)
+  const communitiesQ = useQuery(directoriesCommunitiesQueryOptions())
+  const dohQ = useQuery(directoriesDohQueryOptions())
+
+  const createOpen = canWrite && create === true
+
+  function setCreateOpen(open: boolean) {
+    void navigate({ search: open ? { create: true } : {}, replace: true })
+  }
 
   return (
     <div className="flex flex-col gap-6">
@@ -42,10 +69,12 @@ function ModulesListComponent() {
       <FrameDataGrid
         title="Все модули"
         actions={
-          <Button size="sm" render={<Link to="/modules/new" />}>
+          canWrite ? (
-            <Plus />
+            <Button size="sm" onClick={() => setCreateOpen(true)}>
-            Создать
+              <Plus />
-          </Button>
+              Создать
+            </Button>
+          ) : undefined
         }
       >
         <QueryState
@@ -54,7 +83,12 @@ function ModulesListComponent() {
           isError={query.isError}
           error={query.error}
           empty={query.data?.items?.length === 0}
-          emptyContent={<ProjectsEmptyState />}
+          emptyContent={
+            <ProjectsEmptyState
+              canCreate={canWrite}
+              onCreate={() => setCreateOpen(true)}
+            />
+          }
           skeleton={<TableSkeleton rows={6} cols={5} />}
           onRetry={() => query.refetch()}
         >
@@ -66,6 +100,16 @@ function ModulesListComponent() {
           )}
         </QueryState>
       </FrameDataGrid>
+
+      <ModuleCreateDialog
+        open={createOpen}
+        onOpenChange={setCreateOpen}
+        communities={communitiesQ.data?.items ?? []}
+        dohProfiles={dohQ.data?.items ?? []}
+        onCreated={(mod) => {
+          void navigate({ to: '/modules/$moduleId', params: { moduleId: mod.id } })
+        }}
+      />
     </div>
   )
 }

apps/web/src/routes/_auth/modules/new.tsx

@@ -1,42 +1,7 @@
-import { createFileRoute, Link } from '@tanstack/react-router'
+import { createFileRoute, redirect } from '@tanstack/react-router'
-import { Button } from '@evobgp/ui/components/button'
-import { PageHeader } from '@/components/page-header'
-import {
-  Frame,
-  FrameDescription,
-  FrameHeader,
-  FramePanel,
-  FrameTitle,
-} from '@/components/reui/frame'
 
 export const Route = createFileRoute('/_auth/modules/new')({
-  component: NewModuleComponent,
+  beforeLoad: () => {
+    throw redirect({ to: '/modules', search: { create: true } })
+  },
 })
-
-function NewModuleComponent() {
-  return (
-    <div className="mx-auto flex max-w-3xl flex-col gap-6">
-      <PageHeader
-        title="Новый модуль"
-        description="Создание модуля — через API или будущая форма"
-      />
-      <Frame dense spacing="sm">
-        <FrameHeader>
-          <FrameTitle>Создание через API</FrameTitle>
-          <FrameDescription>
-            Форма в UI появится позже. Сейчас модуль можно создать запросом ниже.
-          </FrameDescription>
-        </FrameHeader>
-        <FramePanel className="flex flex-col gap-3 text-sm text-muted-foreground">
-          <pre className="overflow-x-auto rounded-md border bg-muted/40 p-3 font-mono text-xs">
-{`POST /v1/modules
-{ "type": "DOMAINS", "name": "Мой список" }`}
-          </pre>
-          <Button variant="outline" size="sm" className="self-start" render={<Link to="/modules" />}>
-            Назад к списку
-          </Button>
-        </FramePanel>
-      </Frame>
-    </div>
-  )
-}

deploy/docker/README.md

@@ -14,8 +14,8 @@ BuildKit кэширует `/go/pkg/mod`, `~/.cache/go-build` и pnpm store че
 
 | Образ | Runtime base | Заметка |
 |-------|----------------|---------|
-| scheduler, ingest, render, deploy, node | `gcr.io/distroless/static-debian12:nonroot` | static Go (`CGO_ENABLED=0`), без shell |
+| scheduler, ingest, render | `gcr.io/distroless/static-debian12:nonroot` | static Go (`CGO_ENABLED=0`), без shell |
-| api, all | `debian:bookworm-slim` + `birdc` | только клиент birdc, без демона `bird` |
+| api, all, deploy, node | `debian:bookworm-slim` + `bird` + `birdc` | `bird -p` (parse-check) и `birdc`; демон не запускается |
 | agent | тот же Ubuntu+bird2, что bird2 | общие слои с `evobgp-bird2` |
 | bird2 | Ubuntu Noble + пакет bird2 | |
 | web, web-all | `nginx:1.27-alpine` | `worker_processes 1` |

deploy/docker/docker-bake.hcl

@@ -236,13 +236,13 @@ target "evobgp-render" {
 }
 
 target "evobgp-deploy" {
-  inherits = ["_go-runtime"]
+  inherits = ["_go-runtime-birdc"]
   args     = { BIN = "evobgp-deploy" }
   tags     = image-tags("evobgp-deploy")
 }
 
 target "evobgp-node" {
-  inherits = ["_go-runtime"]
+  inherits = ["_go-runtime-birdc"]
   args     = { BIN = "evobgp-node" }
   tags     = image-tags("evobgp-node")
 }

deploy/docker/gobinary/Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1.7
 # Универсальная сборка бинарей cmd/* (ARG BIN) или всех сразу (target build-all).
-# Воркеры (runtime): distroless static. api/all (runtime-birdc): debian-slim + birdc.
+# Воркеры (runtime): distroless static. api/all/deploy/node (runtime-birdc): debian-slim + bird + birdc.
 # CI: docker buildx bake -f deploy/docker/docker-bake.hcl
 ARG BASE_GOLANG=docker.io/library/golang:1.24-alpine
 ARG BASE_DEBIAN=docker.io/library/debian:bookworm-slim
@@ -57,14 +57,15 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
     && BIRD_VERSION="${BIRD_VERSION}" /tmp/bird-from-source.sh \
     && rm -f /tmp/bird-from-source.sh
 
-# scheduler / ingest / render / deploy / node — static Go, без shell.
+# scheduler / ingest / render — static Go, без shell.
 FROM ${BASE_DISTROLESS} AS runtime
 ARG BIN=evobgp-api
 COPY --from=build-all /out/${BIN} /usr/local/bin/evobgp
 EXPOSE 8080
 ENTRYPOINT ["/usr/local/bin/evobgp"]
 
-# api / all — birdc (readline + ncurses). Только клиент birdc, без демона bird.
+# api / all / deploy / node — bird -p (parse-check) + birdc configure.
+# Демон BIRD в этом контейнере не запускается; процесс bird — в образе evobgp-bird2.
 FROM ${BASE_DEBIAN} AS runtime-birdc
 RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
     --mount=type=cache,target=/var/lib/apt,sharing=locked \
@@ -74,6 +75,7 @@ RUN --mount=type=cache,target=/var/cache/apt,sharing=locked \
     && rm -rf /var/lib/apt/lists/*
 ARG BIN=evobgp-api
 COPY --from=build-all /out/${BIN} /usr/local/bin/evobgp
+COPY --from=birdc /usr/local/sbin/bird /usr/local/sbin/bird
 COPY --from=birdc /usr/local/sbin/birdc /usr/local/sbin/birdc
 EXPOSE 8080
 ENTRYPOINT ["/usr/local/bin/evobgp"]

docs/quickstart.md

@@ -39,7 +39,7 @@ docker login git.shx.one
 
 | Образ | Назначение | Страница пакета (пример) | Pull |
 |--------|------------|--------------------------|------|
-| `evobgp-api` | HTTP API (с `birdc` в образе) | [packages/…/evobgp-api](https://git.shx.one/denozord/-/packages/container/evobgp-api/latest) | `docker pull git.shx.one/denozord/evobgp-api:latest` |
+| `evobgp-api` | HTTP API (с `bird`/`birdc` в образе для parse-check) | [packages/…/evobgp-api](https://git.shx.one/denozord/-/packages/container/evobgp-api/latest) | `docker pull git.shx.one/denozord/evobgp-api:latest` |
 | `evobgp-all` | Монолит microVPS: API + in-process воркеры scheduler/ingest/render/deploy | [packages/…/evobgp-all](https://git.shx.one/denozord/-/packages/container/evobgp-all/latest) | `docker pull git.shx.one/denozord/evobgp-all:latest` |
 | `evobgp-scheduler` | Планировщик (reference) | [packages/…/evobgp-scheduler](https://git.shx.one/denozord/-/packages/container/evobgp-scheduler/latest) | `docker pull git.shx.one/denozord/evobgp-scheduler:latest` |
 | `evobgp-ingest` | Ingest CDN / ETag | [packages/…/evobgp-ingest](https://git.shx.one/denozord/-/packages/container/evobgp-ingest/latest) | `docker pull git.shx.one/denozord/evobgp-ingest:latest` |

internal/jobs/worker_test.go

@@ -10,6 +10,7 @@ import (
 func TestParallelModuleRefresh_CoalescesDeployApply(t *testing.T) {
 	t.Setenv("EVOBGP_ASN_RESOLVE", "0")
 	t.Setenv("EVOBGP_BIRD_ACTIVE_DIR", "") // skip bird binary path in deploy_apply
+	t.Setenv("EVOBGP_JOB_MAX_CONCURRENT", "8")
 
 	m := store.NewMemory()
 	m.SeedDemo()
@@ -35,8 +36,15 @@ func TestParallelModuleRefresh_CoalescesDeployApply(t *testing.T) {
 		t.Fatal(err)
 	}
 
+	// Hold workers until both jobs are enqueued so inflightRefresh=2 before either
+	// finishModuleRefreshSuccess. Otherwise a fast ingest can finalize+deploy before
+	// the second Enqueue — sequential refreshes correctly produce two deploy_apply jobs.
+	start := make(chan struct{})
 	wk := &Worker{Store: m}
-	reg := NewRegistry(wk.Process)
+	reg := NewRegistry(func(j *Job) {
+		<-start
+		wk.Process(j)
+	})
 	wk.Registry = reg
 
 	mid1 := modIP
@@ -47,6 +55,7 @@ func TestParallelModuleRefresh_CoalescesDeployApply(t *testing.T) {
 	if _, _, err := reg.Enqueue(tenant, KindModuleRefresh, nil, &mid2, map[string]any{"module_id": mod2.ID}); err != nil {
 		t.Fatal(err)
 	}
+	close(start)
 
 	waitSucceededJobsByKindCount(t, reg, tenant, KindModuleRefresh, 2)
 

internal/store/memory.go

@@ -414,6 +414,9 @@ func (m *Memory) ListModules(tenantID string) []*Module {
 		}
 		return out[i].Name < out[j].Name
 	})
+	for i := range out {
+		out[i] = cloneModule(out[i])
+	}
 	return out
 }
 
@@ -446,7 +449,7 @@ func (m *Memory) GetModule(tenantID, moduleID string) (*Module, error) {
 	if mod.TenantID != tenantID {
 		return nil, ErrTenantScope
 	}
-	return mod, nil
+	return cloneModule(mod), nil
 }
 
 func (m *Memory) GetRevision(tenantID, revisionID string) (*Revision, error) {
@@ -684,3 +687,24 @@ func (m *Memory) ListRevisions(tenantID, moduleID string, cursor string, limit i
 	}
 	return page, nextCursor, hasMore
 }
+
+func cloneStringPtr(s *string) *string {
+	if s == nil {
+		return nil
+	}
+	v := *s
+	return &v
+}
+
+func cloneModule(m *Module) *Module {
+	if m == nil {
+		return nil
+	}
+	cp := *m
+	cp.DefaultCommunityID = cloneStringPtr(m.DefaultCommunityID)
+	cp.DohProfileID = cloneStringPtr(m.DohProfileID)
+	cp.DohProfileIDs = append([]string(nil), m.DohProfileIDs...)
+	cp.LastRefreshedAt = cloneTime(m.LastRefreshedAt)
+	cp.DeletedAt = cloneTime(m.DeletedAt)
+	return &cp
+}

internal/store/memory_crud.go

@@ -38,7 +38,7 @@ func (m *Memory) CreateModule(tenantID string, in *Module) (*Module, error) {
 	}
 	NormalizeModuleDoh(mod)
 	m.modules[id] = mod
-	return mod, nil
+	return cloneModule(mod), nil
 }
 
 func (m *Memory) UpdateModule(tenantID, moduleID string, patch *ModulePatch) (*Module, error) {
@@ -74,12 +74,14 @@ func (m *Memory) UpdateModule(tenantID, moduleID string, patch *ModulePatch) (*M
 			mod.DefaultCommunityID = &v
 		}
 	}
-	ApplyModuleDohPatch(mod, patch)
+	if patch.DohProfileIDs != nil || patch.DohProfileID != nil || patch.DohResolverPolicy != nil {
+		ApplyModuleDohPatch(mod, patch)
+	}
 	if patch.LastRefreshedAt != nil {
 		t := patch.LastRefreshedAt.UTC()
 		mod.LastRefreshedAt = &t
 	}
-	return mod, nil
+	return cloneModule(mod), nil
 }
 
 func (m *Memory) SoftDeleteModule(tenantID, moduleID string) error {