Jean-Gabriel Gill-Couture
020ebcb1f9
The previous e2e harness handrolled k8s manifests in `stack.rs`,
bypassing the Score-Topology-Interpret machinery harmony exists to
provide. This commit:
1. **ADR-023** codifies the rules: deploy with Scores (not
manifests), e2e uses the same Scores as production, one Score
per component, deploy blocks on smoke-test success, deploy logic
lives in `*-deploy` crates, topologies are compile-time,
thiserror over anyhow. CLAUDE.md mirrors the principles.
2. **New `fleet/harmony-fleet-deploy` crate** is the canonical home
for fleet-component Scores:
- `FleetOperatorScore` + helm-chart generator + `install_crds`
moved out of `harmony::modules::fleet::operator` (they should
never have lived in `harmony` core). `FleetServerScore`
(composite of NATS + operator + Zitadel + callout) moved too.
- New `FleetNatsScore` (preset over `NatsHelmChartScore` with
fleet's required values; v1 supports `UserPass` auth, callout
mode reserved on the public API for PR 1.5).
- New `FleetAgentScore` with `FleetAgentTarget::Pod`; `Vm`
target is a future variant that absorbs `FleetDeviceSetupScore`.
- `harmony-fleet-deploy` binary built on the existing
`harmony_cli` crate — no new CLI scaffolding.
3. **Operator runtime binary trimmed**: `Install` and `Chart`
subcommands removed; both jobs now belong to
`harmony-fleet-deploy`. The runtime binary becomes leaner.
4. **E2E harness rewritten** as a thin Score composer:
`harmony-fleet-e2e/src/stack.rs` deploys the stack via
`FleetNatsScore` + `FleetAgentScore`. The inline NATS manifest
factory and the bespoke agent Pod renderer are gone.
- Bring-up runs once per test binary via `shared_stack` +
`tokio::sync::OnceCell` (matches the `fleet_e2e_demo` pattern).
- Stale `e2e-*` namespaces from prior runs get pruned at
startup so the leaks the OnceCell creates don't compound.
5. **`thiserror` for the agent's `CommandServer`** — replaces the
anyhow-based surface with typed `CommandError` /
`CommandServerError`.
6. **Memory** captures eight load-bearing principles (saved to
`~/.claude/projects/.../memory/`) so future sessions don't drift
back into manifest-handrolling.
Verified: `cargo test -p harmony-fleet-e2e --test ping` green
end-to-end against k3d in 25s warm.
121 lines
3.1 KiB
TOML
121 lines
3.1 KiB
TOML
[workspace]
|
|
resolver = "2"
|
|
members = [
|
|
"examples/*",
|
|
"private_repos/*",
|
|
"harmony",
|
|
"harmony_types",
|
|
"harmony_macros",
|
|
"harmony_tui",
|
|
"harmony_execution",
|
|
"opnsense-config",
|
|
"opnsense-config-xml",
|
|
"harmony_cli",
|
|
"k3d",
|
|
"harmony_composer",
|
|
"harmony_inventory_agent",
|
|
"harmony_secret_derive",
|
|
"harmony_secret",
|
|
"network_stress_test",
|
|
"examples/kvm_okd_ha_cluster",
|
|
"examples/example_linux_vm",
|
|
"harmony_i18n",
|
|
"harmony_config_derive",
|
|
"harmony_config",
|
|
"brocade",
|
|
"harmony_agent",
|
|
"harmony_agent/deploy",
|
|
"harmony_node_readiness",
|
|
"harmony-k8s",
|
|
"harmony_assets", "opnsense-codegen", "opnsense-api",
|
|
"fleet/harmony-fleet-operator",
|
|
"fleet/harmony-fleet-agent",
|
|
"fleet/harmony-fleet-auth",
|
|
"fleet/harmony-fleet-deploy",
|
|
"fleet/harmony-fleet-e2e",
|
|
"harmony-reconciler-contracts",
|
|
"examples/fleet_server_install",
|
|
"examples/fleet_staging_install",
|
|
"nats/jwt",
|
|
"nats/callout",
|
|
"nats/integration-test-callout",
|
|
]
|
|
|
|
[workspace.package]
|
|
version = "0.1.0"
|
|
readme = "README.md"
|
|
license = "GNU AGPL v3"
|
|
|
|
[workspace.dependencies]
|
|
log = { version = "0.4", features = ["kv"] }
|
|
env_logger = "0.11"
|
|
derive-new = "0.7"
|
|
async-trait = "0.1"
|
|
tokio = { version = "1.40", features = [
|
|
"io-std",
|
|
"io-util",
|
|
"fs",
|
|
"macros",
|
|
"net",
|
|
"rt-multi-thread",
|
|
] }
|
|
tokio-retry = "0.3.0"
|
|
tokio-util = "0.7.15"
|
|
cidr = { features = ["serde"], version = "0.2" }
|
|
russh = "0.45"
|
|
russh-keys = "0.45"
|
|
rand = "0.9"
|
|
url = "2.5"
|
|
kube = { version = "1.1.0", features = [
|
|
"config",
|
|
"client",
|
|
"runtime",
|
|
"rustls-tls",
|
|
"ws",
|
|
"jsonpatch",
|
|
] }
|
|
k8s-openapi = { version = "0.25", features = ["v1_30", "schemars"] }
|
|
# TODO replace with https://github.com/bourumir-wyngs/serde-saphyr as serde_yaml is deprecated https://github.com/sebastienrousseau/serde_yml
|
|
serde_yaml = "0.9"
|
|
serde-value = "0.7"
|
|
http = "1.2"
|
|
inquire = "0.7"
|
|
convert_case = "0.8"
|
|
chrono = "0.4"
|
|
similar = "2"
|
|
uuid = { version = "1.11", features = ["v4", "fast-rng", "macro-diagnostics"] }
|
|
pretty_assertions = "1.4.1"
|
|
tempfile = "3.20.0"
|
|
bollard = "0.19.1"
|
|
base64 = "0.22.1"
|
|
tar = "0.4.44"
|
|
lazy_static = "1.5.0"
|
|
directories = "6.0.0"
|
|
futures-util = "0.3"
|
|
thiserror = "2.0.14"
|
|
serde = { version = "1.0.209", features = ["derive", "rc"] }
|
|
serde_json = "1.0.127"
|
|
askama = "0.14"
|
|
sqlx = { version = "0.8", features = ["runtime-tokio", "sqlite"] }
|
|
reqwest = { version = "0.12", features = [
|
|
"blocking",
|
|
"stream",
|
|
"rustls-tls",
|
|
"http2",
|
|
"json",
|
|
], default-features = false }
|
|
assertor = "0.0.4"
|
|
tokio-test = "0.4"
|
|
anyhow = "1.0"
|
|
clap = { version = "4", features = ["derive", "env"] }
|
|
# `websockets` enables `ws://` / `wss://` URL schemes. Without it the
|
|
# connector parses the URL but treats it as a raw TCP connect (no TLS,
|
|
# no HTTP Upgrade), so the agent against the OKD edge-TLS Route hangs
|
|
# 30s on `expected INFO, got nothing` because the router only speaks
|
|
# TLS+HTTPS on 443. The operator works without this feature because
|
|
# it talks to NATS in-cluster on `nats://...:4222` (raw TCP).
|
|
async-nats = { version = "0.45.0", features = ["websockets"] }
|
|
tracing = "0.1"
|
|
tracing-subscriber = { version = "0.3", features = ["env-filter"] }
|
|
toml = "0.8"
|