mirror of
https://github.com/Dvorinka/Containr.git
synced 2026-10-28 15:51:26 +00:00
Compare commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9de586f177 |
No files matched your search
+12
@@ -301,6 +301,18 @@ and wired refs, one click or one CLI call.
|
|||||||
documented ceilings. Remaining: `scheduling_rules` affinity
|
documented ceilings. Remaining: `scheduling_rules` affinity
|
||||||
policies, deployment status reported back from agent
|
policies, deployment status reported back from agent
|
||||||
results, spread weighting by real capacity.
|
results, spread weighting by real capacity.
|
||||||
|
- [x] **Agent self-upgrade** — `POST /agents/:id/upgrade` enqueues a
|
||||||
|
`self_upgrade` command carrying platform + sha256 + server version;
|
||||||
|
the agent downloads its replacement from `GET /agents/download/
|
||||||
|
:platform`, verifies the checksum, sanity-checks `--version`,
|
||||||
|
atomically swaps its own executable, reports the result, then
|
||||||
|
re-execs (`syscall.Exec`) — no supervisor needed. Agents now stamp
|
||||||
|
`main.version` via ldflags at image build and report it at
|
||||||
|
register/heartbeat (`node_agents.version` refreshes on re-register;
|
||||||
|
older agents keep their stored value). Surfaces: `nodes upgrade`
|
||||||
|
CLI, `containr_nodes_upgrade` MCP (confirm-gated), node-detail page
|
||||||
|
button (online-gated). Ceilings: linux amd64/arm64 only; agents on
|
||||||
|
other platforms get a `NO_BINARY` 409.
|
||||||
- [🟡] **Build-on-node** — private registry pulls shipped: the dispatch
|
- [🟡] **Build-on-node** — private registry pulls shipped: the dispatch
|
||||||
payload carries the project owner's `registries` credentials for the
|
payload carries the project owner's `registries` credentials for the
|
||||||
image host; the agent `docker login`s for the pull and logs out after,
|
image host; the agent `docker login`s for the pull and logs out after,
|
||||||
|
|||||||
@@ -14,8 +14,8 @@ RUN CGO_ENABLED=0 GOOS=linux go build -a -installsuffix cgo \
|
|||||||
-ldflags "-X containr/internal/api.Version=${VERSION}" -o main cmd/server/main.go
|
-ldflags "-X containr/internal/api.Version=${VERSION}" -o main cmd/server/main.go
|
||||||
|
|
||||||
# Node-agent binaries served by the API for SSH/bootstrap installs.
|
# Node-agent binaries served by the API for SSH/bootstrap installs.
|
||||||
RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -o /agents/containr-agent-linux-amd64 ./cmd/agent && \
|
RUN CGO_ENABLED=0 GOOS=linux GOARCH=amd64 go build -ldflags "-X main.version=${VERSION}" -o /agents/containr-agent-linux-amd64 ./cmd/agent && \
|
||||||
CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -o /agents/containr-agent-linux-arm64 ./cmd/agent
|
CGO_ENABLED=0 GOOS=linux GOARCH=arm64 go build -ldflags "-X main.version=${VERSION}" -o /agents/containr-agent-linux-arm64 ./cmd/agent
|
||||||
|
|
||||||
# Build embedded Better Auth runtime dependencies
|
# Build embedded Better Auth runtime dependencies
|
||||||
FROM node:22-alpine AS auth-builder
|
FROM node:22-alpine AS auth-builder
|
||||||
|
|||||||
@@ -3,14 +3,18 @@ package main
|
|||||||
import (
|
import (
|
||||||
"bytes"
|
"bytes"
|
||||||
"context"
|
"context"
|
||||||
|
"crypto/sha256"
|
||||||
|
"encoding/hex"
|
||||||
"encoding/json"
|
"encoding/json"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"io"
|
||||||
"log"
|
"log"
|
||||||
"net"
|
"net"
|
||||||
"net/http"
|
"net/http"
|
||||||
"os"
|
"os"
|
||||||
"os/exec"
|
"os/exec"
|
||||||
|
"path/filepath"
|
||||||
"runtime"
|
"runtime"
|
||||||
"strconv"
|
"strconv"
|
||||||
"strings"
|
"strings"
|
||||||
@@ -104,7 +108,15 @@ type registerResponse struct {
|
|||||||
Status string `json:"status"`
|
Status string `json:"status"`
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// version is stamped at build time via -ldflags "-X main.version=…".
|
||||||
|
// The server reports it on upgrades so agents can show what they run.
|
||||||
|
var version = "dev"
|
||||||
|
|
||||||
func main() {
|
func main() {
|
||||||
|
if len(os.Args) > 1 && (os.Args[1] == "--version" || os.Args[1] == "version") {
|
||||||
|
fmt.Printf("containr-agent %s\n", version)
|
||||||
|
return
|
||||||
|
}
|
||||||
cfg, err := loadConfig()
|
cfg, err := loadConfig()
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Fatal(err)
|
log.Fatal(err)
|
||||||
@@ -167,6 +179,7 @@ func register(ctx context.Context, client *http.Client, cfg agentConfig) (string
|
|||||||
"ip_address": cfg.IP,
|
"ip_address": cfg.IP,
|
||||||
"port": cfg.Port,
|
"port": cfg.Port,
|
||||||
"capabilities": detectCapabilities(),
|
"capabilities": detectCapabilities(),
|
||||||
|
"version": firstEnv("CONTAINR_AGENT_VERSION", version),
|
||||||
// Always send mesh so a removed interface clears stored state.
|
// Always send mesh so a removed interface clears stored state.
|
||||||
"mesh": detectMeshInterfaces(),
|
"mesh": detectMeshInterfaces(),
|
||||||
}
|
}
|
||||||
@@ -190,7 +203,7 @@ func sendHeartbeat(ctx context.Context, client *http.Client, cfg agentConfig, ag
|
|||||||
"container_count": dockerContainerCount(),
|
"container_count": dockerContainerCount(),
|
||||||
"system_load": readSystemLoad(),
|
"system_load": readSystemLoad(),
|
||||||
"uptime": readSystemUptime(),
|
"uptime": readSystemUptime(),
|
||||||
"version": firstEnv("CONTAINR_AGENT_VERSION", "dev"),
|
"version": firstEnv("CONTAINR_AGENT_VERSION", version),
|
||||||
}
|
}
|
||||||
return postJSON(ctx, client, cfg, "/api/agents/heartbeat", payload, nil)
|
return postJSON(ctx, client, cfg, "/api/agents/heartbeat", payload, nil)
|
||||||
}
|
}
|
||||||
@@ -216,7 +229,13 @@ func processCommands(ctx context.Context, client *http.Client, cfg agentConfig,
|
|||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
for _, item := range list.Commands {
|
for _, item := range list.Commands {
|
||||||
result, runErr := executeCommand(item)
|
var result, reexecPath string
|
||||||
|
var runErr error
|
||||||
|
if item.Type == "self_upgrade" {
|
||||||
|
result, reexecPath, runErr = selfUpgrade(cfg, item.Payload)
|
||||||
|
} else {
|
||||||
|
result, runErr = executeCommand(item)
|
||||||
|
}
|
||||||
status := "completed"
|
status := "completed"
|
||||||
errText := ""
|
errText := ""
|
||||||
if runErr != nil {
|
if runErr != nil {
|
||||||
@@ -232,6 +251,12 @@ func processCommands(ctx context.Context, client *http.Client, cfg agentConfig,
|
|||||||
if err := postJSON(ctx, client, cfg, path, payload, nil); err != nil {
|
if err := postJSON(ctx, client, cfg, path, payload, nil); err != nil {
|
||||||
log.Printf("report command result failed: command=%s err=%v", item.ID, err)
|
log.Printf("report command result failed: command=%s err=%v", item.ID, err)
|
||||||
}
|
}
|
||||||
|
// Re-exec AFTER the result posts — the new binary picks up the loop.
|
||||||
|
if reexecPath != "" {
|
||||||
|
if err := syscall.Exec(reexecPath, os.Args, os.Environ()); err != nil {
|
||||||
|
log.Fatalf("re-exec after upgrade failed: %v", err)
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
return nil
|
return nil
|
||||||
}
|
}
|
||||||
@@ -257,6 +282,67 @@ func executeCommand(item command) (string, error) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// selfUpgrade downloads the agent binary the server bundles for this
|
||||||
|
// platform, verifies it, swaps it in atomically, and returns the path to
|
||||||
|
// re-exec. On any failure the running binary is left untouched.
|
||||||
|
func selfUpgrade(cfg agentConfig, payload map[string]interface{}) (string, string, error) {
|
||||||
|
platform := firstString(stringValue(payload["platform"]), runtime.GOOS+"-"+runtime.GOARCH)
|
||||||
|
|
||||||
|
exe, err := os.Executable()
|
||||||
|
if err != nil {
|
||||||
|
return "", "", fmt.Errorf("resolve own path: %w", err)
|
||||||
|
}
|
||||||
|
if resolved, err := filepath.EvalSymlinks(exe); err == nil {
|
||||||
|
exe = resolved
|
||||||
|
}
|
||||||
|
|
||||||
|
url := fmt.Sprintf("%s/api/agents/download/%s", cfg.APIURL, platform)
|
||||||
|
req, err := http.NewRequest(http.MethodGet, url, nil)
|
||||||
|
if err != nil {
|
||||||
|
return "", "", err
|
||||||
|
}
|
||||||
|
resp, err := (&http.Client{Timeout: 2 * time.Minute}).Do(req)
|
||||||
|
if err != nil {
|
||||||
|
return "", "", fmt.Errorf("download %s: %w", platform, err)
|
||||||
|
}
|
||||||
|
defer resp.Body.Close()
|
||||||
|
if resp.StatusCode != http.StatusOK {
|
||||||
|
return "", "", fmt.Errorf("download %s: server returned %d", platform, resp.StatusCode)
|
||||||
|
}
|
||||||
|
|
||||||
|
newPath := exe + ".new"
|
||||||
|
out, err := os.OpenFile(newPath, os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0o755)
|
||||||
|
if err != nil {
|
||||||
|
return "", "", fmt.Errorf("write %s: %w", newPath, err)
|
||||||
|
}
|
||||||
|
h := sha256.New()
|
||||||
|
if _, err := io.Copy(io.MultiWriter(out, h), resp.Body); err != nil {
|
||||||
|
out.Close()
|
||||||
|
os.Remove(newPath)
|
||||||
|
return "", "", fmt.Errorf("download write: %w", err)
|
||||||
|
}
|
||||||
|
out.Close()
|
||||||
|
|
||||||
|
if want := stringValue(payload["sha256"]); want != "" {
|
||||||
|
if got := hex.EncodeToString(h.Sum(nil)); got != want {
|
||||||
|
os.Remove(newPath)
|
||||||
|
return "", "", fmt.Errorf("sha256 mismatch: got %s want %s", got, want)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// Sanity: the new binary must at least report its version.
|
||||||
|
if verOut, err := exec.Command(newPath, "--version").CombinedOutput(); err != nil {
|
||||||
|
os.Remove(newPath)
|
||||||
|
return "", "", fmt.Errorf("new binary failed sanity check: %s", strings.TrimSpace(string(verOut)))
|
||||||
|
}
|
||||||
|
|
||||||
|
if err := os.Rename(newPath, exe); err != nil {
|
||||||
|
os.Remove(newPath)
|
||||||
|
return "", "", fmt.Errorf("swap binary: %w", err)
|
||||||
|
}
|
||||||
|
return fmt.Sprintf("upgraded to %s (%s)", firstString(stringValue(payload["version"]), "latest"), platform), exe, nil
|
||||||
|
}
|
||||||
|
|
||||||
// dockerPrune runs a bounded docker system prune. Volumes are excluded
|
// dockerPrune runs a bounded docker system prune. Volumes are excluded
|
||||||
// unless the payload explicitly opts in — a stray volume prune destroys
|
// unless the payload explicitly opts in — a stray volume prune destroys
|
||||||
// database data.
|
// database data.
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ import (
|
|||||||
"encoding/json"
|
"encoding/json"
|
||||||
"errors"
|
"errors"
|
||||||
"fmt"
|
"fmt"
|
||||||
|
"io"
|
||||||
"log"
|
"log"
|
||||||
"math"
|
"math"
|
||||||
"net/http"
|
"net/http"
|
||||||
@@ -353,6 +354,7 @@ func (h *NodeAgentHandler) RegisterAgent(c *gin.Context) {
|
|||||||
IPAddress string `json:"ip_address" binding:"required"`
|
IPAddress string `json:"ip_address" binding:"required"`
|
||||||
Port int `json:"port" binding:"required"`
|
Port int `json:"port" binding:"required"`
|
||||||
Capabilities AgentCapabilities `json:"capabilities" binding:"required"`
|
Capabilities AgentCapabilities `json:"capabilities" binding:"required"`
|
||||||
|
Version string `json:"version"`
|
||||||
AuthToken string `json:"auth_token"`
|
AuthToken string `json:"auth_token"`
|
||||||
Mesh map[string]string `json:"mesh"`
|
Mesh map[string]string `json:"mesh"`
|
||||||
}
|
}
|
||||||
@@ -398,7 +400,8 @@ func (h *NodeAgentHandler) RegisterAgent(c *gin.Context) {
|
|||||||
IpAddress: existing.IpAddress,
|
IpAddress: existing.IpAddress,
|
||||||
Port: int32(req.Port),
|
Port: int32(req.Port),
|
||||||
Status: sql.NullString{String: "connecting", Valid: true},
|
Status: sql.NullString{String: "connecting", Valid: true},
|
||||||
Version: existing.Version,
|
// Older agents don't report a version — keep whatever's stored.
|
||||||
|
Version: sql.NullString{String: firstNonEmpty(req.Version, existing.Version.String), Valid: true},
|
||||||
Capabilities: rawJSON(req.Capabilities),
|
Capabilities: rawJSON(req.Capabilities),
|
||||||
Resources: existing.Resources,
|
Resources: existing.Resources,
|
||||||
LastHeartbeat: sql.NullTime{Time: time.Now(), Valid: true},
|
LastHeartbeat: sql.NullTime{Time: time.Now(), Valid: true},
|
||||||
@@ -450,7 +453,7 @@ func (h *NodeAgentHandler) RegisterAgent(c *gin.Context) {
|
|||||||
IpAddress: req.IPAddress,
|
IpAddress: req.IPAddress,
|
||||||
Port: int32(req.Port),
|
Port: int32(req.Port),
|
||||||
Status: sql.NullString{String: "connecting", Valid: true},
|
Status: sql.NullString{String: "connecting", Valid: true},
|
||||||
Version: sql.NullString{},
|
Version: sql.NullString{String: req.Version, Valid: req.Version != ""},
|
||||||
Capabilities: rawJSON(req.Capabilities),
|
Capabilities: rawJSON(req.Capabilities),
|
||||||
Resources: rawJSON(resources),
|
Resources: rawJSON(resources),
|
||||||
LastHeartbeat: sql.NullTime{Time: time.Now(), Valid: true},
|
LastHeartbeat: sql.NullTime{Time: time.Now(), Valid: true},
|
||||||
@@ -911,6 +914,76 @@ func (h *NodeAgentHandler) PruneAgent(c *gin.Context) {
|
|||||||
c.JSON(http.StatusAccepted, gin.H{"command": command})
|
c.JSON(http.StatusAccepted, gin.H{"command": command})
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// UpgradeAgent enqueues a self_upgrade command: the agent downloads its
|
||||||
|
// replacement binary from this server's bundled /download endpoint,
|
||||||
|
// verifies the sha256, swaps it in, and re-execs. Fails fast when no
|
||||||
|
// bundled binary exists for the agent's architecture.
|
||||||
|
func (h *NodeAgentHandler) UpgradeAgent(c *gin.Context) {
|
||||||
|
ctx := c.Request.Context()
|
||||||
|
id := c.Param("id")
|
||||||
|
agent, err := h.q.GetAgent(ctx, id)
|
||||||
|
if err != nil {
|
||||||
|
respondError(c, http.StatusNotFound, "NOT_FOUND", "Agent not found")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
if agent.Status.String != "online" {
|
||||||
|
respondError(c, http.StatusConflict, "NODE_OFFLINE", "node is offline — reconnect it before upgrading")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
arch := "amd64"
|
||||||
|
var caps struct {
|
||||||
|
SupportedArchitectures []string `json:"supported_architectures"`
|
||||||
|
}
|
||||||
|
unmarshalRaw(agent.Capabilities, &caps)
|
||||||
|
if len(caps.SupportedArchitectures) > 0 && caps.SupportedArchitectures[0] != "" {
|
||||||
|
arch = caps.SupportedArchitectures[0]
|
||||||
|
}
|
||||||
|
platform := "linux-" + arch // agents only ship for linux today
|
||||||
|
|
||||||
|
dir := os.Getenv("CONTAINR_AGENT_BIN_DIR")
|
||||||
|
if dir == "" {
|
||||||
|
dir = "/agents"
|
||||||
|
}
|
||||||
|
path := filepath.Join(dir, "containr-agent-"+platform)
|
||||||
|
sum, err := sha256File(path)
|
||||||
|
if err != nil {
|
||||||
|
respondError(c, http.StatusConflict, "NO_BINARY",
|
||||||
|
fmt.Sprintf("no bundled agent binary for %s on this server", platform))
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
command, err := h.q.CreateCommand(ctx, sqlcdb.CreateCommandParams{
|
||||||
|
ID: uuid.New().String(),
|
||||||
|
Type: "self_upgrade",
|
||||||
|
NodeAgentID: id,
|
||||||
|
Payload: rawJSON(map[string]interface{}{
|
||||||
|
"platform": platform,
|
||||||
|
"sha256": sum,
|
||||||
|
"version": Version,
|
||||||
|
}),
|
||||||
|
})
|
||||||
|
if err != nil {
|
||||||
|
respondError(c, http.StatusInternalServerError, "INTERNAL", "failed to enqueue upgrade")
|
||||||
|
return
|
||||||
|
}
|
||||||
|
LogAuditWithRequest(c, "node", id, "upgrade", map[string]interface{}{"platform": platform, "version": Version})
|
||||||
|
c.JSON(http.StatusAccepted, gin.H{"command": command, "platform": platform, "version": Version})
|
||||||
|
}
|
||||||
|
|
||||||
|
func sha256File(path string) (string, error) {
|
||||||
|
f, err := os.Open(path)
|
||||||
|
if err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
defer f.Close()
|
||||||
|
h := sha256.New()
|
||||||
|
if _, err := io.Copy(h, f); err != nil {
|
||||||
|
return "", err
|
||||||
|
}
|
||||||
|
return hex.EncodeToString(h.Sum(nil)), nil
|
||||||
|
}
|
||||||
|
|
||||||
// ExecuteCommand executes a command on an agent
|
// ExecuteCommand executes a command on an agent
|
||||||
func (h *NodeAgentHandler) ExecuteCommand(c *gin.Context) {
|
func (h *NodeAgentHandler) ExecuteCommand(c *gin.Context) {
|
||||||
agentID := c.Param("id")
|
agentID := c.Param("id")
|
||||||
@@ -1390,6 +1463,7 @@ func (h *NodeAgentHandler) SetupAdminRoutes(router *gin.RouterGroup) {
|
|||||||
agents.POST("/:id/cordon", h.CordonAgent)
|
agents.POST("/:id/cordon", h.CordonAgent)
|
||||||
agents.POST("/:id/uncordon", h.UncordonAgent)
|
agents.POST("/:id/uncordon", h.UncordonAgent)
|
||||||
agents.POST("/:id/drain", h.DrainAgent)
|
agents.POST("/:id/drain", h.DrainAgent)
|
||||||
|
agents.POST("/:id/upgrade", h.UpgradeAgent)
|
||||||
agents.POST("/:id/prune", h.PruneAgent)
|
agents.POST("/:id/prune", h.PruneAgent)
|
||||||
agents.POST("/:id/commands", h.ExecuteCommand)
|
agents.POST("/:id/commands", h.ExecuteCommand)
|
||||||
agents.GET("/:id/commands", h.GetAgentCommands)
|
agents.GET("/:id/commands", h.GetAgentCommands)
|
||||||
|
|||||||
@@ -190,6 +190,24 @@ var nodesDrainCmd = &cobra.Command{
|
|||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
|
var nodesUpgradeCmd = &cobra.Command{
|
||||||
|
Use: "upgrade <id>",
|
||||||
|
Short: "Upgrade the node agent to the server's bundled binary",
|
||||||
|
Args: cobra.ExactArgs(1),
|
||||||
|
RunE: func(cmd *cobra.Command, args []string) error {
|
||||||
|
c, err := client()
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
data, err := c.Do("POST", "/agents/"+args[0]+"/upgrade", nil)
|
||||||
|
if err != nil {
|
||||||
|
return err
|
||||||
|
}
|
||||||
|
PrintRaw(data)
|
||||||
|
return nil
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
var nodesCommandsCmd = &cobra.Command{
|
var nodesCommandsCmd = &cobra.Command{
|
||||||
Use: "commands <id>",
|
Use: "commands <id>",
|
||||||
Short: "List recent commands sent to a node agent",
|
Short: "List recent commands sent to a node agent",
|
||||||
@@ -277,5 +295,5 @@ func init() {
|
|||||||
nodesPruneCmd.Flags().String("until", "", "only prune objects older than this duration (e.g. 168h)")
|
nodesPruneCmd.Flags().String("until", "", "only prune objects older than this duration (e.g. 168h)")
|
||||||
nodesPruneCmd.Flags().Bool("volumes", false, "also prune volumes (destructive — asks twice)")
|
nodesPruneCmd.Flags().Bool("volumes", false, "also prune volumes (destructive — asks twice)")
|
||||||
nodeTokensCmd.AddCommand(nodeTokensIssueCmd, nodeTokensListCmd, nodeTokensRevokeCmd)
|
nodeTokensCmd.AddCommand(nodeTokensIssueCmd, nodeTokensListCmd, nodeTokensRevokeCmd)
|
||||||
NodesCmd.AddCommand(nodesListCmd, nodesGetCmd, nodesUpdateCmd, nodesCordonCmd, nodesUncordonCmd, nodesDrainCmd, nodesPruneCmd, nodesCommandsCmd, nodesDeleteCmd, nodeTokensCmd)
|
NodesCmd.AddCommand(nodesListCmd, nodesGetCmd, nodesUpdateCmd, nodesCordonCmd, nodesUncordonCmd, nodesDrainCmd, nodesUpgradeCmd, nodesPruneCmd, nodesCommandsCmd, nodesDeleteCmd, nodeTokensCmd)
|
||||||
}
|
}
|
||||||
@@ -178,6 +178,7 @@ func init() {
|
|||||||
register(spec{"containr_nodes_uncordon", "Re-open a node for placement (admin). Args: id.", "POST", "/agents/{id}/uncordon", []string{"id"}, nil, false})
|
register(spec{"containr_nodes_uncordon", "Re-open a node for placement (admin). Args: id.", "POST", "/agents/{id}/uncordon", []string{"id"}, nil, false})
|
||||||
register(spec{"containr_nodes_drain", "Drain a node: cordon + remove all service containers via the agent + unpin affected services so they redeploy locally. Requires the node online (admin). Args: id.", "POST", "/agents/{id}/drain", []string{"id"}, nil, true})
|
register(spec{"containr_nodes_drain", "Drain a node: cordon + remove all service containers via the agent + unpin affected services so they redeploy locally. Requires the node online (admin). Args: id.", "POST", "/agents/{id}/drain", []string{"id"}, nil, true})
|
||||||
register(spec{"containr_nodes_prune", "Enqueue a bounded docker system prune on a node (admin). Args: id; optional until (e.g. 168h), volumes (danger, off by default).", "POST", "/agents/{id}/prune", []string{"id"}, []string{"until", "volumes"}, true})
|
register(spec{"containr_nodes_prune", "Enqueue a bounded docker system prune on a node (admin). Args: id; optional until (e.g. 168h), volumes (danger, off by default).", "POST", "/agents/{id}/prune", []string{"id"}, []string{"until", "volumes"}, true})
|
||||||
|
register(spec{"containr_nodes_upgrade", "Upgrade a node's agent to the server's bundled binary: downloads over the API, verifies sha256, swaps atomically, re-execs. Node must be online (admin). Args: id.", "POST", "/agents/{id}/upgrade", []string{"id"}, nil, true})
|
||||||
register(spec{"containr_nodes_commands", "List recent commands sent to a node agent (admin). Args: id.", "GET", "/agents/{id}/commands", []string{"id"}, nil, false})
|
register(spec{"containr_nodes_commands", "List recent commands sent to a node agent (admin). Args: id.", "GET", "/agents/{id}/commands", []string{"id"}, nil, false})
|
||||||
|
|
||||||
// Scaling / HA / security
|
// Scaling / HA / security
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ import {
|
|||||||
listAgentContainers,
|
listAgentContainers,
|
||||||
pruneAgent,
|
pruneAgent,
|
||||||
updateAgent,
|
updateAgent,
|
||||||
|
upgradeAgent,
|
||||||
type AgentMetricPoint,
|
type AgentMetricPoint,
|
||||||
} from '@/lib/api-client';
|
} from '@/lib/api-client';
|
||||||
import { getCurrentUserProfile } from '@/lib/api-client';
|
import { getCurrentUserProfile } from '@/lib/api-client';
|
||||||
@@ -97,6 +98,10 @@ export function NodeDetailPage() {
|
|||||||
mutationFn: () => drainAgent(id),
|
mutationFn: () => drainAgent(id),
|
||||||
onSuccess: () => { setConfirmDrain(false); invalidate(); },
|
onSuccess: () => { setConfirmDrain(false); invalidate(); },
|
||||||
});
|
});
|
||||||
|
const upgradeMutation = useMutation({
|
||||||
|
mutationFn: () => upgradeAgent(id),
|
||||||
|
onSuccess: invalidate,
|
||||||
|
});
|
||||||
|
|
||||||
const agent = agentQuery.data;
|
const agent = agentQuery.data;
|
||||||
const metrics = useMemo(() => metricsQuery.data ?? [], [metricsQuery.data]);
|
const metrics = useMemo(() => metricsQuery.data ?? [], [metricsQuery.data]);
|
||||||
@@ -215,6 +220,16 @@ export function NodeDetailPage() {
|
|||||||
>
|
>
|
||||||
drain
|
drain
|
||||||
</button>
|
</button>
|
||||||
|
<button
|
||||||
|
onClick={() => upgradeMutation.mutate()}
|
||||||
|
disabled={upgradeMutation.isPending || !online}
|
||||||
|
title={online
|
||||||
|
? `Upgrade agent to the server's bundled binary (server ${upgradeMutation.data?.version ?? 'build'}) — the agent restarts itself`
|
||||||
|
: 'Node must be online to upgrade'}
|
||||||
|
className="v-mono text-[11px] px-3 py-1.5 rounded-md border border-[var(--border-subtle)] text-[var(--text-secondary)] hover:text-[var(--text-primary)] disabled:opacity-50"
|
||||||
|
>
|
||||||
|
{upgradeMutation.isPending ? 'upgrading…' : 'upgrade agent'}
|
||||||
|
</button>
|
||||||
<button
|
<button
|
||||||
onClick={() => setConfirmVolumes(true)}
|
onClick={() => setConfirmVolumes(true)}
|
||||||
disabled={pruneMutation.isPending}
|
disabled={pruneMutation.isPending}
|
||||||
|
|||||||
@@ -8732,6 +8732,70 @@ export interface paths {
|
|||||||
patch?: never;
|
patch?: never;
|
||||||
trace?: never;
|
trace?: never;
|
||||||
};
|
};
|
||||||
|
"/agents/{id}/upgrade": {
|
||||||
|
parameters: {
|
||||||
|
query?: never;
|
||||||
|
header?: never;
|
||||||
|
path?: never;
|
||||||
|
cookie?: never;
|
||||||
|
};
|
||||||
|
get?: never;
|
||||||
|
put?: never;
|
||||||
|
/**
|
||||||
|
* Upgrade the node agent
|
||||||
|
* @description Enqueues a `self_upgrade` command. The agent downloads its replacement binary from this server's bundled `/agents/download` endpoint, verifies the sha256, atomically swaps the executable, and re-execs itself — the command result reports before the process swaps. The node must be online, and the server must bundle a binary for the node's architecture (`linux-amd64`/`linux-arm64`).
|
||||||
|
*/
|
||||||
|
post: {
|
||||||
|
parameters: {
|
||||||
|
query?: never;
|
||||||
|
header?: never;
|
||||||
|
path: {
|
||||||
|
/** @description Node agent ID */
|
||||||
|
id: components["parameters"]["AgentIdParam"];
|
||||||
|
};
|
||||||
|
cookie?: never;
|
||||||
|
};
|
||||||
|
requestBody?: never;
|
||||||
|
responses: {
|
||||||
|
/** @description Upgrade command enqueued */
|
||||||
|
202: {
|
||||||
|
headers: {
|
||||||
|
[name: string]: unknown;
|
||||||
|
};
|
||||||
|
content: {
|
||||||
|
"application/json": {
|
||||||
|
command?: Record<string, never>;
|
||||||
|
platform?: string;
|
||||||
|
version?: string;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
/** @description Agent not found */
|
||||||
|
404: {
|
||||||
|
headers: {
|
||||||
|
[name: string]: unknown;
|
||||||
|
};
|
||||||
|
content: {
|
||||||
|
"application/json": components["schemas"]["Error"];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
/** @description Node offline or no bundled binary for its architecture */
|
||||||
|
409: {
|
||||||
|
headers: {
|
||||||
|
[name: string]: unknown;
|
||||||
|
};
|
||||||
|
content: {
|
||||||
|
"application/json": components["schemas"]["Error"];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
delete?: never;
|
||||||
|
options?: never;
|
||||||
|
head?: never;
|
||||||
|
patch?: never;
|
||||||
|
trace?: never;
|
||||||
|
};
|
||||||
"/agents/{id}/metrics": {
|
"/agents/{id}/metrics": {
|
||||||
parameters: {
|
parameters: {
|
||||||
query?: never;
|
query?: never;
|
||||||
|
|||||||
@@ -40,7 +40,7 @@ export const bundledDocs: BundledDoc[] = [
|
|||||||
"path": "guides/CLI.md",
|
"path": "guides/CLI.md",
|
||||||
"section": "guides",
|
"section": "guides",
|
||||||
"title": "Containr CLI",
|
"title": "Containr CLI",
|
||||||
"markdown": "# Containr CLI\n\nThe CLI controls every part of a Containr instance — the same API surface\nthe web UI uses. Build it with `scripts/build-cli.sh` or\n`go build ./cmd/cli` from `app/backend`.\n\n## Authentication\n\nCreate a personal access token in the web UI under\n**Settings → Personal Access Tokens** (or `containr tokens create`), then:\n\n```bash\ncontainr auth login cnp_... # verify + store\ncontainr auth login cnp_... --url https://containr.example.com\ncontainr auth login cnp_... --name production # named profile\ncontainr auth status # show active profile + identity\ncontainr auth logout\n```\n\nResolution order for every command: `--token`/`--api-url` flags >\n`CONTAINR_TOKEN`/`CONTAINR_API_URL` env > active profile >\n`http://localhost:8080/api/v1`. The active profile is `--profile` >\n`CONTAINR_PROFILE` > `current_profile` in `~/.containr.yaml`.\n\n## Output and scripting\n\n- `--json` prints the raw API response — safe to pipe and parse.\n- `--yes` / `-y` skips confirmation on destructive commands (delete,\n revoke, restore, failover). Non-interactive shells refuse destructive\n commands without it.\n- Exit codes are stable: `0` ok, `1` error, `2` auth/permission,\n `3` not found, `4` validation, `5` unreachable.\n\n## Commands\n\n```\nauth login|logout|status token auth and profiles\ntokens list|create|revoke personal access tokens\nprojects list|get|create|delete\nservices list|get|create|update|delete|start|stop|restart|redeploy\nservices clone|move duplicate config or re-parent a service\nservices domains list|add|remove|default|check multi-domain + DNS preflight\nregistries list|add|update|remove private-image pull credentials\nvolumes list|delete docker volume inventory + cleanup (admin)\ndeploy <service-id> trigger a deployment (--no-cache, --commit-hash, --branch)\ndeployments list|get|logs|rollback|cancel\nlogs <service-id> [--follow] runtime logs (SSE follow)\nexec <service-id> -- <cmd> one-off container command\nvariables list|set|unset env vars (secrets masked; --redeploy applies them)\nvariables shared list|set|unset project shared vars — referenced as ${{shared.KEY}}\ndatabases list|get|create|update|delete|action|backup|restore|download-backup|import-backup\n import-backup <id> <file.tar.gz|-> uploads an archive as a restore\n point; ships offsite too when a backup target is assigned\ndatabases list|get|create|update|delete|action|backup|restore|download-backup\n create --public exposes the port on all interfaces;\n update <id> --public/--public=false toggles it (container recreates, data persists)\ndatabases register <name> register an external database (--type --host --port --database --username --password --ssl; probed before storing)\ndatabases test-connection probe a connection — by id, or ad-hoc flags\nbackup-targets list|add|update|remove|test\n S3-compatible archive destinations; add/update probe the bucket\n first, empty --access-key/--secret-key on update keep stored keys;\n update <db-id> --backup-target assigns a target (\"\" clears it)\ncron list|get|create|delete|trigger|executions\ntemplates list|get|create|delete|deploy|plan|import-compose|deploy-graph\n deploy --name --var K=V; plan dry-resolves expressions;\n import-compose <compose.yml|-> converts a compose file into\n a v2 graph config; deploy-graph <project-id> <config.json|->\n deploys an ad-hoc service graph\nimport compose <project-id> <compose.yml|->\n deploys a docker-compose file straight into a project —\n no template row. DB images become managed databases\n attached under their service name; --var K=V overrides\n template variables\nnodes list|get|delete|tokens node agents + onboarding tokens (admin)\nnodes add <user@host> SSH bootstrap — one session installs the agent, then never needed again (--print for manual runs)\nnodes update|prune|commands rename/auto-prune, bounded docker prune, command history\nmigrate railway pull a Railway project (services, vars, domains) via GraphQL and recreate it — --dry-run prints the plan\nmigrate dflow import a dflow project (services, vars, volumes, domains) via its Payload REST API — needs --url + --api-key, --dry-run prints the plan\nscaling status|policies|services|scale\nha status|alerts|health|policies|enable|disable|failover\nsecurity scan|vulnerabilities|metrics\ngateway services|keys|anLine truncated
|
"markdown": "# Containr CLI\n\nThe CLI controls every part of a Containr instance — the same API surface\nthe web UI uses. Build it with `scripts/build-cli.sh` or\n`go build ./cmd/cli` from `app/backend`.\n\n## Authentication\n\nCreate a personal access token in the web UI under\n**Settings → Personal Access Tokens** (or `containr tokens create`), then:\n\n```bash\ncontainr auth login cnp_... # verify + store\ncontainr auth login cnp_... --url https://containr.example.com\ncontainr auth login cnp_... --name production # named profile\ncontainr auth status # show active profile + identity\ncontainr auth logout\n```\n\nResolution order for every command: `--token`/`--api-url` flags >\n`CONTAINR_TOKEN`/`CONTAINR_API_URL` env > active profile >\n`http://localhost:8080/api/v1`. The active profile is `--profile` >\n`CONTAINR_PROFILE` > `current_profile` in `~/.containr.yaml`.\n\n## Output and scripting\n\n- `--json` prints the raw API response — safe to pipe and parse.\n- `--yes` / `-y` skips confirmation on destructive commands (delete,\n revoke, restore, failover). Non-interactive shells refuse destructive\n commands without it.\n- Exit codes are stable: `0` ok, `1` error, `2` auth/permission,\n `3` not found, `4` validation, `5` unreachable.\n\n## Commands\n\n```\nauth login|logout|status token auth and profiles\ntokens list|create|revoke personal access tokens\nprojects list|get|create|delete\nservices list|get|create|update|delete|start|stop|restart|redeploy\nservices clone|move duplicate config or re-parent a service\nservices domains list|add|remove|default|check multi-domain + DNS preflight\nregistries list|add|update|remove private-image pull credentials\nvolumes list|delete docker volume inventory + cleanup (admin)\ndeploy <service-id> trigger a deployment (--no-cache, --commit-hash, --branch)\ndeployments list|get|logs|rollback|cancel\nlogs <service-id> [--follow] runtime logs (SSE follow)\nexec <service-id> -- <cmd> one-off container command\nvariables list|set|unset env vars (secrets masked; --redeploy applies them)\nvariables shared list|set|unset project shared vars — referenced as ${{shared.KEY}}\ndatabases list|get|create|update|delete|action|backup|restore|download-backup|import-backup\n import-backup <id> <file.tar.gz|-> uploads an archive as a restore\n point; ships offsite too when a backup target is assigned\ndatabases list|get|create|update|delete|action|backup|restore|download-backup\n create --public exposes the port on all interfaces;\n update <id> --public/--public=false toggles it (container recreates, data persists)\ndatabases register <name> register an external database (--type --host --port --database --username --password --ssl; probed before storing)\ndatabases test-connection probe a connection — by id, or ad-hoc flags\nbackup-targets list|add|update|remove|test\n S3-compatible archive destinations; add/update probe the bucket\n first, empty --access-key/--secret-key on update keep stored keys;\n update <db-id> --backup-target assigns a target (\"\" clears it)\ncron list|get|create|delete|trigger|executions\ntemplates list|get|create|delete|deploy|plan|import-compose|deploy-graph\n deploy --name --var K=V; plan dry-resolves expressions;\n import-compose <compose.yml|-> converts a compose file into\n a v2 graph config; deploy-graph <project-id> <config.json|->\n deploys an ad-hoc service graph\nimport compose <project-id> <compose.yml|->\n deploys a docker-compose file straight into a project —\n no template row. DB images become managed databases\n attached under their service name; --var K=V overrides\n template variables\nnodes list|get|delete|tokens node agents + onboarding tokens (admin)\nnodes add <user@host> SSH bootstrap — one session installs the agent, then never needed again (--print for manual runs)\nnodes update|prune|commands rename/auto-prune, bounded docker prune, command history\nmigrate railway pull a Railway project (services, vars, domains) via GraphQL and recreate it — --dry-run prints the plan\nmigrate dflow import a dflow project (services, vars, volumes, domains) via its Payload REST API — needs --url + --api-key, --dry-run prints the plan\nscaling status|policies|services|scale\nha status|alerts|health|policies|enable|disable|failover\nsecurity scan|vulnerabilities|metrics\ngateway services|keys|anLine truncated
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
"path": "guides/CLOUDFLARE_SETUP.md",
|
"path": "guides/CLOUDFLARE_SETUP.md",
|
||||||
|
|||||||
@@ -1164,6 +1164,12 @@ export async function drainAgent(id: string): Promise<DrainResult> {
|
|||||||
return requestJson<DrainResult>(`/agents/${id}/drain`, { method: 'POST' });
|
return requestJson<DrainResult>(`/agents/${id}/drain`, { method: 'POST' });
|
||||||
}
|
}
|
||||||
|
|
||||||
|
export type UpgradeResult = { platform: string; version: string };
|
||||||
|
|
||||||
|
export async function upgradeAgent(id: string): Promise<UpgradeResult> {
|
||||||
|
return requestJson<UpgradeResult>(`/agents/${id}/upgrade`, { method: 'POST' });
|
||||||
|
}
|
||||||
|
|
||||||
export async function getAgent(id: string): Promise<NodeAgentEntity | null> {
|
export async function getAgent(id: string): Promise<NodeAgentEntity | null> {
|
||||||
const payload = await requestJson<{ agent?: RawNodeAgent }>(`/agents/${id}`);
|
const payload = await requestJson<{ agent?: RawNodeAgent }>(`/agents/${id}`);
|
||||||
return payload.agent ? normalizeAgent(payload.agent) : null;
|
return payload.agent ? normalizeAgent(payload.agent) : null;
|
||||||
|
|||||||
@@ -5503,6 +5503,46 @@ paths:
|
|||||||
schema:
|
schema:
|
||||||
$ref: '#/components/schemas/Error'
|
$ref: '#/components/schemas/Error'
|
||||||
|
|
||||||
|
/agents/{id}/upgrade:
|
||||||
|
post:
|
||||||
|
tags:
|
||||||
|
- Agents
|
||||||
|
summary: Upgrade the node agent
|
||||||
|
description: >-
|
||||||
|
Enqueues a `self_upgrade` command. The agent downloads its
|
||||||
|
replacement binary from this server's bundled `/agents/download`
|
||||||
|
endpoint, verifies the sha256, atomically swaps the executable, and
|
||||||
|
re-execs itself — the command result reports before the process
|
||||||
|
swaps. The node must be online, and the server must bundle a binary
|
||||||
|
for the node's architecture (`linux-amd64`/`linux-arm64`).
|
||||||
|
security:
|
||||||
|
- bearerAuth: []
|
||||||
|
parameters:
|
||||||
|
- $ref: '#/components/parameters/AgentIdParam'
|
||||||
|
responses:
|
||||||
|
'202':
|
||||||
|
description: Upgrade command enqueued
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
type: object
|
||||||
|
properties:
|
||||||
|
command: { type: object }
|
||||||
|
platform: { type: string }
|
||||||
|
version: { type: string }
|
||||||
|
'404':
|
||||||
|
description: Agent not found
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
$ref: '#/components/schemas/Error'
|
||||||
|
'409':
|
||||||
|
description: Node offline or no bundled binary for its architecture
|
||||||
|
content:
|
||||||
|
application/json:
|
||||||
|
schema:
|
||||||
|
$ref: '#/components/schemas/Error'
|
||||||
|
|
||||||
/agents/{id}/metrics:
|
/agents/{id}/metrics:
|
||||||
get:
|
get:
|
||||||
tags:
|
tags:
|
||||||
|
|||||||
@@ -163,8 +163,15 @@ Take a node out of rotation or empty it entirely (admin):
|
|||||||
containr nodes cordon <id> # no new pins; running replicas stay
|
containr nodes cordon <id> # no new pins; running replicas stay
|
||||||
containr nodes uncordon <id>
|
containr nodes uncordon <id>
|
||||||
containr nodes drain <id> # cordon + remove its containers + unpin services
|
containr nodes drain <id> # cordon + remove its containers + unpin services
|
||||||
|
containr nodes upgrade <id> # agent pulls its replacement from the server, re-execs
|
||||||
```
|
```
|
||||||
|
|
||||||
|
`nodes upgrade` swaps the agent binary for the one bundled in the running
|
||||||
|
server image — the agent downloads it over the API, verifies the sha256 the
|
||||||
|
server computed, sanity-checks it, atomically replaces its own executable,
|
||||||
|
and re-execs. The node must be online and the server must ship a binary for
|
||||||
|
its architecture (`linux-amd64`/`linux-arm64`).
|
||||||
|
|
||||||
## Service domains and access
|
## Service domains and access
|
||||||
|
|
||||||
A service can carry multiple hostnames; the default is mirrored to
|
A service can carry multiple hostnames; the default is mirrored to
|
||||||
|
|||||||
Reference in new issue
Block a user