cargo check was showing five real warnings, all genuinely dead:
* container/mod.rs — re-exports compute_container_name, AdoptionReport,
ReconcileAction, ReconcileReport were unused outside
prod_orchestrator. Drop from the pub use line.
* prod_orchestrator — with_runtime + insert_manifest_for_test only exist
for the test module in the same file. Mark them
#[cfg(test)] so they don't appear in release builds.
* async_lifecycle — remove_package_entry has no callers; doc claims
"used for install-failure cleanup" but nothing
cleans up. Delete (10 lines).
* registry.rs — `use tracing::{debug, info};` had no consumers.
* fips.rs — unused-assignment chain on last_status. The poll
loop always sets it on every break path, so the
initial `None` and the unwrap_or_else fallback
were both dead. Refactored to `let after = loop
{ ...; break s; };`.
cargo check is now clean. cargo test --workspace --bins: 614 passed.
Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
270 lines
9.3 KiB
Rust
270 lines
9.3 KiB
Rust
//! Dynamic container registry configuration.
|
|
//!
|
|
//! Manages a list of container registries that the node uses to pull app images.
|
|
//! Registries are tried in order — if the first fails, the next is attempted.
|
|
//! Configuration is persisted to disk and editable via RPC.
|
|
|
|
use anyhow::{Context, Result};
|
|
use serde::{Deserialize, Serialize};
|
|
use std::path::Path;
|
|
use tokio::fs;
|
|
|
|
const REGISTRY_FILE: &str = "config/registries.json";
|
|
const OVH_REGISTRY_URL: &str = "146.59.87.168:3000/lfg2025";
|
|
const TX1138_REGISTRY_URL: &str = "git.tx1138.com/lfg2025";
|
|
|
|
/// A single container registry.
|
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
|
pub struct Registry {
|
|
/// Registry URL (e.g., "git.tx1138.com/lfg2025" or "146.59.87.168:3000/lfg2025").
|
|
pub url: String,
|
|
/// Human-readable name.
|
|
pub name: String,
|
|
/// Whether TLS verification is required (false for HTTP registries).
|
|
pub tls_verify: bool,
|
|
/// Whether this registry is enabled.
|
|
#[serde(default = "default_true")]
|
|
pub enabled: bool,
|
|
/// Priority (lower = tried first).
|
|
#[serde(default)]
|
|
pub priority: u32,
|
|
}
|
|
|
|
fn default_true() -> bool {
|
|
true
|
|
}
|
|
|
|
/// Registry configuration.
|
|
#[derive(Debug, Clone, Serialize, Deserialize)]
|
|
pub struct RegistryConfig {
|
|
pub registries: Vec<Registry>,
|
|
}
|
|
|
|
impl Default for RegistryConfig {
|
|
fn default() -> Self {
|
|
Self {
|
|
registries: vec![
|
|
Registry {
|
|
url: OVH_REGISTRY_URL.to_string(),
|
|
name: "Server 1 (OVH)".to_string(),
|
|
tls_verify: false,
|
|
enabled: true,
|
|
priority: 0,
|
|
},
|
|
Registry {
|
|
url: TX1138_REGISTRY_URL.to_string(),
|
|
name: "Server 2 (tx1138)".to_string(),
|
|
tls_verify: true,
|
|
enabled: true,
|
|
priority: 10,
|
|
},
|
|
],
|
|
}
|
|
}
|
|
}
|
|
|
|
impl RegistryConfig {
|
|
/// Get enabled registries sorted by priority.
|
|
pub fn active_registries(&self) -> Vec<&Registry> {
|
|
let mut regs: Vec<&Registry> = self.registries.iter().filter(|r| r.enabled).collect();
|
|
regs.sort_by_key(|r| r.priority);
|
|
regs
|
|
}
|
|
|
|
/// Rewrite an image reference to use a specific registry.
|
|
/// E.g., "git.tx1138.com/lfg2025/bitcoin-knots:latest" with registry "146.59.87.168:3000/lfg2025"
|
|
/// becomes "146.59.87.168:3000/lfg2025/bitcoin-knots:latest".
|
|
pub fn rewrite_image(&self, image: &str, registry: &Registry) -> String {
|
|
// Extract the image name (last component after the org/namespace)
|
|
// Handles: "registry/org/image:tag" -> "image:tag"
|
|
let image_name = extract_image_name(image);
|
|
format!("{}/{}", registry.url, image_name)
|
|
}
|
|
}
|
|
|
|
/// Extract the image name from a full image reference.
|
|
/// "git.tx1138.com/lfg2025/bitcoin-knots:latest" -> "bitcoin-knots:latest"
|
|
/// "docker.io/gitea/gitea:1.23" -> "gitea:1.23"
|
|
fn extract_image_name(image: &str) -> &str {
|
|
// Split by '/' and take the last segment (image:tag)
|
|
image.rsplit('/').next().unwrap_or(image)
|
|
}
|
|
|
|
/// Load registry config from disk, merging in any default registries
|
|
/// that the operator hasn't explicitly removed. This lets us roll out
|
|
/// new default mirrors (e.g. a new Server 3) to existing nodes without
|
|
/// them having to edit their saved config. Explicit removals stick —
|
|
/// if the URL is absent from disk AND absent from current defaults, it
|
|
/// stays gone.
|
|
pub async fn load_registries(data_dir: &Path) -> Result<RegistryConfig> {
|
|
let path = data_dir.join(REGISTRY_FILE);
|
|
if !path.exists() {
|
|
return Ok(RegistryConfig::default());
|
|
}
|
|
let content = fs::read_to_string(&path)
|
|
.await
|
|
.context("Failed to read registry config")?;
|
|
let mut config: RegistryConfig =
|
|
serde_json::from_str(&content).unwrap_or_else(|_| RegistryConfig::default());
|
|
|
|
// One-time migration: the Hetzner VPS at 23.182.128.160 was
|
|
// decommissioned 2026-04-23. Existing nodes have it baked into
|
|
// their saved registry list (was the original Server 1). Strip it
|
|
// on load so every container pull doesn't pay a connection-refused
|
|
// timeout against a dead host. Exception to the usual "explicit
|
|
// removals stick" rule: the user never chose to add this — it
|
|
// was a default.
|
|
let before = config.registries.len();
|
|
config
|
|
.registries
|
|
.retain(|r| !r.url.contains("23.182.128.160"));
|
|
let mut changed = config.registries.len() != before;
|
|
|
|
// Migrate: any default registry URL that isn't already in the
|
|
// saved list gets appended at the end (so existing priority order
|
|
// is preserved for anything the operator already configured).
|
|
let defaults = RegistryConfig::default();
|
|
let known: std::collections::HashSet<String> =
|
|
config.registries.iter().map(|r| r.url.clone()).collect();
|
|
let max_priority = config
|
|
.registries
|
|
.iter()
|
|
.map(|r| r.priority)
|
|
.max()
|
|
.unwrap_or(0);
|
|
for (i, def) in defaults.registries.iter().enumerate() {
|
|
if !known.contains(&def.url) {
|
|
let mut cloned = def.clone();
|
|
cloned.priority = max_priority.saturating_add(10 + i as u32);
|
|
config.registries.push(cloned);
|
|
changed = true;
|
|
}
|
|
}
|
|
let before_order: Vec<(String, bool, u32)> = config
|
|
.registries
|
|
.iter()
|
|
.map(|r| (r.url.clone(), r.enabled, r.priority))
|
|
.collect();
|
|
force_ovh_registry_primary(&mut config);
|
|
changed = changed
|
|
|| before_order
|
|
!= config
|
|
.registries
|
|
.iter()
|
|
.map(|r| (r.url.clone(), r.enabled, r.priority))
|
|
.collect::<Vec<_>>();
|
|
if changed {
|
|
// Persist so the next load doesn't have to re-merge.
|
|
let _ = save_registries(data_dir, &config).await;
|
|
}
|
|
Ok(config)
|
|
}
|
|
|
|
fn force_ovh_registry_primary(config: &mut RegistryConfig) {
|
|
let defaults = RegistryConfig::default();
|
|
for def in defaults.registries {
|
|
if !config.registries.iter().any(|r| r.url == def.url) {
|
|
config.registries.push(def);
|
|
}
|
|
}
|
|
|
|
for registry in config.registries.iter_mut() {
|
|
match registry.url.as_str() {
|
|
OVH_REGISTRY_URL => {
|
|
registry.name = "Server 1 (OVH)".to_string();
|
|
registry.tls_verify = false;
|
|
registry.enabled = true;
|
|
registry.priority = 0;
|
|
}
|
|
TX1138_REGISTRY_URL => {
|
|
registry.name = "Server 2 (tx1138)".to_string();
|
|
registry.tls_verify = true;
|
|
registry.enabled = true;
|
|
registry.priority = 10;
|
|
}
|
|
_ => {
|
|
if registry.priority <= 10 {
|
|
registry.priority = registry.priority.saturating_add(20);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Save registry config to disk.
|
|
pub async fn save_registries(data_dir: &Path, config: &RegistryConfig) -> Result<()> {
|
|
let dir = data_dir.join("config");
|
|
fs::create_dir_all(&dir)
|
|
.await
|
|
.context("Failed to create config dir")?;
|
|
let path = data_dir.join(REGISTRY_FILE);
|
|
let content =
|
|
serde_json::to_string_pretty(config).context("Failed to serialize registry config")?;
|
|
fs::write(&path, content)
|
|
.await
|
|
.context("Failed to write registry config")?;
|
|
Ok(())
|
|
}
|
|
|
|
#[cfg(test)]
|
|
mod tests {
|
|
use super::*;
|
|
use tempfile::TempDir;
|
|
|
|
#[test]
|
|
fn test_extract_image_name() {
|
|
assert_eq!(
|
|
extract_image_name("git.tx1138.com/lfg2025/bitcoin-knots:latest"),
|
|
"bitcoin-knots:latest"
|
|
);
|
|
assert_eq!(
|
|
extract_image_name("docker.io/gitea/gitea:1.23"),
|
|
"gitea:1.23"
|
|
);
|
|
assert_eq!(extract_image_name("localhost/myimage:v1"), "myimage:v1");
|
|
}
|
|
|
|
#[test]
|
|
fn test_rewrite_image() {
|
|
let config = RegistryConfig::default();
|
|
// Default primary is now the OVH VPS (index 0). A tx1138-hardcoded
|
|
// image rewrites to OVH when asked for the primary mirror.
|
|
let primary = &config.registries[0];
|
|
assert_eq!(
|
|
config.rewrite_image("git.tx1138.com/lfg2025/bitcoin-knots:latest", primary),
|
|
"146.59.87.168:3000/lfg2025/bitcoin-knots:latest"
|
|
);
|
|
}
|
|
|
|
#[test]
|
|
fn test_active_registries_sorted() {
|
|
let config = RegistryConfig::default();
|
|
let active = config.active_registries();
|
|
assert_eq!(active.len(), 2);
|
|
assert!(active[0].priority <= active[1].priority);
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn test_load_default() {
|
|
let tmp = TempDir::new().unwrap();
|
|
let config = load_registries(tmp.path()).await.unwrap();
|
|
assert_eq!(config.registries.len(), 2);
|
|
}
|
|
|
|
#[tokio::test]
|
|
async fn test_save_load_roundtrip() {
|
|
let tmp = TempDir::new().unwrap();
|
|
let mut config = RegistryConfig::default();
|
|
config.registries.push(Registry {
|
|
url: "myregistry.com/apps".into(),
|
|
name: "Custom".into(),
|
|
tls_verify: true,
|
|
enabled: true,
|
|
priority: 5,
|
|
});
|
|
save_registries(tmp.path(), &config).await.unwrap();
|
|
let loaded = load_registries(tmp.path()).await.unwrap();
|
|
assert_eq!(loaded.registries.len(), 3);
|
|
}
|
|
}
|