alexei.dolgolyov
d8ab22876f
Build / build (push) Successful in 10m41s
End-to-end extraction of the Instance concept. After this commit:
* internal/store/instances.go — DELETED
* internal/store/models.go — Instance struct gone, ProxyRoute moved here
* containers table is the single source of truth for project/stack/site
container state. instances table is dropped via DROP TABLE migration
(idempotent; re-runnable on every boot).
* Legacy tinyforge.project / tinyforge.stage / tinyforge.instance-id
Docker labels are no longer emitted; only tinyforge.workload.{id,kind},
tinyforge.role, and tinyforge.managed are stamped on new containers.
Backend rewrites:
- internal/deployer: executeDeploy + blueGreenDeploy + rollback +
promote use store.Container natively. New
removeContainer() replaces removeInstance().
enforceMaxInstances reads via
ListContainersByStageID.
- internal/reconciler: legacy tinyforge.instance-id dispatch removed;
upsertByWorkloadLabel now finds existing rows
by docker container ID first and falls back to
the deterministic workloadID:role key.
- internal/stale/scanner: Scan + new FindStaleContainers walk the
containers table; emit StaleContainer JSON.
- internal/stats/collector: ListContainers replaces ListAllInstances.
- internal/webhook/handler: workload-secret lookup tried first; falls back
to project / static_site secret column.
- internal/api: instances.go, stale.go, stats.go, stats_history.go,
projects.go, settings.go, docker.go, dns.go all read /
write through Container.
Docker layer:
- ManagedContainer exposes WorkloadID/Kind/Role from the canonical labels.
- ListContainers filters by tinyforge.managed=true.
- Network creation uses LabelManaged instead of LabelProject.
Frontend:
- Instance type is now a Container alias; .status → .state,
.last_alive_at → .last_seen_at.
- InstanceCard takes stageId as a prop (no longer derived from Instance).
- StaleContainer JSON shape rewritten: { container, workload_name, role,
days_stale }. StaleContainerCard + /containers/stale page updated.
- ProjectCard / homepage / SystemHealthCard filter by .state.
The migration loop now tolerates "no such table" alongside "duplicate
column" / "already exists" so obsolete ALTER TABLE entries targeting the
dropped instances table no-op cleanly on first boot.
Tests: store + deployer + reconciler + webhook + staticsite + notify all
still pass. Frontend svelte-check: zero errors.
64 lines
2.3 KiB
Go
64 lines
2.3 KiB
Go
package deployer
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
"log/slog"
|
|
)
|
|
|
|
// rollback cleans up a failed deployment by removing the container,
|
|
// deleting the proxy route, and updating the instance status.
|
|
// Errors during rollback are logged but do not prevent other cleanup steps.
|
|
func (d *Deployer) rollback(ctx context.Context, deployID string, containerID string, proxyRouteID string, instanceID string) {
|
|
d.logDeploy(deployID, "Rolling back failed deployment", "warn")
|
|
|
|
// Remove the container if it was created.
|
|
if containerID != "" {
|
|
if err := d.docker.RemoveContainer(ctx, containerID, true); err != nil {
|
|
slog.Warn("rollback: remove container", "container_id", containerID, "error", err)
|
|
d.logDeploy(deployID, fmt.Sprintf("Rollback: failed to remove container: %v", err), "error")
|
|
} else {
|
|
d.logDeploy(deployID, "Rollback: container removed", "info")
|
|
}
|
|
}
|
|
|
|
// Delete the proxy route if it was created.
|
|
if proxyRouteID != "" {
|
|
if err := d.proxy.DeleteRoute(ctx, proxyRouteID); err != nil {
|
|
slog.Warn("rollback: delete proxy route", "route_id", proxyRouteID, "error", err)
|
|
d.logDeploy(deployID, fmt.Sprintf("Rollback: failed to delete proxy route: %v", err), "error")
|
|
} else {
|
|
d.logDeploy(deployID, "Rollback: proxy route deleted", "info")
|
|
}
|
|
}
|
|
|
|
// Clean up DNS record if the container had a subdomain. instanceID is
|
|
// the container row ID (same UUID either way) — read from containers.
|
|
if instanceID != "" {
|
|
c, err := d.store.GetContainerByID(instanceID)
|
|
if err == nil && c.Subdomain != "" {
|
|
settings, settingsErr := d.store.GetSettings()
|
|
if settingsErr != nil {
|
|
slog.Warn("rollback: failed to get settings for DNS cleanup", "error", settingsErr)
|
|
} else if settings.Domain != "" {
|
|
fqdn := c.Subdomain + "." + settings.Domain
|
|
d.removeDNS(ctx, fqdn, deployID)
|
|
}
|
|
}
|
|
}
|
|
|
|
// Mark the container row as failed if it was created.
|
|
if instanceID != "" {
|
|
if err := d.store.UpdateContainerState(instanceID, "failed"); err != nil {
|
|
slog.Warn("rollback: update container state", "id", instanceID, "error", err)
|
|
}
|
|
}
|
|
|
|
// Mark deploy as rolled back.
|
|
if err := d.store.UpdateDeployStatus(deployID, "rolled_back", "deployment failed, rolled back"); err != nil {
|
|
slog.Warn("rollback: update deploy status", "deploy_id", deployID, "error", err)
|
|
}
|
|
|
|
d.logDeploy(deployID, "Rollback complete", "info")
|
|
}
|