Merge C18 offline bundles and the Helm chart
Conflicts: server.go imports (both kept); agent.pb.go regenerated with buf from the merged proto. Co-Authored-By: Claude Opus 5.5 (1M context) <noreply@anthropic.com>
This commit is contained in:
commit
6f85c17fc5
51 files changed
+4177
-63
No files matched your search
@@ -34,6 +34,7 @@ import (
|
||||
llmgwv1 "gitea.mynodes.xyz/ilker/llmgw/api/gen/llmgw/v1"
|
||||
"gitea.mynodes.xyz/ilker/llmgw/internal/audit"
|
||||
"gitea.mynodes.xyz/ilker/llmgw/internal/bench/eval"
|
||||
"gitea.mynodes.xyz/ilker/llmgw/internal/bundle"
|
||||
"gitea.mynodes.xyz/ilker/llmgw/internal/config"
|
||||
"gitea.mynodes.xyz/ilker/llmgw/internal/control"
|
||||
"gitea.mynodes.xyz/ilker/llmgw/internal/control/adminapi"
|
||||
@@ -103,6 +104,12 @@ func newServerCmd() *cobra.Command {
|
||||
return errors.New("nothing to serve: declare models with profiles, " +
|
||||
"or give --endpoint for a router-only run")
|
||||
}
|
||||
// Offline, nothing is asked of the internet: releases come from
|
||||
// the mirror's copy, and no registry is asked about newer weights.
|
||||
if cfg.Offline.Enabled() {
|
||||
cfg.Releases = cfg.ReleasesBase()
|
||||
cfg.Mirror.UpdateCheck = 0
|
||||
}
|
||||
|
||||
// Before the router, so its tracer is the configured one. The
|
||||
// host tells two control planes' traces apart.
|
||||
@@ -685,6 +692,21 @@ func startControlPlane(ctx context.Context, cfg config.Server, cat *catalog.Live
|
||||
return cfg.EnginesFor(n.ID, slices.Sorted(maps.Keys(n.GPUsByClass())), n.Labels)
|
||||
})
|
||||
log.Info("nodes install these engines", "engines", cfg.WantedEngines(), "overrides", len(cfg.EngineOverrides))
|
||||
if cfg.Offline.Enabled() {
|
||||
// From the mirror, each file held to the checksum the bundle gave,
|
||||
// which this control plane keeps and the mirror has no say in.
|
||||
trusted := bundle.NewTrusted(cfg.Offline.ChecksumsFile())
|
||||
svc.SetOffline(func(engine, version string) (string, map[string]string) {
|
||||
return bundle.EngineBase(cfg.Offline.Mirror, engine, version), trusted.For(engine, version)
|
||||
})
|
||||
if v, ok := cfg.WantedEngines()["llamacpp"]; ok && len(trusted.For("llamacpp", v)) == 0 {
|
||||
log.Warn("offline, and no bundle imported here carries llama.cpp at this version: nodes cannot "+
|
||||
"install it until one does (llmgw bundle create --engine llamacpp="+v+", then bundle import or trust)",
|
||||
"version", v, "checksums", cfg.Offline.ChecksumsFile(), "err", trusted.Err())
|
||||
}
|
||||
log.Info("offline: nodes install engines from the mirror", "mirror", cfg.Offline.Mirror,
|
||||
"releases", cfg.Releases)
|
||||
}
|
||||
if ch := ctl.EngineChoices(); ch != nil {
|
||||
svc.SetEngineChoices(ch.For)
|
||||
ch.OnChange(svc.Reprovision)
|
||||
|
||||
Reference in new issue
Block a user