Compare commits
1 Commits
doc-and-br
...
secrets-pr
| Author | SHA1 | Date | |
|---|---|---|---|
| c5f46d676b |
66
Cargo.lock
generated
66
Cargo.lock
generated
@@ -429,15 +429,6 @@ dependencies = [
|
|||||||
"wait-timeout",
|
"wait-timeout",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "assertor"
|
|
||||||
version = "0.0.4"
|
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
|
||||||
checksum = "4ff24d87260733dc86d38a11c60d9400ce4a74a05d0dafa2a6f5ab249cd857cb"
|
|
||||||
dependencies = [
|
|
||||||
"num-traits",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "async-broadcast"
|
name = "async-broadcast"
|
||||||
version = "0.7.2"
|
version = "0.7.2"
|
||||||
@@ -674,22 +665,6 @@ dependencies = [
|
|||||||
"serde_with",
|
"serde_with",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "brocade"
|
|
||||||
version = "0.1.0"
|
|
||||||
dependencies = [
|
|
||||||
"async-trait",
|
|
||||||
"env_logger",
|
|
||||||
"harmony_secret",
|
|
||||||
"harmony_types",
|
|
||||||
"log",
|
|
||||||
"regex",
|
|
||||||
"russh",
|
|
||||||
"russh-keys",
|
|
||||||
"serde",
|
|
||||||
"tokio",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "brotli"
|
name = "brotli"
|
||||||
version = "8.0.2"
|
version = "8.0.2"
|
||||||
@@ -1780,7 +1755,6 @@ dependencies = [
|
|||||||
name = "example-nanodc"
|
name = "example-nanodc"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"brocade",
|
|
||||||
"cidr",
|
"cidr",
|
||||||
"env_logger",
|
"env_logger",
|
||||||
"harmony",
|
"harmony",
|
||||||
@@ -1789,7 +1763,6 @@ dependencies = [
|
|||||||
"harmony_tui",
|
"harmony_tui",
|
||||||
"harmony_types",
|
"harmony_types",
|
||||||
"log",
|
"log",
|
||||||
"serde",
|
|
||||||
"tokio",
|
"tokio",
|
||||||
"url",
|
"url",
|
||||||
]
|
]
|
||||||
@@ -1808,7 +1781,6 @@ dependencies = [
|
|||||||
name = "example-okd-install"
|
name = "example-okd-install"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"brocade",
|
|
||||||
"cidr",
|
"cidr",
|
||||||
"env_logger",
|
"env_logger",
|
||||||
"harmony",
|
"harmony",
|
||||||
@@ -1823,32 +1795,17 @@ dependencies = [
|
|||||||
"url",
|
"url",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "example-openbao"
|
|
||||||
version = "0.1.0"
|
|
||||||
dependencies = [
|
|
||||||
"harmony",
|
|
||||||
"harmony_cli",
|
|
||||||
"harmony_macros",
|
|
||||||
"harmony_types",
|
|
||||||
"tokio",
|
|
||||||
"url",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "example-opnsense"
|
name = "example-opnsense"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"brocade",
|
|
||||||
"cidr",
|
"cidr",
|
||||||
"env_logger",
|
"env_logger",
|
||||||
"harmony",
|
"harmony",
|
||||||
"harmony_macros",
|
"harmony_macros",
|
||||||
"harmony_secret",
|
|
||||||
"harmony_tui",
|
"harmony_tui",
|
||||||
"harmony_types",
|
"harmony_types",
|
||||||
"log",
|
"log",
|
||||||
"serde",
|
|
||||||
"tokio",
|
"tokio",
|
||||||
"url",
|
"url",
|
||||||
]
|
]
|
||||||
@@ -1857,7 +1814,6 @@ dependencies = [
|
|||||||
name = "example-pxe"
|
name = "example-pxe"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"brocade",
|
|
||||||
"cidr",
|
"cidr",
|
||||||
"env_logger",
|
"env_logger",
|
||||||
"harmony",
|
"harmony",
|
||||||
@@ -1872,15 +1828,6 @@ dependencies = [
|
|||||||
"url",
|
"url",
|
||||||
]
|
]
|
||||||
|
|
||||||
[[package]]
|
|
||||||
name = "example-remove-rook-osd"
|
|
||||||
version = "0.1.0"
|
|
||||||
dependencies = [
|
|
||||||
"harmony",
|
|
||||||
"harmony_cli",
|
|
||||||
"tokio",
|
|
||||||
]
|
|
||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "example-rust"
|
name = "example-rust"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
@@ -2358,11 +2305,9 @@ name = "harmony"
|
|||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"askama",
|
"askama",
|
||||||
"assertor",
|
|
||||||
"async-trait",
|
"async-trait",
|
||||||
"base64 0.22.1",
|
"base64 0.22.1",
|
||||||
"bollard",
|
"bollard",
|
||||||
"brocade",
|
|
||||||
"chrono",
|
"chrono",
|
||||||
"cidr",
|
"cidr",
|
||||||
"convert_case",
|
"convert_case",
|
||||||
@@ -2393,7 +2338,6 @@ dependencies = [
|
|||||||
"once_cell",
|
"once_cell",
|
||||||
"opnsense-config",
|
"opnsense-config",
|
||||||
"opnsense-config-xml",
|
"opnsense-config-xml",
|
||||||
"option-ext",
|
|
||||||
"pretty_assertions",
|
"pretty_assertions",
|
||||||
"reqwest 0.11.27",
|
"reqwest 0.11.27",
|
||||||
"russh",
|
"russh",
|
||||||
@@ -3180,6 +3124,7 @@ dependencies = [
|
|||||||
"fxhash",
|
"fxhash",
|
||||||
"newline-converter",
|
"newline-converter",
|
||||||
"once_cell",
|
"once_cell",
|
||||||
|
"tempfile",
|
||||||
"unicode-segmentation",
|
"unicode-segmentation",
|
||||||
"unicode-width 0.1.14",
|
"unicode-width 0.1.14",
|
||||||
]
|
]
|
||||||
@@ -3934,7 +3879,6 @@ checksum = "d05e27ee213611ffe7d6348b942e8f942b37114c00cc03cec254295a4a17852e"
|
|||||||
name = "opnsense-config"
|
name = "opnsense-config"
|
||||||
version = "0.1.0"
|
version = "0.1.0"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"assertor",
|
|
||||||
"async-trait",
|
"async-trait",
|
||||||
"chrono",
|
"chrono",
|
||||||
"env_logger",
|
"env_logger",
|
||||||
@@ -4594,9 +4538,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "regex"
|
name = "regex"
|
||||||
version = "1.11.3"
|
version = "1.11.2"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "8b5288124840bee7b386bc413c487869b360b2b4ec421ea56425128692f2a82c"
|
checksum = "23d7fd106d8c02486a8d64e778353d1cffe08ce79ac2e82f540c86d0facf6912"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"aho-corasick 1.1.3",
|
"aho-corasick 1.1.3",
|
||||||
"memchr",
|
"memchr",
|
||||||
@@ -4606,9 +4550,9 @@ dependencies = [
|
|||||||
|
|
||||||
[[package]]
|
[[package]]
|
||||||
name = "regex-automata"
|
name = "regex-automata"
|
||||||
version = "0.4.11"
|
version = "0.4.10"
|
||||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||||
checksum = "833eb9ce86d40ef33cb1306d8accf7bc8ec2bfea4355cbdebb3df68b40925cad"
|
checksum = "6b9458fa0bfeeac22b5ca447c63aaf45f28439a709ccd244698632f9aa6394d6"
|
||||||
dependencies = [
|
dependencies = [
|
||||||
"aho-corasick 1.1.3",
|
"aho-corasick 1.1.3",
|
||||||
"memchr",
|
"memchr",
|
||||||
|
|||||||
@@ -16,7 +16,6 @@ members = [
|
|||||||
"harmony_secret_derive",
|
"harmony_secret_derive",
|
||||||
"harmony_secret",
|
"harmony_secret",
|
||||||
"adr/agent_discovery/mdns",
|
"adr/agent_discovery/mdns",
|
||||||
"brocade",
|
|
||||||
]
|
]
|
||||||
|
|
||||||
[workspace.package]
|
[workspace.package]
|
||||||
@@ -52,7 +51,7 @@ k8s-openapi = { version = "0.25", features = ["v1_30"] }
|
|||||||
serde_yaml = "0.9"
|
serde_yaml = "0.9"
|
||||||
serde-value = "0.7"
|
serde-value = "0.7"
|
||||||
http = "1.2"
|
http = "1.2"
|
||||||
inquire = "0.7"
|
inquire = { version = "0.7", features = ["editor"] }
|
||||||
convert_case = "0.8"
|
convert_case = "0.8"
|
||||||
chrono = "0.4"
|
chrono = "0.4"
|
||||||
similar = "2"
|
similar = "2"
|
||||||
@@ -76,4 +75,3 @@ reqwest = { version = "0.12", features = [
|
|||||||
"http2",
|
"http2",
|
||||||
"json",
|
"json",
|
||||||
], default-features = false }
|
], default-features = false }
|
||||||
assertor = "0.0.4"
|
|
||||||
|
|||||||
156
README.md
156
README.md
@@ -1,6 +1,4 @@
|
|||||||
# Harmony
|
# Harmony : Open-source infrastructure orchestration that treats your platform like first-class code
|
||||||
|
|
||||||
Open-source infrastructure orchestration that treats your platform like first-class code.
|
|
||||||
|
|
||||||
_By [NationTech](https://nationtech.io)_
|
_By [NationTech](https://nationtech.io)_
|
||||||
|
|
||||||
@@ -20,7 +18,9 @@ All in **one strongly-typed Rust codebase**.
|
|||||||
|
|
||||||
From a **developer laptop** to a **global production cluster**, a single **source of truth** drives the **full software lifecycle.**
|
From a **developer laptop** to a **global production cluster**, a single **source of truth** drives the **full software lifecycle.**
|
||||||
|
|
||||||
## The Harmony Philosophy
|
---
|
||||||
|
|
||||||
|
## 1 · The Harmony Philosophy
|
||||||
|
|
||||||
Infrastructure is essential, but it shouldn’t be your core business. Harmony is built on three guiding principles that make modern platforms reliable, repeatable, and easy to reason about.
|
Infrastructure is essential, but it shouldn’t be your core business. Harmony is built on three guiding principles that make modern platforms reliable, repeatable, and easy to reason about.
|
||||||
|
|
||||||
@@ -32,102 +32,112 @@ Infrastructure is essential, but it shouldn’t be your core business. Harmony i
|
|||||||
|
|
||||||
These principles surface as simple, ergonomic Rust APIs that let teams focus on their product while trusting the platform underneath.
|
These principles surface as simple, ergonomic Rust APIs that let teams focus on their product while trusting the platform underneath.
|
||||||
|
|
||||||
## Where to Start
|
---
|
||||||
|
|
||||||
We have a comprehensive set of documentation right here in the repository.
|
## 2 · Quick Start
|
||||||
|
|
||||||
| I want to... | Start Here |
|
The snippet below spins up a complete **production-grade LAMP stack** with monitoring. Swap it for your own scores to deploy anything from microservices to machine-learning pipelines.
|
||||||
| ----------------- | ------------------------------------------------------------------ |
|
|
||||||
| Get Started | [Getting Started Guide](./docs/guides/getting-started.md) |
|
|
||||||
| See an Example | [Use Case: Deploy a Rust Web App](./docs/use-cases/rust-webapp.md) |
|
|
||||||
| Explore | [Documentation Hub](./docs/README.md) |
|
|
||||||
| See Core Concepts | [Core Concepts Explained](./docs/concepts.md) |
|
|
||||||
|
|
||||||
## Quick Look: Deploy a Rust Webapp
|
|
||||||
|
|
||||||
The snippet below spins up a complete **production-grade Rust + Leptos Webapp** with monitoring. Swap it for your own scores to deploy anything from microservices to machine-learning pipelines.
|
|
||||||
|
|
||||||
```rust
|
```rust
|
||||||
use harmony::{
|
use harmony::{
|
||||||
|
data::Version,
|
||||||
inventory::Inventory,
|
inventory::Inventory,
|
||||||
|
maestro::Maestro,
|
||||||
modules::{
|
modules::{
|
||||||
application::{
|
lamp::{LAMPConfig, LAMPScore},
|
||||||
ApplicationScore, RustWebFramework, RustWebapp,
|
monitoring::monitoring_alerting::MonitoringAlertingStackScore,
|
||||||
features::{PackagingDeployment, rhob_monitoring::Monitoring},
|
|
||||||
},
|
|
||||||
monitoring::alert_channel::discord_alert_channel::DiscordWebhook,
|
|
||||||
},
|
},
|
||||||
topology::K8sAnywhereTopology,
|
topology::{K8sAnywhereTopology, Url},
|
||||||
};
|
};
|
||||||
use harmony_macros::hurl;
|
|
||||||
use std::{path::PathBuf, sync::Arc};
|
|
||||||
|
|
||||||
#[tokio::main]
|
#[tokio::main]
|
||||||
async fn main() {
|
async fn main() {
|
||||||
let application = Arc::new(RustWebapp {
|
// 1. Describe what you want
|
||||||
name: "harmony-example-leptos".to_string(),
|
let lamp_stack = LAMPScore {
|
||||||
project_root: PathBuf::from(".."), // <== Your project root, usually .. if you use the standard `/harmony` folder
|
name: "harmony-lamp-demo".into(),
|
||||||
framework: Some(RustWebFramework::Leptos),
|
domain: Url::Url(url::Url::parse("https://lampdemo.example.com").unwrap()),
|
||||||
service_port: 8080,
|
php_version: Version::from("8.3.0").unwrap(),
|
||||||
});
|
config: LAMPConfig {
|
||||||
|
project_root: "./php".into(),
|
||||||
// Define your Application deployment and the features you want
|
database_size: "4Gi".into(),
|
||||||
let app = ApplicationScore {
|
..Default::default()
|
||||||
features: vec![
|
},
|
||||||
Box::new(PackagingDeployment {
|
|
||||||
application: application.clone(),
|
|
||||||
}),
|
|
||||||
Box::new(Monitoring {
|
|
||||||
application: application.clone(),
|
|
||||||
alert_receiver: vec![
|
|
||||||
Box::new(DiscordWebhook {
|
|
||||||
name: "test-discord".to_string(),
|
|
||||||
url: hurl!("https://discord.doesnt.exist.com"), // <== Get your discord webhook url
|
|
||||||
}),
|
|
||||||
],
|
|
||||||
}),
|
|
||||||
],
|
|
||||||
application,
|
|
||||||
};
|
};
|
||||||
|
|
||||||
|
// 2. Enhance with extra scores (monitoring, CI/CD, …)
|
||||||
|
let mut monitoring = MonitoringAlertingStackScore::new();
|
||||||
|
monitoring.namespace = Some(lamp_stack.config.namespace.clone());
|
||||||
|
|
||||||
|
// 3. Run your scores on the desired topology & inventory
|
||||||
harmony_cli::run(
|
harmony_cli::run(
|
||||||
Inventory::autoload(),
|
Inventory::autoload(), // auto-detect hardware / kube-config
|
||||||
K8sAnywhereTopology::from_env(), // <== Deploy to local automatically provisioned local k3d by default or connect to any kubernetes cluster
|
K8sAnywhereTopology::from_env(), // local k3d, CI, staging, prod…
|
||||||
vec![Box::new(app)],
|
vec![
|
||||||
None,
|
Box::new(lamp_stack),
|
||||||
)
|
Box::new(monitoring)
|
||||||
.await
|
],
|
||||||
.unwrap();
|
None
|
||||||
|
).await.unwrap();
|
||||||
}
|
}
|
||||||
```
|
```
|
||||||
|
|
||||||
To run this:
|
Run it:
|
||||||
|
|
||||||
- Clone the repository: `git clone https://git.nationtech.io/nationtech/harmony`
|
```bash
|
||||||
- Install dependencies: `cargo build --release`
|
cargo run
|
||||||
- Run the example: `cargo run --example try_rust_webapp`
|
```
|
||||||
|
|
||||||
## Documentation
|
Harmony analyses the code, shows an execution plan in a TUI, and applies it once you confirm. Same code, same binary—every environment.
|
||||||
|
|
||||||
All documentation is in the `/docs` directory.
|
---
|
||||||
|
|
||||||
- [Documentation Hub](./docs/README.md): The main entry point for all documentation.
|
## 3 · Core Concepts
|
||||||
- [Core Concepts](./docs/concepts.md): A detailed look at Score, Topology, Capability, Inventory, and Interpret.
|
|
||||||
- [Component Catalogs](./docs/catalogs/README.md): Discover all available Scores, Topologies, and Capabilities.
|
|
||||||
- [Developer Guide](./docs/guides/developer-guide.md): Learn how to write your own Scores and Topologies.
|
|
||||||
|
|
||||||
## Architectural Decision Records
|
| Term | One-liner |
|
||||||
|
| ---------------- | ---------------------------------------------------------------------------------------------------- |
|
||||||
|
| **Score<T>** | Declarative description of the desired state (e.g., `LAMPScore`). |
|
||||||
|
| **Interpret<T>** | Imperative logic that realises a `Score` on a specific environment. |
|
||||||
|
| **Topology** | An environment (local k3d, AWS, bare-metal) exposing verified _Capabilities_ (Kubernetes, DNS, …). |
|
||||||
|
| **Maestro** | Orchestrator that compiles Scores + Topology, ensuring all capabilities line up **at compile-time**. |
|
||||||
|
| **Inventory** | Optional catalogue of physical assets for bare-metal and edge deployments. |
|
||||||
|
|
||||||
- [ADR-001 · Why Rust](adr/001-rust.md)
|
A visual overview is in the diagram below.
|
||||||
- [ADR-003 · Infrastructure Abstractions](adr/003-infrastructure-abstractions.md)
|
|
||||||
- [ADR-006 · Secret Management](adr/006-secret-management.md)
|
|
||||||
- [ADR-011 · Multi-Tenant Cluster](adr/011-multi-tenant-cluster.md)
|
|
||||||
|
|
||||||
## Contribute
|
[Harmony Core Architecture](docs/diagrams/Harmony_Core_Architecture.drawio.svg)
|
||||||
|
|
||||||
Discussions and roadmap live in [Issues](https://git.nationtech.io/nationtech/harmony/-/issues). PRs, ideas, and feedback are welcome!
|
---
|
||||||
|
|
||||||
## License
|
## 4 · Install
|
||||||
|
|
||||||
|
Prerequisites:
|
||||||
|
|
||||||
|
- Rust
|
||||||
|
- Docker (if you deploy locally)
|
||||||
|
- `kubectl` / `helm` for Kubernetes-based topologies
|
||||||
|
|
||||||
|
```bash
|
||||||
|
git clone https://git.nationtech.io/nationtech/harmony
|
||||||
|
cd harmony
|
||||||
|
cargo build --release # builds the CLI, TUI and libraries
|
||||||
|
```
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 5 · Learning More
|
||||||
|
|
||||||
|
- **Architectural Decision Records** – dive into the rationale
|
||||||
|
- [ADR-001 · Why Rust](adr/001-rust.md)
|
||||||
|
- [ADR-003 · Infrastructure Abstractions](adr/003-infrastructure-abstractions.md)
|
||||||
|
- [ADR-006 · Secret Management](adr/006-secret-management.md)
|
||||||
|
- [ADR-011 · Multi-Tenant Cluster](adr/011-multi-tenant-cluster.md)
|
||||||
|
|
||||||
|
- **Extending Harmony** – write new Scores / Interprets, add hardware like OPNsense firewalls, or embed Harmony in your own tooling (`/docs`).
|
||||||
|
|
||||||
|
- **Community** – discussions and roadmap live in [GitLab issues](https://git.nationtech.io/nationtech/harmony/-/issues). PRs, ideas, and feedback are welcome!
|
||||||
|
|
||||||
|
---
|
||||||
|
|
||||||
|
## 6 · License
|
||||||
|
|
||||||
Harmony is released under the **GNU AGPL v3**.
|
Harmony is released under the **GNU AGPL v3**.
|
||||||
|
|
||||||
|
|||||||
@@ -1,18 +0,0 @@
|
|||||||
[package]
|
|
||||||
name = "brocade"
|
|
||||||
edition = "2024"
|
|
||||||
version.workspace = true
|
|
||||||
readme.workspace = true
|
|
||||||
license.workspace = true
|
|
||||||
|
|
||||||
[dependencies]
|
|
||||||
async-trait.workspace = true
|
|
||||||
harmony_types = { path = "../harmony_types" }
|
|
||||||
russh.workspace = true
|
|
||||||
russh-keys.workspace = true
|
|
||||||
tokio.workspace = true
|
|
||||||
log.workspace = true
|
|
||||||
env_logger.workspace = true
|
|
||||||
regex = "1.11.3"
|
|
||||||
harmony_secret = { path = "../harmony_secret" }
|
|
||||||
serde.workspace = true
|
|
||||||
@@ -1,70 +0,0 @@
|
|||||||
use std::net::{IpAddr, Ipv4Addr};
|
|
||||||
|
|
||||||
use brocade::BrocadeOptions;
|
|
||||||
use harmony_secret::{Secret, SecretManager};
|
|
||||||
use harmony_types::switch::PortLocation;
|
|
||||||
use serde::{Deserialize, Serialize};
|
|
||||||
|
|
||||||
#[derive(Secret, Clone, Debug, Serialize, Deserialize)]
|
|
||||||
struct BrocadeSwitchAuth {
|
|
||||||
username: String,
|
|
||||||
password: String,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[tokio::main]
|
|
||||||
async fn main() {
|
|
||||||
env_logger::Builder::from_env(env_logger::Env::default().default_filter_or("info")).init();
|
|
||||||
|
|
||||||
// let ip = IpAddr::V4(Ipv4Addr::new(10, 0, 0, 250)); // old brocade @ ianlet
|
|
||||||
let ip = IpAddr::V4(Ipv4Addr::new(192, 168, 55, 101)); // brocade @ sto1
|
|
||||||
// let ip = IpAddr::V4(Ipv4Addr::new(192, 168, 4, 11)); // brocade @ st
|
|
||||||
let switch_addresses = vec![ip];
|
|
||||||
|
|
||||||
let config = SecretManager::get_or_prompt::<BrocadeSwitchAuth>()
|
|
||||||
.await
|
|
||||||
.unwrap();
|
|
||||||
|
|
||||||
let brocade = brocade::init(
|
|
||||||
&switch_addresses,
|
|
||||||
22,
|
|
||||||
&config.username,
|
|
||||||
&config.password,
|
|
||||||
Some(BrocadeOptions {
|
|
||||||
dry_run: true,
|
|
||||||
..Default::default()
|
|
||||||
}),
|
|
||||||
)
|
|
||||||
.await
|
|
||||||
.expect("Brocade client failed to connect");
|
|
||||||
|
|
||||||
let entries = brocade.get_stack_topology().await.unwrap();
|
|
||||||
println!("Stack topology: {entries:#?}");
|
|
||||||
|
|
||||||
let entries = brocade.get_interfaces().await.unwrap();
|
|
||||||
println!("Interfaces: {entries:#?}");
|
|
||||||
|
|
||||||
let version = brocade.version().await.unwrap();
|
|
||||||
println!("Version: {version:?}");
|
|
||||||
|
|
||||||
println!("--------------");
|
|
||||||
let mac_adddresses = brocade.get_mac_address_table().await.unwrap();
|
|
||||||
println!("VLAN\tMAC\t\t\tPORT");
|
|
||||||
for mac in mac_adddresses {
|
|
||||||
println!("{}\t{}\t{}", mac.vlan, mac.mac_address, mac.port);
|
|
||||||
}
|
|
||||||
|
|
||||||
println!("--------------");
|
|
||||||
let channel_name = "1";
|
|
||||||
brocade.clear_port_channel(channel_name).await.unwrap();
|
|
||||||
|
|
||||||
println!("--------------");
|
|
||||||
let channel_id = brocade.find_available_channel_id().await.unwrap();
|
|
||||||
|
|
||||||
println!("--------------");
|
|
||||||
let channel_name = "HARMONY_LAG";
|
|
||||||
let ports = [PortLocation(2, 0, 35)];
|
|
||||||
brocade
|
|
||||||
.create_port_channel(channel_id, channel_name, &ports)
|
|
||||||
.await
|
|
||||||
.unwrap();
|
|
||||||
}
|
|
||||||
@@ -1,212 +0,0 @@
|
|||||||
use super::BrocadeClient;
|
|
||||||
use crate::{
|
|
||||||
BrocadeInfo, Error, ExecutionMode, InterSwitchLink, InterfaceInfo, MacAddressEntry,
|
|
||||||
PortChannelId, PortOperatingMode, parse_brocade_mac_address, shell::BrocadeShell,
|
|
||||||
};
|
|
||||||
|
|
||||||
use async_trait::async_trait;
|
|
||||||
use harmony_types::switch::{PortDeclaration, PortLocation};
|
|
||||||
use log::{debug, info};
|
|
||||||
use regex::Regex;
|
|
||||||
use std::{collections::HashSet, str::FromStr};
|
|
||||||
|
|
||||||
#[derive(Debug)]
|
|
||||||
pub struct FastIronClient {
|
|
||||||
shell: BrocadeShell,
|
|
||||||
version: BrocadeInfo,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl FastIronClient {
|
|
||||||
pub fn init(mut shell: BrocadeShell, version_info: BrocadeInfo) -> Self {
|
|
||||||
shell.before_all(vec!["skip-page-display".into()]);
|
|
||||||
shell.after_all(vec!["page".into()]);
|
|
||||||
|
|
||||||
Self {
|
|
||||||
shell,
|
|
||||||
version: version_info,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn parse_mac_entry(&self, line: &str) -> Option<Result<MacAddressEntry, Error>> {
|
|
||||||
debug!("[Brocade] Parsing mac address entry: {line}");
|
|
||||||
let parts: Vec<&str> = line.split_whitespace().collect();
|
|
||||||
if parts.len() < 3 {
|
|
||||||
return None;
|
|
||||||
}
|
|
||||||
|
|
||||||
let (vlan, mac_address, port) = match parts.len() {
|
|
||||||
3 => (
|
|
||||||
u16::from_str(parts[0]).ok()?,
|
|
||||||
parse_brocade_mac_address(parts[1]).ok()?,
|
|
||||||
parts[2].to_string(),
|
|
||||||
),
|
|
||||||
_ => (
|
|
||||||
1,
|
|
||||||
parse_brocade_mac_address(parts[0]).ok()?,
|
|
||||||
parts[1].to_string(),
|
|
||||||
),
|
|
||||||
};
|
|
||||||
|
|
||||||
let port =
|
|
||||||
PortDeclaration::parse(&port).map_err(|e| Error::UnexpectedError(format!("{e}")));
|
|
||||||
|
|
||||||
match port {
|
|
||||||
Ok(p) => Some(Ok(MacAddressEntry {
|
|
||||||
vlan,
|
|
||||||
mac_address,
|
|
||||||
port: p,
|
|
||||||
})),
|
|
||||||
Err(e) => Some(Err(e)),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn parse_stack_port_entry(&self, line: &str) -> Option<Result<InterSwitchLink, Error>> {
|
|
||||||
debug!("[Brocade] Parsing stack port entry: {line}");
|
|
||||||
let parts: Vec<&str> = line.split_whitespace().collect();
|
|
||||||
if parts.len() < 10 {
|
|
||||||
return None;
|
|
||||||
}
|
|
||||||
|
|
||||||
let local_port = PortLocation::from_str(parts[0]).ok()?;
|
|
||||||
|
|
||||||
Some(Ok(InterSwitchLink {
|
|
||||||
local_port,
|
|
||||||
remote_port: None,
|
|
||||||
}))
|
|
||||||
}
|
|
||||||
|
|
||||||
fn build_port_channel_commands(
|
|
||||||
&self,
|
|
||||||
channel_id: PortChannelId,
|
|
||||||
channel_name: &str,
|
|
||||||
ports: &[PortLocation],
|
|
||||||
) -> Vec<String> {
|
|
||||||
let mut commands = vec![
|
|
||||||
"configure terminal".to_string(),
|
|
||||||
format!("lag {channel_name} static id {channel_id}"),
|
|
||||||
];
|
|
||||||
|
|
||||||
for port in ports {
|
|
||||||
commands.push(format!("ports ethernet {port}"));
|
|
||||||
}
|
|
||||||
|
|
||||||
commands.push(format!("primary-port {}", ports[0]));
|
|
||||||
commands.push("deploy".into());
|
|
||||||
commands.push("exit".into());
|
|
||||||
commands.push("write memory".into());
|
|
||||||
commands.push("exit".into());
|
|
||||||
|
|
||||||
commands
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[async_trait]
|
|
||||||
impl BrocadeClient for FastIronClient {
|
|
||||||
async fn version(&self) -> Result<BrocadeInfo, Error> {
|
|
||||||
Ok(self.version.clone())
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn get_mac_address_table(&self) -> Result<Vec<MacAddressEntry>, Error> {
|
|
||||||
info!("[Brocade] Showing MAC address table...");
|
|
||||||
|
|
||||||
let output = self
|
|
||||||
.shell
|
|
||||||
.run_command("show mac-address", ExecutionMode::Regular)
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
output
|
|
||||||
.lines()
|
|
||||||
.skip(2)
|
|
||||||
.filter_map(|line| self.parse_mac_entry(line))
|
|
||||||
.collect()
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn get_stack_topology(&self) -> Result<Vec<InterSwitchLink>, Error> {
|
|
||||||
let output = self
|
|
||||||
.shell
|
|
||||||
.run_command("show interface stack-ports", crate::ExecutionMode::Regular)
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
output
|
|
||||||
.lines()
|
|
||||||
.skip(1)
|
|
||||||
.filter_map(|line| self.parse_stack_port_entry(line))
|
|
||||||
.collect()
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn get_interfaces(&self) -> Result<Vec<InterfaceInfo>, Error> {
|
|
||||||
todo!()
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn configure_interfaces(
|
|
||||||
&self,
|
|
||||||
_interfaces: Vec<(String, PortOperatingMode)>,
|
|
||||||
) -> Result<(), Error> {
|
|
||||||
todo!()
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn find_available_channel_id(&self) -> Result<PortChannelId, Error> {
|
|
||||||
info!("[Brocade] Finding next available channel id...");
|
|
||||||
|
|
||||||
let output = self
|
|
||||||
.shell
|
|
||||||
.run_command("show lag", ExecutionMode::Regular)
|
|
||||||
.await?;
|
|
||||||
let re = Regex::new(r"=== LAG .* ID\s+(\d+)").expect("Invalid regex");
|
|
||||||
|
|
||||||
let used_ids: HashSet<u8> = output
|
|
||||||
.lines()
|
|
||||||
.filter_map(|line| {
|
|
||||||
re.captures(line)
|
|
||||||
.and_then(|c| c.get(1))
|
|
||||||
.and_then(|id_match| id_match.as_str().parse().ok())
|
|
||||||
})
|
|
||||||
.collect();
|
|
||||||
|
|
||||||
let mut next_id: u8 = 1;
|
|
||||||
loop {
|
|
||||||
if !used_ids.contains(&next_id) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
next_id += 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
info!("[Brocade] Found channel id: {next_id}");
|
|
||||||
Ok(next_id)
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn create_port_channel(
|
|
||||||
&self,
|
|
||||||
channel_id: PortChannelId,
|
|
||||||
channel_name: &str,
|
|
||||||
ports: &[PortLocation],
|
|
||||||
) -> Result<(), Error> {
|
|
||||||
info!(
|
|
||||||
"[Brocade] Configuring port-channel '{channel_name} {channel_id}' with ports: {ports:?}"
|
|
||||||
);
|
|
||||||
|
|
||||||
let commands = self.build_port_channel_commands(channel_id, channel_name, ports);
|
|
||||||
self.shell
|
|
||||||
.run_commands(commands, ExecutionMode::Privileged)
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
info!("[Brocade] Port-channel '{channel_name}' configured.");
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn clear_port_channel(&self, channel_name: &str) -> Result<(), Error> {
|
|
||||||
info!("[Brocade] Clearing port-channel: {channel_name}");
|
|
||||||
|
|
||||||
let commands = vec![
|
|
||||||
"configure terminal".to_string(),
|
|
||||||
format!("no lag {channel_name}"),
|
|
||||||
"write memory".to_string(),
|
|
||||||
];
|
|
||||||
self.shell
|
|
||||||
.run_commands(commands, ExecutionMode::Privileged)
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
info!("[Brocade] Port-channel '{channel_name}' cleared.");
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,338 +0,0 @@
|
|||||||
use std::net::IpAddr;
|
|
||||||
use std::{
|
|
||||||
fmt::{self, Display},
|
|
||||||
time::Duration,
|
|
||||||
};
|
|
||||||
|
|
||||||
use crate::network_operating_system::NetworkOperatingSystemClient;
|
|
||||||
use crate::{
|
|
||||||
fast_iron::FastIronClient,
|
|
||||||
shell::{BrocadeSession, BrocadeShell},
|
|
||||||
};
|
|
||||||
|
|
||||||
use async_trait::async_trait;
|
|
||||||
use harmony_types::net::MacAddress;
|
|
||||||
use harmony_types::switch::{PortDeclaration, PortLocation};
|
|
||||||
use regex::Regex;
|
|
||||||
|
|
||||||
mod fast_iron;
|
|
||||||
mod network_operating_system;
|
|
||||||
mod shell;
|
|
||||||
mod ssh;
|
|
||||||
|
|
||||||
#[derive(Default, Clone, Debug)]
|
|
||||||
pub struct BrocadeOptions {
|
|
||||||
pub dry_run: bool,
|
|
||||||
pub ssh: ssh::SshOptions,
|
|
||||||
pub timeouts: TimeoutConfig,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Clone, Debug)]
|
|
||||||
pub struct TimeoutConfig {
|
|
||||||
pub shell_ready: Duration,
|
|
||||||
pub command_execution: Duration,
|
|
||||||
pub command_output: Duration,
|
|
||||||
pub cleanup: Duration,
|
|
||||||
pub message_wait: Duration,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Default for TimeoutConfig {
|
|
||||||
fn default() -> Self {
|
|
||||||
Self {
|
|
||||||
shell_ready: Duration::from_secs(10),
|
|
||||||
command_execution: Duration::from_secs(60), // Commands like `deploy` (for a LAG) can take a while
|
|
||||||
command_output: Duration::from_secs(5), // Delay to start logging "waiting for command output"
|
|
||||||
cleanup: Duration::from_secs(10),
|
|
||||||
message_wait: Duration::from_millis(500),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
enum ExecutionMode {
|
|
||||||
Regular,
|
|
||||||
Privileged,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Clone, Debug)]
|
|
||||||
pub struct BrocadeInfo {
|
|
||||||
os: BrocadeOs,
|
|
||||||
version: String,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Clone, Debug)]
|
|
||||||
pub enum BrocadeOs {
|
|
||||||
NetworkOperatingSystem,
|
|
||||||
FastIron,
|
|
||||||
Unknown,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, PartialEq, Eq, PartialOrd, Ord, Clone)]
|
|
||||||
pub struct MacAddressEntry {
|
|
||||||
pub vlan: u16,
|
|
||||||
pub mac_address: MacAddress,
|
|
||||||
pub port: PortDeclaration,
|
|
||||||
}
|
|
||||||
|
|
||||||
pub type PortChannelId = u8;
|
|
||||||
|
|
||||||
/// Represents a single physical or logical link connecting two switches within a stack or fabric.
|
|
||||||
///
|
|
||||||
/// This structure provides a standardized view of the topology regardless of the
|
|
||||||
/// underlying Brocade OS configuration (stacking vs. fabric).
|
|
||||||
#[derive(Debug, PartialEq, Eq, Clone)]
|
|
||||||
pub struct InterSwitchLink {
|
|
||||||
/// The local port on the switch where the topology command was run.
|
|
||||||
pub local_port: PortLocation,
|
|
||||||
/// The port on the directly connected neighboring switch.
|
|
||||||
pub remote_port: Option<PortLocation>,
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Represents the key running configuration status of a single switch interface.
|
|
||||||
#[derive(Debug, PartialEq, Eq, Clone)]
|
|
||||||
pub struct InterfaceInfo {
|
|
||||||
/// The full configuration name (e.g., "TenGigabitEthernet 1/0/1", "FortyGigabitEthernet 2/0/2").
|
|
||||||
pub name: String,
|
|
||||||
/// The physical location of the interface.
|
|
||||||
pub port_location: PortLocation,
|
|
||||||
/// The parsed type and name prefix of the interface.
|
|
||||||
pub interface_type: InterfaceType,
|
|
||||||
/// The primary configuration mode defining the interface's behavior (L2, L3, Fabric).
|
|
||||||
pub operating_mode: Option<PortOperatingMode>,
|
|
||||||
/// Indicates the current state of the interface.
|
|
||||||
pub status: InterfaceStatus,
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Categorizes the functional type of a switch interface.
|
|
||||||
#[derive(Debug, PartialEq, Eq, Clone)]
|
|
||||||
pub enum InterfaceType {
|
|
||||||
/// Physical or virtual Ethernet interface (e.g., TenGigabitEthernet, FortyGigabitEthernet).
|
|
||||||
Ethernet(String),
|
|
||||||
}
|
|
||||||
|
|
||||||
impl fmt::Display for InterfaceType {
|
|
||||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
|
||||||
match self {
|
|
||||||
InterfaceType::Ethernet(name) => write!(f, "{name}"),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Defines the primary configuration mode of a switch interface, representing mutually exclusive roles.
|
|
||||||
#[derive(Debug, PartialEq, Eq, Clone)]
|
|
||||||
pub enum PortOperatingMode {
|
|
||||||
/// The interface is explicitly configured for Brocade fabric roles (ISL or Trunk enabled).
|
|
||||||
Fabric,
|
|
||||||
/// The interface is configured for standard Layer 2 switching as Trunk port (`switchport mode trunk`).
|
|
||||||
Trunk,
|
|
||||||
/// The interface is configured for standard Layer 2 switching as Access port (`switchport` without trunk mode).
|
|
||||||
Access,
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Defines the possible status of an interface.
|
|
||||||
#[derive(Debug, PartialEq, Eq, Clone)]
|
|
||||||
pub enum InterfaceStatus {
|
|
||||||
/// The interface is connected.
|
|
||||||
Connected,
|
|
||||||
/// The interface is not connected and is not expected to be.
|
|
||||||
NotConnected,
|
|
||||||
/// The interface is not connected but is expected to be (configured with `no shutdown`).
|
|
||||||
SfpAbsent,
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn init(
|
|
||||||
ip_addresses: &[IpAddr],
|
|
||||||
port: u16,
|
|
||||||
username: &str,
|
|
||||||
password: &str,
|
|
||||||
options: Option<BrocadeOptions>,
|
|
||||||
) -> Result<Box<dyn BrocadeClient + Send + Sync>, Error> {
|
|
||||||
let shell = BrocadeShell::init(ip_addresses, port, username, password, options).await?;
|
|
||||||
|
|
||||||
let version_info = shell
|
|
||||||
.with_session(ExecutionMode::Regular, |session| {
|
|
||||||
Box::pin(get_brocade_info(session))
|
|
||||||
})
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
Ok(match version_info.os {
|
|
||||||
BrocadeOs::FastIron => Box::new(FastIronClient::init(shell, version_info)),
|
|
||||||
BrocadeOs::NetworkOperatingSystem => {
|
|
||||||
Box::new(NetworkOperatingSystemClient::init(shell, version_info))
|
|
||||||
}
|
|
||||||
BrocadeOs::Unknown => todo!(),
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
#[async_trait]
|
|
||||||
pub trait BrocadeClient: std::fmt::Debug {
|
|
||||||
/// Retrieves the operating system and version details from the connected Brocade switch.
|
|
||||||
///
|
|
||||||
/// This is typically the first call made after establishing a connection to determine
|
|
||||||
/// the switch OS family (e.g., FastIron, NOS) for feature compatibility.
|
|
||||||
///
|
|
||||||
/// # Returns
|
|
||||||
///
|
|
||||||
/// A `BrocadeInfo` structure containing parsed OS type and version string.
|
|
||||||
async fn version(&self) -> Result<BrocadeInfo, Error>;
|
|
||||||
|
|
||||||
/// Retrieves the dynamically learned MAC address table from the switch.
|
|
||||||
///
|
|
||||||
/// This is crucial for discovering where specific network endpoints (MAC addresses)
|
|
||||||
/// are currently located on the physical ports.
|
|
||||||
///
|
|
||||||
/// # Returns
|
|
||||||
///
|
|
||||||
/// A vector of `MacAddressEntry`, where each entry typically contains VLAN, MAC address,
|
|
||||||
/// and the associated port name/index.
|
|
||||||
async fn get_mac_address_table(&self) -> Result<Vec<MacAddressEntry>, Error>;
|
|
||||||
|
|
||||||
/// Derives the physical connections used to link multiple switches together
|
|
||||||
/// to form a single logical entity (stack, fabric, etc.).
|
|
||||||
///
|
|
||||||
/// This abstracts the underlying configuration (e.g., stack ports, fabric ports)
|
|
||||||
/// to return a standardized view of the topology.
|
|
||||||
///
|
|
||||||
/// # Returns
|
|
||||||
///
|
|
||||||
/// A vector of `InterSwitchLink` structs detailing which ports are used for stacking/fabric.
|
|
||||||
/// If the switch is not stacked, returns an empty vector.
|
|
||||||
async fn get_stack_topology(&self) -> Result<Vec<InterSwitchLink>, Error>;
|
|
||||||
|
|
||||||
/// Retrieves the status for all interfaces
|
|
||||||
///
|
|
||||||
/// # Returns
|
|
||||||
///
|
|
||||||
/// A vector of `InterfaceInfo` structures.
|
|
||||||
async fn get_interfaces(&self) -> Result<Vec<InterfaceInfo>, Error>;
|
|
||||||
|
|
||||||
/// Configures a set of interfaces to be operated with a specified mode (access ports, ISL, etc.).
|
|
||||||
async fn configure_interfaces(
|
|
||||||
&self,
|
|
||||||
interfaces: Vec<(String, PortOperatingMode)>,
|
|
||||||
) -> Result<(), Error>;
|
|
||||||
|
|
||||||
/// Scans the existing configuration to find the next available (unused)
|
|
||||||
/// Port-Channel ID (`lag` or `trunk`) for assignment.
|
|
||||||
///
|
|
||||||
/// # Returns
|
|
||||||
///
|
|
||||||
/// The smallest, unassigned `PortChannelId` within the supported range.
|
|
||||||
async fn find_available_channel_id(&self) -> Result<PortChannelId, Error>;
|
|
||||||
|
|
||||||
/// Creates and configures a new Port-Channel (Link Aggregation Group or LAG)
|
|
||||||
/// using the specified channel ID and ports.
|
|
||||||
///
|
|
||||||
/// The resulting configuration must be persistent (saved to startup-config).
|
|
||||||
/// Assumes a static LAG configuration mode unless specified otherwise by the implementation.
|
|
||||||
///
|
|
||||||
/// # Parameters
|
|
||||||
///
|
|
||||||
/// * `channel_id`: The ID (e.g., 1-128) for the logical port channel.
|
|
||||||
/// * `channel_name`: A descriptive name for the LAG (used in configuration context).
|
|
||||||
/// * `ports`: A slice of `PortLocation` structs defining the physical member ports.
|
|
||||||
async fn create_port_channel(
|
|
||||||
&self,
|
|
||||||
channel_id: PortChannelId,
|
|
||||||
channel_name: &str,
|
|
||||||
ports: &[PortLocation],
|
|
||||||
) -> Result<(), Error>;
|
|
||||||
|
|
||||||
/// Removes all configuration associated with the specified Port-Channel name.
|
|
||||||
///
|
|
||||||
/// This operation should be idempotent; attempting to clear a non-existent
|
|
||||||
/// channel should succeed (or return a benign error).
|
|
||||||
///
|
|
||||||
/// # Parameters
|
|
||||||
///
|
|
||||||
/// * `channel_name`: The name of the Port-Channel (LAG) to delete.
|
|
||||||
///
|
|
||||||
async fn clear_port_channel(&self, channel_name: &str) -> Result<(), Error>;
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn get_brocade_info(session: &mut BrocadeSession) -> Result<BrocadeInfo, Error> {
|
|
||||||
let output = session.run_command("show version").await?;
|
|
||||||
|
|
||||||
if output.contains("Network Operating System") {
|
|
||||||
let re = Regex::new(r"Network Operating System Version:\s*(?P<version>[a-zA-Z0-9.\-]+)")
|
|
||||||
.expect("Invalid regex");
|
|
||||||
let version = re
|
|
||||||
.captures(&output)
|
|
||||||
.and_then(|cap| cap.name("version"))
|
|
||||||
.map(|m| m.as_str().to_string())
|
|
||||||
.unwrap_or_default();
|
|
||||||
|
|
||||||
return Ok(BrocadeInfo {
|
|
||||||
os: BrocadeOs::NetworkOperatingSystem,
|
|
||||||
version,
|
|
||||||
});
|
|
||||||
} else if output.contains("ICX") {
|
|
||||||
let re = Regex::new(r"(?m)^\s*SW: Version\s*(?P<version>[a-zA-Z0-9.\-]+)")
|
|
||||||
.expect("Invalid regex");
|
|
||||||
let version = re
|
|
||||||
.captures(&output)
|
|
||||||
.and_then(|cap| cap.name("version"))
|
|
||||||
.map(|m| m.as_str().to_string())
|
|
||||||
.unwrap_or_default();
|
|
||||||
|
|
||||||
return Ok(BrocadeInfo {
|
|
||||||
os: BrocadeOs::FastIron,
|
|
||||||
version,
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
Err(Error::UnexpectedError("Unknown Brocade OS version".into()))
|
|
||||||
}
|
|
||||||
|
|
||||||
fn parse_brocade_mac_address(value: &str) -> Result<MacAddress, String> {
|
|
||||||
let cleaned_mac = value.replace('.', "");
|
|
||||||
|
|
||||||
if cleaned_mac.len() != 12 {
|
|
||||||
return Err(format!("Invalid MAC address: {value}"));
|
|
||||||
}
|
|
||||||
|
|
||||||
let mut bytes = [0u8; 6];
|
|
||||||
for (i, pair) in cleaned_mac.as_bytes().chunks(2).enumerate() {
|
|
||||||
let byte_str = std::str::from_utf8(pair).map_err(|_| "Invalid UTF-8")?;
|
|
||||||
bytes[i] =
|
|
||||||
u8::from_str_radix(byte_str, 16).map_err(|_| format!("Invalid hex in MAC: {value}"))?;
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(MacAddress(bytes))
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug)]
|
|
||||||
pub enum Error {
|
|
||||||
NetworkError(String),
|
|
||||||
AuthenticationError(String),
|
|
||||||
ConfigurationError(String),
|
|
||||||
TimeoutError(String),
|
|
||||||
UnexpectedError(String),
|
|
||||||
CommandError(String),
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Display for Error {
|
|
||||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
|
||||||
match self {
|
|
||||||
Error::NetworkError(msg) => write!(f, "Network error: {msg}"),
|
|
||||||
Error::AuthenticationError(msg) => write!(f, "Authentication error: {msg}"),
|
|
||||||
Error::ConfigurationError(msg) => write!(f, "Configuration error: {msg}"),
|
|
||||||
Error::TimeoutError(msg) => write!(f, "Timeout error: {msg}"),
|
|
||||||
Error::UnexpectedError(msg) => write!(f, "Unexpected error: {msg}"),
|
|
||||||
Error::CommandError(msg) => write!(f, "{msg}"),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl From<Error> for String {
|
|
||||||
fn from(val: Error) -> Self {
|
|
||||||
format!("{val}")
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl std::error::Error for Error {}
|
|
||||||
|
|
||||||
impl From<russh::Error> for Error {
|
|
||||||
fn from(value: russh::Error) -> Self {
|
|
||||||
Error::NetworkError(format!("Russh client error: {value}"))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,333 +0,0 @@
|
|||||||
use std::str::FromStr;
|
|
||||||
|
|
||||||
use async_trait::async_trait;
|
|
||||||
use harmony_types::switch::{PortDeclaration, PortLocation};
|
|
||||||
use log::{debug, info};
|
|
||||||
use regex::Regex;
|
|
||||||
|
|
||||||
use crate::{
|
|
||||||
BrocadeClient, BrocadeInfo, Error, ExecutionMode, InterSwitchLink, InterfaceInfo,
|
|
||||||
InterfaceStatus, InterfaceType, MacAddressEntry, PortChannelId, PortOperatingMode,
|
|
||||||
parse_brocade_mac_address, shell::BrocadeShell,
|
|
||||||
};
|
|
||||||
|
|
||||||
#[derive(Debug)]
|
|
||||||
pub struct NetworkOperatingSystemClient {
|
|
||||||
shell: BrocadeShell,
|
|
||||||
version: BrocadeInfo,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl NetworkOperatingSystemClient {
|
|
||||||
pub fn init(mut shell: BrocadeShell, version_info: BrocadeInfo) -> Self {
|
|
||||||
shell.before_all(vec!["terminal length 0".into()]);
|
|
||||||
|
|
||||||
Self {
|
|
||||||
shell,
|
|
||||||
version: version_info,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn parse_mac_entry(&self, line: &str) -> Option<Result<MacAddressEntry, Error>> {
|
|
||||||
debug!("[Brocade] Parsing mac address entry: {line}");
|
|
||||||
let parts: Vec<&str> = line.split_whitespace().collect();
|
|
||||||
if parts.len() < 5 {
|
|
||||||
return None;
|
|
||||||
}
|
|
||||||
|
|
||||||
let (vlan, mac_address, port) = match parts.len() {
|
|
||||||
5 => (
|
|
||||||
u16::from_str(parts[0]).ok()?,
|
|
||||||
parse_brocade_mac_address(parts[1]).ok()?,
|
|
||||||
parts[4].to_string(),
|
|
||||||
),
|
|
||||||
_ => (
|
|
||||||
u16::from_str(parts[0]).ok()?,
|
|
||||||
parse_brocade_mac_address(parts[1]).ok()?,
|
|
||||||
parts[5].to_string(),
|
|
||||||
),
|
|
||||||
};
|
|
||||||
|
|
||||||
let port =
|
|
||||||
PortDeclaration::parse(&port).map_err(|e| Error::UnexpectedError(format!("{e}")));
|
|
||||||
|
|
||||||
match port {
|
|
||||||
Ok(p) => Some(Ok(MacAddressEntry {
|
|
||||||
vlan,
|
|
||||||
mac_address,
|
|
||||||
port: p,
|
|
||||||
})),
|
|
||||||
Err(e) => Some(Err(e)),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn parse_inter_switch_link_entry(&self, line: &str) -> Option<Result<InterSwitchLink, Error>> {
|
|
||||||
debug!("[Brocade] Parsing inter switch link entry: {line}");
|
|
||||||
let parts: Vec<&str> = line.split_whitespace().collect();
|
|
||||||
if parts.len() < 10 {
|
|
||||||
return None;
|
|
||||||
}
|
|
||||||
|
|
||||||
let local_port = PortLocation::from_str(parts[2]).ok()?;
|
|
||||||
let remote_port = PortLocation::from_str(parts[5]).ok()?;
|
|
||||||
|
|
||||||
Some(Ok(InterSwitchLink {
|
|
||||||
local_port,
|
|
||||||
remote_port: Some(remote_port),
|
|
||||||
}))
|
|
||||||
}
|
|
||||||
|
|
||||||
fn parse_interface_status_entry(&self, line: &str) -> Option<Result<InterfaceInfo, Error>> {
|
|
||||||
debug!("[Brocade] Parsing interface status entry: {line}");
|
|
||||||
let parts: Vec<&str> = line.split_whitespace().collect();
|
|
||||||
if parts.len() < 6 {
|
|
||||||
return None;
|
|
||||||
}
|
|
||||||
|
|
||||||
let interface_type = match parts[0] {
|
|
||||||
"Fo" => InterfaceType::Ethernet("FortyGigabitEthernet".to_string()),
|
|
||||||
"Te" => InterfaceType::Ethernet("TenGigabitEthernet".to_string()),
|
|
||||||
_ => return None,
|
|
||||||
};
|
|
||||||
let port_location = PortLocation::from_str(parts[1]).ok()?;
|
|
||||||
let status = match parts[2] {
|
|
||||||
"connected" => InterfaceStatus::Connected,
|
|
||||||
"notconnected" => InterfaceStatus::NotConnected,
|
|
||||||
"sfpAbsent" => InterfaceStatus::SfpAbsent,
|
|
||||||
_ => return None,
|
|
||||||
};
|
|
||||||
let operating_mode = match parts[3] {
|
|
||||||
"ISL" => Some(PortOperatingMode::Fabric),
|
|
||||||
"Trunk" => Some(PortOperatingMode::Trunk),
|
|
||||||
"Access" => Some(PortOperatingMode::Access),
|
|
||||||
"--" => None,
|
|
||||||
_ => return None,
|
|
||||||
};
|
|
||||||
|
|
||||||
Some(Ok(InterfaceInfo {
|
|
||||||
name: format!("{interface_type} {port_location}"),
|
|
||||||
port_location,
|
|
||||||
interface_type,
|
|
||||||
operating_mode,
|
|
||||||
status,
|
|
||||||
}))
|
|
||||||
}
|
|
||||||
|
|
||||||
fn map_configure_interfaces_error(&self, err: Error) -> Error {
|
|
||||||
debug!("[Brocade] {err}");
|
|
||||||
|
|
||||||
if let Error::CommandError(message) = &err {
|
|
||||||
if message.contains("switchport")
|
|
||||||
&& message.contains("Cannot configure aggregator member")
|
|
||||||
{
|
|
||||||
let re = Regex::new(r"\(conf-if-([a-zA-Z]+)-([\d/]+)\)#").unwrap();
|
|
||||||
|
|
||||||
if let Some(caps) = re.captures(message) {
|
|
||||||
let interface_type = &caps[1];
|
|
||||||
let port_location = &caps[2];
|
|
||||||
let interface = format!("{interface_type} {port_location}");
|
|
||||||
|
|
||||||
return Error::CommandError(format!(
|
|
||||||
"Cannot configure interface '{interface}', it is a member of a port-channel (LAG)"
|
|
||||||
));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
err
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[async_trait]
|
|
||||||
impl BrocadeClient for NetworkOperatingSystemClient {
|
|
||||||
async fn version(&self) -> Result<BrocadeInfo, Error> {
|
|
||||||
Ok(self.version.clone())
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn get_mac_address_table(&self) -> Result<Vec<MacAddressEntry>, Error> {
|
|
||||||
let output = self
|
|
||||||
.shell
|
|
||||||
.run_command("show mac-address-table", ExecutionMode::Regular)
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
output
|
|
||||||
.lines()
|
|
||||||
.skip(1)
|
|
||||||
.filter_map(|line| self.parse_mac_entry(line))
|
|
||||||
.collect()
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn get_stack_topology(&self) -> Result<Vec<InterSwitchLink>, Error> {
|
|
||||||
let output = self
|
|
||||||
.shell
|
|
||||||
.run_command("show fabric isl", ExecutionMode::Regular)
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
output
|
|
||||||
.lines()
|
|
||||||
.skip(6)
|
|
||||||
.filter_map(|line| self.parse_inter_switch_link_entry(line))
|
|
||||||
.collect()
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn get_interfaces(&self) -> Result<Vec<InterfaceInfo>, Error> {
|
|
||||||
let output = self
|
|
||||||
.shell
|
|
||||||
.run_command(
|
|
||||||
"show interface status rbridge-id all",
|
|
||||||
ExecutionMode::Regular,
|
|
||||||
)
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
output
|
|
||||||
.lines()
|
|
||||||
.skip(2)
|
|
||||||
.filter_map(|line| self.parse_interface_status_entry(line))
|
|
||||||
.collect()
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn configure_interfaces(
|
|
||||||
&self,
|
|
||||||
interfaces: Vec<(String, PortOperatingMode)>,
|
|
||||||
) -> Result<(), Error> {
|
|
||||||
info!("[Brocade] Configuring {} interface(s)...", interfaces.len());
|
|
||||||
|
|
||||||
let mut commands = vec!["configure terminal".to_string()];
|
|
||||||
|
|
||||||
for interface in interfaces {
|
|
||||||
commands.push(format!("interface {}", interface.0));
|
|
||||||
|
|
||||||
match interface.1 {
|
|
||||||
PortOperatingMode::Fabric => {
|
|
||||||
commands.push("fabric isl enable".into());
|
|
||||||
commands.push("fabric trunk enable".into());
|
|
||||||
}
|
|
||||||
PortOperatingMode::Trunk => {
|
|
||||||
commands.push("switchport".into());
|
|
||||||
commands.push("switchport mode trunk".into());
|
|
||||||
commands.push("no spanning-tree shutdown".into());
|
|
||||||
commands.push("no fabric isl enable".into());
|
|
||||||
commands.push("no fabric trunk enable".into());
|
|
||||||
}
|
|
||||||
PortOperatingMode::Access => {
|
|
||||||
commands.push("switchport".into());
|
|
||||||
commands.push("switchport mode access".into());
|
|
||||||
commands.push("switchport access vlan 1".into());
|
|
||||||
commands.push("no spanning-tree shutdown".into());
|
|
||||||
commands.push("no fabric isl enable".into());
|
|
||||||
commands.push("no fabric trunk enable".into());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
commands.push("no shutdown".into());
|
|
||||||
commands.push("exit".into());
|
|
||||||
}
|
|
||||||
|
|
||||||
self.shell
|
|
||||||
.run_commands(commands, ExecutionMode::Regular)
|
|
||||||
.await
|
|
||||||
.map_err(|err| self.map_configure_interfaces_error(err))?;
|
|
||||||
|
|
||||||
info!("[Brocade] Interfaces configured.");
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn find_available_channel_id(&self) -> Result<PortChannelId, Error> {
|
|
||||||
info!("[Brocade] Finding next available channel id...");
|
|
||||||
|
|
||||||
let output = self
|
|
||||||
.shell
|
|
||||||
.run_command("show port-channel summary", ExecutionMode::Regular)
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
let used_ids: Vec<u8> = output
|
|
||||||
.lines()
|
|
||||||
.skip(6)
|
|
||||||
.filter_map(|line| {
|
|
||||||
let parts: Vec<&str> = line.split_whitespace().collect();
|
|
||||||
if parts.len() < 8 {
|
|
||||||
return None;
|
|
||||||
}
|
|
||||||
|
|
||||||
u8::from_str(parts[0]).ok()
|
|
||||||
})
|
|
||||||
.collect();
|
|
||||||
|
|
||||||
let mut next_id: u8 = 1;
|
|
||||||
loop {
|
|
||||||
if !used_ids.contains(&next_id) {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
next_id += 1;
|
|
||||||
}
|
|
||||||
|
|
||||||
info!("[Brocade] Found channel id: {next_id}");
|
|
||||||
Ok(next_id)
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn create_port_channel(
|
|
||||||
&self,
|
|
||||||
channel_id: PortChannelId,
|
|
||||||
channel_name: &str,
|
|
||||||
ports: &[PortLocation],
|
|
||||||
) -> Result<(), Error> {
|
|
||||||
info!(
|
|
||||||
"[Brocade] Configuring port-channel '{channel_id} {channel_name}' with ports: {}",
|
|
||||||
ports
|
|
||||||
.iter()
|
|
||||||
.map(|p| format!("{p}"))
|
|
||||||
.collect::<Vec<String>>()
|
|
||||||
.join(", ")
|
|
||||||
);
|
|
||||||
|
|
||||||
let interfaces = self.get_interfaces().await?;
|
|
||||||
|
|
||||||
let mut commands = vec![
|
|
||||||
"configure terminal".into(),
|
|
||||||
format!("interface port-channel {}", channel_id),
|
|
||||||
"no shutdown".into(),
|
|
||||||
"exit".into(),
|
|
||||||
];
|
|
||||||
|
|
||||||
for port in ports {
|
|
||||||
let interface = interfaces.iter().find(|i| i.port_location == *port);
|
|
||||||
let Some(interface) = interface else {
|
|
||||||
continue;
|
|
||||||
};
|
|
||||||
|
|
||||||
commands.push(format!("interface {}", interface.name));
|
|
||||||
commands.push("no switchport".into());
|
|
||||||
commands.push("no ip address".into());
|
|
||||||
commands.push("no fabric isl enable".into());
|
|
||||||
commands.push("no fabric trunk enable".into());
|
|
||||||
commands.push(format!("channel-group {channel_id} mode active"));
|
|
||||||
commands.push("no shutdown".into());
|
|
||||||
commands.push("exit".into());
|
|
||||||
}
|
|
||||||
|
|
||||||
self.shell
|
|
||||||
.run_commands(commands, ExecutionMode::Regular)
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
info!("[Brocade] Port-channel '{channel_name}' configured.");
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn clear_port_channel(&self, channel_name: &str) -> Result<(), Error> {
|
|
||||||
info!("[Brocade] Clearing port-channel: {channel_name}");
|
|
||||||
|
|
||||||
let commands = vec![
|
|
||||||
"configure terminal".into(),
|
|
||||||
format!("no interface port-channel {}", channel_name),
|
|
||||||
"exit".into(),
|
|
||||||
];
|
|
||||||
|
|
||||||
self.shell
|
|
||||||
.run_commands(commands, ExecutionMode::Regular)
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
info!("[Brocade] Port-channel '{channel_name}' cleared.");
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,370 +0,0 @@
|
|||||||
use std::net::IpAddr;
|
|
||||||
use std::time::Duration;
|
|
||||||
use std::time::Instant;
|
|
||||||
|
|
||||||
use crate::BrocadeOptions;
|
|
||||||
use crate::Error;
|
|
||||||
use crate::ExecutionMode;
|
|
||||||
use crate::TimeoutConfig;
|
|
||||||
use crate::ssh;
|
|
||||||
|
|
||||||
use log::debug;
|
|
||||||
use log::info;
|
|
||||||
use russh::ChannelMsg;
|
|
||||||
use tokio::time::timeout;
|
|
||||||
|
|
||||||
#[derive(Debug)]
|
|
||||||
pub struct BrocadeShell {
|
|
||||||
ip: IpAddr,
|
|
||||||
port: u16,
|
|
||||||
username: String,
|
|
||||||
password: String,
|
|
||||||
options: BrocadeOptions,
|
|
||||||
before_all_commands: Vec<String>,
|
|
||||||
after_all_commands: Vec<String>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl BrocadeShell {
|
|
||||||
pub async fn init(
|
|
||||||
ip_addresses: &[IpAddr],
|
|
||||||
port: u16,
|
|
||||||
username: &str,
|
|
||||||
password: &str,
|
|
||||||
options: Option<BrocadeOptions>,
|
|
||||||
) -> Result<Self, Error> {
|
|
||||||
let ip = ip_addresses
|
|
||||||
.first()
|
|
||||||
.ok_or_else(|| Error::ConfigurationError("No IP addresses provided".to_string()))?;
|
|
||||||
|
|
||||||
let base_options = options.unwrap_or_default();
|
|
||||||
let options = ssh::try_init_client(username, password, ip, base_options).await?;
|
|
||||||
|
|
||||||
Ok(Self {
|
|
||||||
ip: *ip,
|
|
||||||
port,
|
|
||||||
username: username.to_string(),
|
|
||||||
password: password.to_string(),
|
|
||||||
before_all_commands: vec![],
|
|
||||||
after_all_commands: vec![],
|
|
||||||
options,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn open_session(&self, mode: ExecutionMode) -> Result<BrocadeSession, Error> {
|
|
||||||
BrocadeSession::open(
|
|
||||||
self.ip,
|
|
||||||
self.port,
|
|
||||||
&self.username,
|
|
||||||
&self.password,
|
|
||||||
self.options.clone(),
|
|
||||||
mode,
|
|
||||||
)
|
|
||||||
.await
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn with_session<F, R>(&self, mode: ExecutionMode, callback: F) -> Result<R, Error>
|
|
||||||
where
|
|
||||||
F: FnOnce(
|
|
||||||
&mut BrocadeSession,
|
|
||||||
) -> std::pin::Pin<
|
|
||||||
Box<dyn std::future::Future<Output = Result<R, Error>> + Send + '_>,
|
|
||||||
>,
|
|
||||||
{
|
|
||||||
let mut session = self.open_session(mode).await?;
|
|
||||||
|
|
||||||
let _ = session.run_commands(self.before_all_commands.clone()).await;
|
|
||||||
let result = callback(&mut session).await;
|
|
||||||
let _ = session.run_commands(self.after_all_commands.clone()).await;
|
|
||||||
|
|
||||||
session.close().await?;
|
|
||||||
result
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn run_command(&self, command: &str, mode: ExecutionMode) -> Result<String, Error> {
|
|
||||||
let mut session = self.open_session(mode).await?;
|
|
||||||
|
|
||||||
let _ = session.run_commands(self.before_all_commands.clone()).await;
|
|
||||||
let result = session.run_command(command).await;
|
|
||||||
let _ = session.run_commands(self.after_all_commands.clone()).await;
|
|
||||||
|
|
||||||
session.close().await?;
|
|
||||||
result
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn run_commands(
|
|
||||||
&self,
|
|
||||||
commands: Vec<String>,
|
|
||||||
mode: ExecutionMode,
|
|
||||||
) -> Result<(), Error> {
|
|
||||||
let mut session = self.open_session(mode).await?;
|
|
||||||
|
|
||||||
let _ = session.run_commands(self.before_all_commands.clone()).await;
|
|
||||||
let result = session.run_commands(commands).await;
|
|
||||||
let _ = session.run_commands(self.after_all_commands.clone()).await;
|
|
||||||
|
|
||||||
session.close().await?;
|
|
||||||
result
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn before_all(&mut self, commands: Vec<String>) {
|
|
||||||
self.before_all_commands = commands;
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn after_all(&mut self, commands: Vec<String>) {
|
|
||||||
self.after_all_commands = commands;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub struct BrocadeSession {
|
|
||||||
pub channel: russh::Channel<russh::client::Msg>,
|
|
||||||
pub mode: ExecutionMode,
|
|
||||||
pub options: BrocadeOptions,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl BrocadeSession {
|
|
||||||
pub async fn open(
|
|
||||||
ip: IpAddr,
|
|
||||||
port: u16,
|
|
||||||
username: &str,
|
|
||||||
password: &str,
|
|
||||||
options: BrocadeOptions,
|
|
||||||
mode: ExecutionMode,
|
|
||||||
) -> Result<Self, Error> {
|
|
||||||
let client = ssh::create_client(ip, port, username, password, &options).await?;
|
|
||||||
let mut channel = client.channel_open_session().await?;
|
|
||||||
|
|
||||||
channel
|
|
||||||
.request_pty(false, "vt100", 80, 24, 0, 0, &[])
|
|
||||||
.await?;
|
|
||||||
channel.request_shell(false).await?;
|
|
||||||
|
|
||||||
wait_for_shell_ready(&mut channel, &options.timeouts).await?;
|
|
||||||
|
|
||||||
if let ExecutionMode::Privileged = mode {
|
|
||||||
try_elevate_session(&mut channel, username, password, &options.timeouts).await?;
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(Self {
|
|
||||||
channel,
|
|
||||||
mode,
|
|
||||||
options,
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn close(&mut self) -> Result<(), Error> {
|
|
||||||
debug!("[Brocade] Closing session...");
|
|
||||||
|
|
||||||
self.channel.data(&b"exit\n"[..]).await?;
|
|
||||||
if let ExecutionMode::Privileged = self.mode {
|
|
||||||
self.channel.data(&b"exit\n"[..]).await?;
|
|
||||||
}
|
|
||||||
|
|
||||||
let start = Instant::now();
|
|
||||||
while start.elapsed() < self.options.timeouts.cleanup {
|
|
||||||
match timeout(self.options.timeouts.message_wait, self.channel.wait()).await {
|
|
||||||
Ok(Some(ChannelMsg::Close)) => break,
|
|
||||||
Ok(Some(_)) => continue,
|
|
||||||
Ok(None) | Err(_) => break,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
debug!("[Brocade] Session closed.");
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn run_command(&mut self, command: &str) -> Result<String, Error> {
|
|
||||||
if self.should_skip_command(command) {
|
|
||||||
return Ok(String::new());
|
|
||||||
}
|
|
||||||
|
|
||||||
debug!("[Brocade] Running command: '{command}'...");
|
|
||||||
|
|
||||||
self.channel
|
|
||||||
.data(format!("{}\n", command).as_bytes())
|
|
||||||
.await?;
|
|
||||||
tokio::time::sleep(Duration::from_millis(100)).await;
|
|
||||||
|
|
||||||
let output = self.collect_command_output().await?;
|
|
||||||
let output = String::from_utf8(output)
|
|
||||||
.map_err(|_| Error::UnexpectedError("Invalid UTF-8 in command output".to_string()))?;
|
|
||||||
|
|
||||||
self.check_for_command_errors(&output, command)?;
|
|
||||||
Ok(output)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn run_commands(&mut self, commands: Vec<String>) -> Result<(), Error> {
|
|
||||||
for command in commands {
|
|
||||||
self.run_command(&command).await?;
|
|
||||||
}
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
fn should_skip_command(&self, command: &str) -> bool {
|
|
||||||
if (command.starts_with("write") || command.starts_with("deploy")) && self.options.dry_run {
|
|
||||||
info!("[Brocade] Dry-run mode enabled, skipping command: {command}");
|
|
||||||
return true;
|
|
||||||
}
|
|
||||||
false
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn collect_command_output(&mut self) -> Result<Vec<u8>, Error> {
|
|
||||||
let mut output = Vec::new();
|
|
||||||
let start = Instant::now();
|
|
||||||
let read_timeout = Duration::from_millis(500);
|
|
||||||
let log_interval = Duration::from_secs(5);
|
|
||||||
let mut last_log = Instant::now();
|
|
||||||
|
|
||||||
loop {
|
|
||||||
if start.elapsed() > self.options.timeouts.command_execution {
|
|
||||||
return Err(Error::TimeoutError(
|
|
||||||
"Timeout waiting for command completion.".into(),
|
|
||||||
));
|
|
||||||
}
|
|
||||||
|
|
||||||
if start.elapsed() > self.options.timeouts.command_output
|
|
||||||
&& last_log.elapsed() > log_interval
|
|
||||||
{
|
|
||||||
info!("[Brocade] Waiting for command output...");
|
|
||||||
last_log = Instant::now();
|
|
||||||
}
|
|
||||||
|
|
||||||
match timeout(read_timeout, self.channel.wait()).await {
|
|
||||||
Ok(Some(ChannelMsg::Data { data } | ChannelMsg::ExtendedData { data, .. })) => {
|
|
||||||
output.extend_from_slice(&data);
|
|
||||||
let current_output = String::from_utf8_lossy(&output);
|
|
||||||
if current_output.contains('>') || current_output.contains('#') {
|
|
||||||
return Ok(output);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Ok(Some(ChannelMsg::Eof | ChannelMsg::Close)) => return Ok(output),
|
|
||||||
Ok(Some(ChannelMsg::ExitStatus { exit_status })) => {
|
|
||||||
debug!("[Brocade] Command exit status: {exit_status}");
|
|
||||||
}
|
|
||||||
Ok(Some(_)) => continue,
|
|
||||||
Ok(None) | Err(_) => {
|
|
||||||
if output.is_empty() {
|
|
||||||
if let Ok(None) = timeout(read_timeout, self.channel.wait()).await {
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
continue;
|
|
||||||
}
|
|
||||||
|
|
||||||
tokio::time::sleep(Duration::from_millis(100)).await;
|
|
||||||
let current_output = String::from_utf8_lossy(&output);
|
|
||||||
if current_output.contains('>') || current_output.contains('#') {
|
|
||||||
return Ok(output);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(output)
|
|
||||||
}
|
|
||||||
|
|
||||||
fn check_for_command_errors(&self, output: &str, command: &str) -> Result<(), Error> {
|
|
||||||
const ERROR_PATTERNS: &[&str] = &[
|
|
||||||
"invalid input",
|
|
||||||
"syntax error",
|
|
||||||
"command not found",
|
|
||||||
"unknown command",
|
|
||||||
"permission denied",
|
|
||||||
"access denied",
|
|
||||||
"authentication failed",
|
|
||||||
"configuration error",
|
|
||||||
"failed to",
|
|
||||||
"error:",
|
|
||||||
];
|
|
||||||
|
|
||||||
let output_lower = output.to_lowercase();
|
|
||||||
if ERROR_PATTERNS.iter().any(|&p| output_lower.contains(p)) {
|
|
||||||
return Err(Error::CommandError(format!(
|
|
||||||
"Command error: {}",
|
|
||||||
output.trim()
|
|
||||||
)));
|
|
||||||
}
|
|
||||||
|
|
||||||
if !command.starts_with("show") && output.trim().is_empty() {
|
|
||||||
return Err(Error::CommandError(format!(
|
|
||||||
"Command '{command}' produced no output"
|
|
||||||
)));
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn wait_for_shell_ready(
|
|
||||||
channel: &mut russh::Channel<russh::client::Msg>,
|
|
||||||
timeouts: &TimeoutConfig,
|
|
||||||
) -> Result<(), Error> {
|
|
||||||
let mut buffer = Vec::new();
|
|
||||||
let start = Instant::now();
|
|
||||||
|
|
||||||
while start.elapsed() < timeouts.shell_ready {
|
|
||||||
match timeout(timeouts.message_wait, channel.wait()).await {
|
|
||||||
Ok(Some(ChannelMsg::Data { data })) => {
|
|
||||||
buffer.extend_from_slice(&data);
|
|
||||||
let output = String::from_utf8_lossy(&buffer);
|
|
||||||
let output = output.trim();
|
|
||||||
if output.ends_with('>') || output.ends_with('#') {
|
|
||||||
debug!("[Brocade] Shell ready");
|
|
||||||
return Ok(());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Ok(Some(_)) => continue,
|
|
||||||
Ok(None) => break,
|
|
||||||
Err(_) => continue,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn try_elevate_session(
|
|
||||||
channel: &mut russh::Channel<russh::client::Msg>,
|
|
||||||
username: &str,
|
|
||||||
password: &str,
|
|
||||||
timeouts: &TimeoutConfig,
|
|
||||||
) -> Result<(), Error> {
|
|
||||||
channel.data(&b"enable\n"[..]).await?;
|
|
||||||
let start = Instant::now();
|
|
||||||
let mut buffer = Vec::new();
|
|
||||||
|
|
||||||
while start.elapsed() < timeouts.shell_ready {
|
|
||||||
match timeout(timeouts.message_wait, channel.wait()).await {
|
|
||||||
Ok(Some(ChannelMsg::Data { data })) => {
|
|
||||||
buffer.extend_from_slice(&data);
|
|
||||||
let output = String::from_utf8_lossy(&buffer);
|
|
||||||
|
|
||||||
if output.ends_with('#') {
|
|
||||||
debug!("[Brocade] Privileged mode established");
|
|
||||||
return Ok(());
|
|
||||||
}
|
|
||||||
|
|
||||||
if output.contains("User Name:") {
|
|
||||||
channel.data(format!("{}\n", username).as_bytes()).await?;
|
|
||||||
buffer.clear();
|
|
||||||
} else if output.contains("Password:") {
|
|
||||||
channel.data(format!("{}\n", password).as_bytes()).await?;
|
|
||||||
buffer.clear();
|
|
||||||
} else if output.contains('>') {
|
|
||||||
return Err(Error::AuthenticationError(
|
|
||||||
"Enable authentication failed".into(),
|
|
||||||
));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Ok(Some(_)) => continue,
|
|
||||||
Ok(None) => break,
|
|
||||||
Err(_) => continue,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
let output = String::from_utf8_lossy(&buffer);
|
|
||||||
if output.ends_with('#') {
|
|
||||||
debug!("[Brocade] Privileged mode established");
|
|
||||||
Ok(())
|
|
||||||
} else {
|
|
||||||
Err(Error::AuthenticationError(format!(
|
|
||||||
"Enable failed. Output:\n{output}"
|
|
||||||
)))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,113 +0,0 @@
|
|||||||
use std::borrow::Cow;
|
|
||||||
use std::sync::Arc;
|
|
||||||
|
|
||||||
use async_trait::async_trait;
|
|
||||||
use russh::client::Handler;
|
|
||||||
use russh::kex::DH_G1_SHA1;
|
|
||||||
use russh::kex::ECDH_SHA2_NISTP256;
|
|
||||||
use russh_keys::key::SSH_RSA;
|
|
||||||
|
|
||||||
use super::BrocadeOptions;
|
|
||||||
use super::Error;
|
|
||||||
|
|
||||||
#[derive(Default, Clone, Debug)]
|
|
||||||
pub struct SshOptions {
|
|
||||||
pub preferred_algorithms: russh::Preferred,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl SshOptions {
|
|
||||||
fn ecdhsa_sha2_nistp256() -> Self {
|
|
||||||
Self {
|
|
||||||
preferred_algorithms: russh::Preferred {
|
|
||||||
kex: Cow::Borrowed(&[ECDH_SHA2_NISTP256]),
|
|
||||||
key: Cow::Borrowed(&[SSH_RSA]),
|
|
||||||
..Default::default()
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn legacy() -> Self {
|
|
||||||
Self {
|
|
||||||
preferred_algorithms: russh::Preferred {
|
|
||||||
kex: Cow::Borrowed(&[DH_G1_SHA1]),
|
|
||||||
key: Cow::Borrowed(&[SSH_RSA]),
|
|
||||||
..Default::default()
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub struct Client;
|
|
||||||
|
|
||||||
#[async_trait]
|
|
||||||
impl Handler for Client {
|
|
||||||
type Error = Error;
|
|
||||||
|
|
||||||
async fn check_server_key(
|
|
||||||
&mut self,
|
|
||||||
_server_public_key: &russh_keys::key::PublicKey,
|
|
||||||
) -> Result<bool, Self::Error> {
|
|
||||||
Ok(true)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn try_init_client(
|
|
||||||
username: &str,
|
|
||||||
password: &str,
|
|
||||||
ip: &std::net::IpAddr,
|
|
||||||
base_options: BrocadeOptions,
|
|
||||||
) -> Result<BrocadeOptions, Error> {
|
|
||||||
let ssh_options = vec![
|
|
||||||
SshOptions::default(),
|
|
||||||
SshOptions::ecdhsa_sha2_nistp256(),
|
|
||||||
SshOptions::legacy(),
|
|
||||||
];
|
|
||||||
|
|
||||||
for ssh in ssh_options {
|
|
||||||
let opts = BrocadeOptions {
|
|
||||||
ssh,
|
|
||||||
..base_options.clone()
|
|
||||||
};
|
|
||||||
let client = create_client(*ip, 22, username, password, &opts).await;
|
|
||||||
|
|
||||||
match client {
|
|
||||||
Ok(_) => {
|
|
||||||
return Ok(opts);
|
|
||||||
}
|
|
||||||
Err(e) => match e {
|
|
||||||
Error::NetworkError(e) => {
|
|
||||||
if e.contains("No common key exchange algorithm") {
|
|
||||||
continue;
|
|
||||||
} else {
|
|
||||||
return Err(Error::NetworkError(e));
|
|
||||||
}
|
|
||||||
}
|
|
||||||
_ => return Err(e),
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Err(Error::NetworkError(
|
|
||||||
"Could not establish ssh connection: wrong key exchange algorithm)".to_string(),
|
|
||||||
))
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn create_client(
|
|
||||||
ip: std::net::IpAddr,
|
|
||||||
port: u16,
|
|
||||||
username: &str,
|
|
||||||
password: &str,
|
|
||||||
options: &BrocadeOptions,
|
|
||||||
) -> Result<russh::client::Handle<Client>, Error> {
|
|
||||||
let config = russh::client::Config {
|
|
||||||
preferred: options.ssh.preferred_algorithms.clone(),
|
|
||||||
..Default::default()
|
|
||||||
};
|
|
||||||
let mut client = russh::client::connect(Arc::new(config), (ip, port), Client {}).await?;
|
|
||||||
if !client.authenticate_password(username, password).await? {
|
|
||||||
return Err(Error::AuthenticationError(
|
|
||||||
"ssh authentication failed".to_string(),
|
|
||||||
));
|
|
||||||
}
|
|
||||||
Ok(client)
|
|
||||||
}
|
|
||||||
@@ -1,3 +0,0 @@
|
|||||||
.terraform
|
|
||||||
*.tfstate
|
|
||||||
venv
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 72 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 38 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 38 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 52 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 62 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 64 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 100 KiB |
@@ -1,5 +0,0 @@
|
|||||||
To build :
|
|
||||||
|
|
||||||
```bash
|
|
||||||
npx @marp-team/marp-cli@latest -w slides.md
|
|
||||||
```
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 11 KiB |
@@ -1,9 +0,0 @@
|
|||||||
To run this :
|
|
||||||
|
|
||||||
```bash
|
|
||||||
virtualenv venv
|
|
||||||
source venv/bin/activate
|
|
||||||
pip install ansible ansible-dev-tools
|
|
||||||
ansible-lint download.yml
|
|
||||||
ansible-playbook -i localhost download.yml
|
|
||||||
```
|
|
||||||
@@ -1,8 +0,0 @@
|
|||||||
- name: Test Ansible URL Validation
|
|
||||||
hosts: localhost
|
|
||||||
tasks:
|
|
||||||
- name: Download a file
|
|
||||||
ansible.builtin.get_url:
|
|
||||||
url: "http:/wikipedia.org/"
|
|
||||||
dest: "/tmp/ansible-test/wikipedia.html"
|
|
||||||
mode: '0900'
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 22 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 275 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 212 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 384 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 8.3 KiB |
File diff suppressed because one or more lines are too long
@@ -1,241 +0,0 @@
|
|||||||
---
|
|
||||||
theme: uncover
|
|
||||||
---
|
|
||||||
|
|
||||||
# Voici l'histoire de Petit Poisson
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
<img src="./Happy_swimmer.jpg" width="600"/>
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
<img src="./happy_landscape_swimmer.jpg" width="1000"/>
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
<img src="./Happy_swimmer.jpg" width="200"/>
|
|
||||||
|
|
||||||
<img src="./tryrust.org.png" width="600"/>
|
|
||||||
|
|
||||||
[https://tryrust.org](https://tryrust.org)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
<img src="./texto_deploy_prod_1.png" width="600"/>
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
<img src="./texto_deploy_prod_2.png" width="600"/>
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
<img src="./texto_deploy_prod_3.png" width="600"/>
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
<img src="./texto_deploy_prod_4.png" width="600"/>
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Demo time
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
<img src="./Happy_swimmer_sunglasses.jpg" width="1000"/>
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
<img src="./texto_download_wikipedia.png" width="600"/>
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
<img src="./ansible.jpg" width="200"/>
|
|
||||||
|
|
||||||
## Ansible❓
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
<img src="./Happy_swimmer.jpg" width="200"/>
|
|
||||||
|
|
||||||
```yaml
|
|
||||||
- name: Download wikipedia
|
|
||||||
hosts: localhost
|
|
||||||
tasks:
|
|
||||||
- name: Download a file
|
|
||||||
ansible.builtin.get_url:
|
|
||||||
url: "https:/wikipedia.org/"
|
|
||||||
dest: "/tmp/ansible-test/wikipedia.html"
|
|
||||||
mode: '0900'
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
<img src="./Happy_swimmer.jpg" width="200"/>
|
|
||||||
|
|
||||||
```
|
|
||||||
ansible-lint download.yml
|
|
||||||
|
|
||||||
Passed: 0 failure(s), 0 warning(s) on 1 files. Last profile that met the validation criteria was 'production'.
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
```
|
|
||||||
git push
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
<img src="./75_years_later.jpg" width="1100"/>
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
<img src="./texto_download_wikipedia_fail.png" width="600"/>
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
<img src="./Happy_swimmer_reversed.jpg" width="600"/>
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
<img src="./ansible_output_fail.jpg" width="1100"/>
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
<img src="./Happy_swimmer_reversed_1hit.jpg" width="600"/>
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
<img src="./ansible_crossed_out.jpg" width="400"/>
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
|
|
||||||
<img src="./terraform.jpg" width="400"/>
|
|
||||||
|
|
||||||
## Terraform❓❗
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
<img src="./Happy_swimmer_reversed_1hit.jpg" width="200"/>
|
|
||||||
<img src="./terraform.jpg" width="200"/>
|
|
||||||
|
|
||||||
```tf
|
|
||||||
provider "docker" {}
|
|
||||||
|
|
||||||
resource "docker_network" "invalid_network" {
|
|
||||||
name = "my-invalid-network"
|
|
||||||
|
|
||||||
ipam_config {
|
|
||||||
subnet = "172.17.0.0/33"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
<img src="./Happy_swimmer_reversed_1hit.jpg" width="100"/>
|
|
||||||
<img src="./terraform.jpg" width="200"/>
|
|
||||||
|
|
||||||
```
|
|
||||||
terraform plan
|
|
||||||
|
|
||||||
Terraform used the selected providers to generate the following execution plan.
|
|
||||||
Resource actions are indicated with the following symbols:
|
|
||||||
+ create
|
|
||||||
|
|
||||||
Terraform will perform the following actions:
|
|
||||||
|
|
||||||
# docker_network.invalid_network will be created
|
|
||||||
+ resource "docker_network" "invalid_network" {
|
|
||||||
+ driver = (known after apply)
|
|
||||||
+ id = (known after apply)
|
|
||||||
+ internal = (known after apply)
|
|
||||||
+ ipam_driver = "default"
|
|
||||||
+ name = "my-invalid-network"
|
|
||||||
+ options = (known after apply)
|
|
||||||
+ scope = (known after apply)
|
|
||||||
|
|
||||||
+ ipam_config {
|
|
||||||
+ subnet = "172.17.0.0/33"
|
|
||||||
# (2 unchanged attributes hidden)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Plan: 1 to add, 0 to change, 0 to destroy.
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
✅
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
```
|
|
||||||
terraform apply
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
```
|
|
||||||
Plan: 1 to add, 0 to change, 0 to destroy.
|
|
||||||
|
|
||||||
Do you want to perform these actions?
|
|
||||||
Terraform will perform the actions described above.
|
|
||||||
Only 'yes' will be accepted to approve.
|
|
||||||
|
|
||||||
Enter a value: yes
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
```
|
|
||||||
docker_network.invalid_network: Creating...
|
|
||||||
╷
|
|
||||||
│ Error: Unable to create network: Error response from daemon: invalid network config:
|
|
||||||
│ invalid subnet 172.17.0.0/33: invalid CIDR block notation
|
|
||||||
│
|
|
||||||
│ with docker_network.invalid_network,
|
|
||||||
│ on main.tf line 11, in resource "docker_network" "invalid_network":
|
|
||||||
│ 11: resource "docker_network" "invalid_network" {
|
|
||||||
│
|
|
||||||
╵
|
|
||||||
```
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
|
|
||||||
<img src="./Happy_swimmer_reversed_fullhit.jpg" width="1100"/>
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
<img src="./ansible_crossed_out.jpg" width="300"/>
|
|
||||||
<img src="./terraform_crossed_out.jpg" width="400"/>
|
|
||||||
<img src="./Happy_swimmer_reversed_fullhit.jpg" width="300"/>
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
## Harmony❓❗
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
Demo time
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
<img src="./Happy_swimmer.jpg" width="300"/>
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
# 🎼
|
|
||||||
|
|
||||||
Harmony : [https://git.nationtech.io/nationtech/harmony](https://git.nationtech.io/nationtech/harmony)
|
|
||||||
|
|
||||||
|
|
||||||
<img src="./qrcode_gitea_nationtech.png" width="120"/>
|
|
||||||
|
|
||||||
|
|
||||||
LinkedIn : [https://www.linkedin.com/in/jean-gabriel-gill-couture/](https://www.linkedin.com/in/jean-gabriel-gill-couture/)
|
|
||||||
|
|
||||||
Courriel : [jg@nationtech.io](mailto:jg@nationtech.io)
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 11 KiB |
@@ -1,40 +0,0 @@
|
|||||||
# This file is maintained automatically by "terraform init".
|
|
||||||
# Manual edits may be lost in future updates.
|
|
||||||
|
|
||||||
provider "registry.terraform.io/hashicorp/http" {
|
|
||||||
version = "3.5.0"
|
|
||||||
hashes = [
|
|
||||||
"h1:8bUoPwS4hahOvzCBj6b04ObLVFXCEmEN8T/5eOHmWOM=",
|
|
||||||
"zh:047c5b4920751b13425efe0d011b3a23a3be97d02d9c0e3c60985521c9c456b7",
|
|
||||||
"zh:157866f700470207561f6d032d344916b82268ecd0cf8174fb11c0674c8d0736",
|
|
||||||
"zh:1973eb9383b0d83dd4fd5e662f0f16de837d072b64a6b7cd703410d730499476",
|
|
||||||
"zh:212f833a4e6d020840672f6f88273d62a564f44acb0c857b5961cdb3bbc14c90",
|
|
||||||
"zh:2c8034bc039fffaa1d4965ca02a8c6d57301e5fa9fff4773e684b46e3f78e76a",
|
|
||||||
"zh:5df353fc5b2dd31577def9cc1a4ebf0c9a9c2699d223c6b02087a3089c74a1c6",
|
|
||||||
"zh:672083810d4185076c81b16ad13d1224b9e6ea7f4850951d2ab8d30fa6e41f08",
|
|
||||||
"zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3",
|
|
||||||
"zh:7b4200f18abdbe39904b03537e1a78f21ebafe60f1c861a44387d314fda69da6",
|
|
||||||
"zh:843feacacd86baed820f81a6c9f7bd32cf302db3d7a0f39e87976ebc7a7cc2ee",
|
|
||||||
"zh:a9ea5096ab91aab260b22e4251c05f08dad2ed77e43e5e4fadcdfd87f2c78926",
|
|
||||||
"zh:d02b288922811739059e90184c7f76d45d07d3a77cc48d0b15fd3db14e928623",
|
|
||||||
]
|
|
||||||
}
|
|
||||||
|
|
||||||
provider "registry.terraform.io/hashicorp/local" {
|
|
||||||
version = "2.5.3"
|
|
||||||
hashes = [
|
|
||||||
"h1:1Nkh16jQJMp0EuDmvP/96f5Unnir0z12WyDuoR6HjMo=",
|
|
||||||
"zh:284d4b5b572eacd456e605e94372f740f6de27b71b4e1fd49b63745d8ecd4927",
|
|
||||||
"zh:40d9dfc9c549e406b5aab73c023aa485633c1b6b730c933d7bcc2fa67fd1ae6e",
|
|
||||||
"zh:6243509bb208656eb9dc17d3c525c89acdd27f08def427a0dce22d5db90a4c8b",
|
|
||||||
"zh:78d5eefdd9e494defcb3c68d282b8f96630502cac21d1ea161f53cfe9bb483b3",
|
|
||||||
"zh:885d85869f927853b6fe330e235cd03c337ac3b933b0d9ae827ec32fa1fdcdbf",
|
|
||||||
"zh:bab66af51039bdfcccf85b25fe562cbba2f54f6b3812202f4873ade834ec201d",
|
|
||||||
"zh:c505ff1bf9442a889ac7dca3ac05a8ee6f852e0118dd9a61796a2f6ff4837f09",
|
|
||||||
"zh:d36c0b5770841ddb6eaf0499ba3de48e5d4fc99f4829b6ab66b0fab59b1aaf4f",
|
|
||||||
"zh:ddb6a407c7f3ec63efb4dad5f948b54f7f4434ee1a2607a49680d494b1776fe1",
|
|
||||||
"zh:e0dafdd4500bec23d3ff221e3a9b60621c5273e5df867bc59ef6b7e41f5c91f6",
|
|
||||||
"zh:ece8742fd2882a8fc9d6efd20e2590010d43db386b920b2a9c220cfecc18de47",
|
|
||||||
"zh:f4c6b3eb8f39105004cf720e202f04f57e3578441cfb76ca27611139bc116a82",
|
|
||||||
]
|
|
||||||
}
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
provider "http" {}
|
|
||||||
|
|
||||||
data "http" "remote_file" {
|
|
||||||
url = "http:/example.com/file.txt"
|
|
||||||
}
|
|
||||||
|
|
||||||
resource "local_file" "downloaded_file" {
|
|
||||||
content = data.http.remote_file.body
|
|
||||||
filename = "${path.module}/downloaded_file.txt"
|
|
||||||
}
|
|
||||||
@@ -1,24 +0,0 @@
|
|||||||
# This file is maintained automatically by "terraform init".
|
|
||||||
# Manual edits may be lost in future updates.
|
|
||||||
|
|
||||||
provider "registry.terraform.io/kreuzwerker/docker" {
|
|
||||||
version = "3.0.2"
|
|
||||||
constraints = "~> 3.0.1"
|
|
||||||
hashes = [
|
|
||||||
"h1:cT2ccWOtlfKYBUE60/v2/4Q6Stk1KYTNnhxSck+VPlU=",
|
|
||||||
"zh:15b0a2b2b563d8d40f62f83057d91acb02cd0096f207488d8b4298a59203d64f",
|
|
||||||
"zh:23d919de139f7cd5ebfd2ff1b94e6d9913f0977fcfc2ca02e1573be53e269f95",
|
|
||||||
"zh:38081b3fe317c7e9555b2aaad325ad3fa516a886d2dfa8605ae6a809c1072138",
|
|
||||||
"zh:4a9c5065b178082f79ad8160243369c185214d874ff5048556d48d3edd03c4da",
|
|
||||||
"zh:5438ef6afe057945f28bce43d76c4401254073de01a774760169ac1058830ac2",
|
|
||||||
"zh:60b7fadc287166e5c9873dfe53a7976d98244979e0ab66428ea0dea1ebf33e06",
|
|
||||||
"zh:61c5ec1cb94e4c4a4fb1e4a24576d5f39a955f09afb17dab982de62b70a9bdd1",
|
|
||||||
"zh:a38fe9016ace5f911ab00c88e64b156ebbbbfb72a51a44da3c13d442cd214710",
|
|
||||||
"zh:c2c4d2b1fd9ebb291c57f524b3bf9d0994ff3e815c0cd9c9bcb87166dc687005",
|
|
||||||
"zh:d567bb8ce483ab2cf0602e07eae57027a1a53994aba470fa76095912a505533d",
|
|
||||||
"zh:e83bf05ab6a19dd8c43547ce9a8a511f8c331a124d11ac64687c764ab9d5a792",
|
|
||||||
"zh:e90c934b5cd65516fbcc454c89a150bfa726e7cf1fe749790c7480bbeb19d387",
|
|
||||||
"zh:f05f167d2eaf913045d8e7b88c13757e3cf595dd5cd333057fdafc7c4b7fed62",
|
|
||||||
"zh:fcc9c1cea5ce85e8bcb593862e699a881bd36dffd29e2e367f82d15368659c3d",
|
|
||||||
]
|
|
||||||
}
|
|
||||||
@@ -1,17 +0,0 @@
|
|||||||
terraform {
|
|
||||||
required_providers {
|
|
||||||
docker = {
|
|
||||||
source = "kreuzwerker/docker"
|
|
||||||
version = "~> 3.0.1" # Adjust version as needed
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
provider "docker" {}
|
|
||||||
|
|
||||||
resource "docker_network" "invalid_network" {
|
|
||||||
name = "my-invalid-network"
|
|
||||||
|
|
||||||
ipam_config {
|
|
||||||
subnet = "172.17.0.0/33"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Binary file not shown.
|
Before Width: | Height: | Size: 14 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 144 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 58 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 56 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 71 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 81 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 87 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 88 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 48 KiB |
Binary file not shown.
|
Before Width: | Height: | Size: 325 KiB |
@@ -1,33 +1 @@
|
|||||||
# Harmony Documentation Hub
|
Not much here yet, see the `adr` folder for now. More to come in time!
|
||||||
|
|
||||||
Welcome to the Harmony documentation. This is the main entry point for learning everything from core concepts to building your own Score, Topologies, and Capabilities.
|
|
||||||
|
|
||||||
## 1. Getting Started
|
|
||||||
|
|
||||||
If you're new to Harmony, start here:
|
|
||||||
|
|
||||||
- [**Getting Started Guide**](./guides/getting-started.md): A step-by-step tutorial that takes you from an empty project to deploying your first application.
|
|
||||||
- [**Core Concepts**](./concepts.md): A high-level overview of the key concepts in Harmony: `Score`, `Topology`, `Capability`, `Inventory`, `Interpret`, ...
|
|
||||||
|
|
||||||
## 2. Use Cases & Examples
|
|
||||||
|
|
||||||
See how to use Harmony to solve real-world problems.
|
|
||||||
|
|
||||||
- [**OKD on Bare Metal**](./use-cases/okd-on-bare-metal.md): A detailed walkthrough of bootstrapping a high-availability OKD cluster from physical hardware.
|
|
||||||
- [**Deploy a Rust Web App**](./use-cases/deploy-rust-webapp.md): A quick guide to deploying a monitored, containerized web application to a Kubernetes cluster.
|
|
||||||
|
|
||||||
## 3. Component Catalogs
|
|
||||||
|
|
||||||
Discover existing, reusable components you can use in your Harmony projects.
|
|
||||||
|
|
||||||
- [**Scores Catalog**](./catalogs/scores.md): A categorized list of all available `Scores` (the "what").
|
|
||||||
- [**Topologies Catalog**](./catalogs/topologies.md): A list of all available `Topologies` (the "where").
|
|
||||||
- [**Capabilities Catalog**](./catalogs/capabilities.md): A list of all available `Capabilities` (the "how").
|
|
||||||
|
|
||||||
## 4. Developer Guides
|
|
||||||
|
|
||||||
Ready to build your own components? These guides show you how.
|
|
||||||
|
|
||||||
- [**Writing a Score**](./guides/writing-a-score.md): Learn how to create your own `Score` and `Interpret` logic to define a new desired state.
|
|
||||||
- [**Writing a Topology**](./guides/writing-a-topology.md): Learn how to model a new environment (like AWS, GCP, or custom hardware) as a `Topology`.
|
|
||||||
- [**Adding Capabilities**](./guides/adding-capabilities.md): See how to add a `Capability` to your custom `Topology`.
|
|
||||||
|
|||||||
@@ -1,7 +0,0 @@
|
|||||||
# Component Catalogs
|
|
||||||
|
|
||||||
This section is the "dictionary" for Harmony. It lists all the reusable components available out-of-the-box.
|
|
||||||
|
|
||||||
- [**Scores Catalog**](./scores.md): Discover all available `Scores` (the "what").
|
|
||||||
- [**Topologies Catalog**](./topologies.md): A list of all available `Topologies` (the "where").
|
|
||||||
- [**Capabilities Catalog**](./capabilities.md): A list of all available `Capabilities` (the "how").
|
|
||||||
@@ -1,40 +0,0 @@
|
|||||||
# Capabilities Catalog
|
|
||||||
|
|
||||||
A `Capability` is a specific feature or API that a `Topology` offers. `Interpret` logic uses these capabilities to execute a `Score`.
|
|
||||||
|
|
||||||
This list is primarily for developers **writing new Topologies or Scores**. As a user, you just need to know that the `Topology` you pick (like `K8sAnywhereTopology`) provides the capabilities your `Scores` (like `ApplicationScore`) need.
|
|
||||||
|
|
||||||
<!--toc:start-->
|
|
||||||
|
|
||||||
- [Capabilities Catalog](#capabilities-catalog)
|
|
||||||
- [Kubernetes & Application](#kubernetes-application)
|
|
||||||
- [Monitoring & Observability](#monitoring-observability)
|
|
||||||
- [Networking (Core Services)](#networking-core-services)
|
|
||||||
- [Networking (Hardware & Host)](#networking-hardware-host)
|
|
||||||
|
|
||||||
<!--toc:end-->
|
|
||||||
|
|
||||||
## Kubernetes & Application
|
|
||||||
|
|
||||||
- **K8sClient**: Provides an authenticated client to interact with a Kubernetes API (create/read/update/delete resources).
|
|
||||||
- **HelmCommand**: Provides the ability to execute Helm commands (install, upgrade, template).
|
|
||||||
- **TenantManager**: Provides methods for managing tenants in a multi-tenant cluster.
|
|
||||||
- **Ingress**: Provides an interface for managing ingress controllers and resources.
|
|
||||||
|
|
||||||
## Monitoring & Observability
|
|
||||||
|
|
||||||
- **Grafana**: Provides an API for configuring Grafana (datasources, dashboards).
|
|
||||||
- **Monitoring**: A general capability for configuring monitoring (e.g., creating Prometheus rules).
|
|
||||||
|
|
||||||
## Networking (Core Services)
|
|
||||||
|
|
||||||
- **DnsServer**: Provides an interface for creating and managing DNS records.
|
|
||||||
- **LoadBalancer**: Provides an interface for configuring a load balancer (e.g., OPNsense, MetalLB).
|
|
||||||
- **DhcpServer**: Provides an interface for managing DHCP leases and host bindings.
|
|
||||||
- **TftpServer**: Provides an interface for managing files on a TFTP server (e.g., iPXE boot files).
|
|
||||||
|
|
||||||
## Networking (Hardware & Host)
|
|
||||||
|
|
||||||
- **Router**: Provides an interface for configuring routing rules, typically on a firewall like OPNsense.
|
|
||||||
- **Switch**: Provides an interface for configuring a physical network switch (e.g., managing VLANs and port channels).
|
|
||||||
- **NetworkManager**: Provides an interface for configuring host-level networking (e.g., creating bonds and bridges on a node).
|
|
||||||
@@ -1,102 +0,0 @@
|
|||||||
# Scores Catalog
|
|
||||||
|
|
||||||
A `Score` is a declarative description of a desired state. Find the Score you need and add it to your `harmony!` block's `scores` array.
|
|
||||||
|
|
||||||
<!--toc:start-->
|
|
||||||
|
|
||||||
- [Scores Catalog](#scores-catalog)
|
|
||||||
- [Application Deployment](#application-deployment)
|
|
||||||
- [OKD / Kubernetes Cluster Setup](#okd-kubernetes-cluster-setup)
|
|
||||||
- [Cluster Services & Management](#cluster-services-management)
|
|
||||||
- [Monitoring & Alerting](#monitoring-alerting)
|
|
||||||
- [Infrastructure & Networking (Bare Metal)](#infrastructure-networking-bare-metal)
|
|
||||||
- [Infrastructure & Networking (Cluster)](#infrastructure-networking-cluster)
|
|
||||||
- [Tenant Management](#tenant-management)
|
|
||||||
- [Utility](#utility)
|
|
||||||
|
|
||||||
<!--toc:end-->
|
|
||||||
|
|
||||||
## Application Deployment
|
|
||||||
|
|
||||||
Scores for deploying and managing end-user applications.
|
|
||||||
|
|
||||||
- **ApplicationScore**: The primary score for deploying a web application. Describes the application, its framework, and the features it requires (e.g., monitoring, CI/CD).
|
|
||||||
- **HelmChartScore**: Deploys a generic Helm chart to a Kubernetes cluster.
|
|
||||||
- **ArgoHelmScore**: Deploys an application using an ArgoCD Helm chart.
|
|
||||||
- **LAMPScore**: A specialized score for deploying a classic LAMP (Linux, Apache, MySQL, PHP) stack.
|
|
||||||
|
|
||||||
## OKD / Kubernetes Cluster Setup
|
|
||||||
|
|
||||||
This collection of Scores is used to provision an entire OKD cluster from bare metal. They are typically used in order.
|
|
||||||
|
|
||||||
- **OKDSetup01InventoryScore**: Discovers and catalogs the physical hardware.
|
|
||||||
- **OKDSetup02BootstrapScore**: Configures the bootstrap node, renders iPXE files, and kicks off the SCOS installation.
|
|
||||||
- **OKDSetup03ControlPlaneScore**: Renders iPXE configurations for the control plane nodes.
|
|
||||||
- **OKDSetupPersistNetworkBondScore**: Configures network bonds on the nodes and port channels on the switches.
|
|
||||||
- **OKDSetup04WorkersScore**: Renders iPXE configurations for the worker nodes.
|
|
||||||
- **OKDSetup06InstallationReportScore**: Runs post-installation checks and generates a report.
|
|
||||||
- **OKDUpgradeScore**: Manages the upgrade process for an existing OKD cluster.
|
|
||||||
|
|
||||||
## Cluster Services & Management
|
|
||||||
|
|
||||||
Scores for installing and managing services _inside_ a Kubernetes cluster.
|
|
||||||
|
|
||||||
- **K3DInstallationScore**: Installs and configes a local K3D (k3s-in-docker) cluster. Used by `K8sAnywhereTopology`.
|
|
||||||
- **CertManagerHelmScore**: Deploys the `cert-manager` Helm chart.
|
|
||||||
- **ClusterIssuerScore**: Configures a `ClusterIssuer` for `cert-manager`, (e.g., for Let's Encrypt).
|
|
||||||
- **K8sNamespaceScore**: Ensures a Kubernetes namespace exists.
|
|
||||||
- **K8sDeploymentScore**: Deploys a generic `Deployment` resource to Kubernetes.
|
|
||||||
- **K8sIngressScore**: Configures an `Ingress` resource for a service.
|
|
||||||
|
|
||||||
## Monitoring & Alerting
|
|
||||||
|
|
||||||
Scores for configuring observability, dashboards, and alerts.
|
|
||||||
|
|
||||||
- **ApplicationMonitoringScore**: A generic score to set up monitoring for an application.
|
|
||||||
- **ApplicationRHOBMonitoringScore**: A specialized score for setting up monitoring via the Red Hat Observability stack.
|
|
||||||
- **HelmPrometheusAlertingScore**: Configures Prometheus alerts via a Helm chart.
|
|
||||||
- **K8sPrometheusCRDAlertingScore**: Configures Prometheus alerts using the `PrometheusRule` CRD.
|
|
||||||
- **PrometheusAlertScore**: A generic score for creating a Prometheus alert.
|
|
||||||
- **RHOBAlertingScore**: Configures alerts specifically for the Red Hat Observability stack.
|
|
||||||
- **NtfyScore**: Configures alerts to be sent to a `ntfy.sh` server.
|
|
||||||
|
|
||||||
## Infrastructure & Networking (Bare Metal)
|
|
||||||
|
|
||||||
Low-level scores for managing physical hardware and network services.
|
|
||||||
|
|
||||||
- **DhcpScore**: Configures a DHCP server.
|
|
||||||
- **OKDDhcpScore**: A specialized DHCP configuration for the OKD bootstrap process.
|
|
||||||
- **OKDBootstrapDhcpScore**: Configures DHCP specifically for the bootstrap node.
|
|
||||||
- **DhcpHostBindingScore**: Creates a specific MAC-to-IP binding in the DHCP server.
|
|
||||||
- **DnsScore**: Configures a DNS server.
|
|
||||||
- **OKDDnsScore**: A specialized DNS configuration for the OKD cluster (e.g., `api.*`, `*.apps.*`).
|
|
||||||
- **StaticFilesHttpScore**: Serves a directory of static files (e.g., a documentation site) over HTTP.
|
|
||||||
- **TftpScore**: Configures a TFTP server, typically for serving iPXE boot files.
|
|
||||||
- **IPxeMacBootFileScore**: Assigns a specific iPXE boot file to a MAC address in the TFTP server.
|
|
||||||
- **OKDIpxeScore**: A specialized score for generating the iPXE boot scripts for OKD.
|
|
||||||
- **OPNsenseShellCommandScore**: Executes a shell command on an OPNsense firewall.
|
|
||||||
|
|
||||||
## Infrastructure & Networking (Cluster)
|
|
||||||
|
|
||||||
Network services that run inside the cluster or as part of the topology.
|
|
||||||
|
|
||||||
- **LoadBalancerScore**: Configures a general-purpose load balancer.
|
|
||||||
- **OKDLoadBalancerScore**: Configures the high-availability load balancers for the OKD API and ingress.
|
|
||||||
- **OKDBootstrapLoadBalancerScore**: Configures the load balancer specifically for the bootstrap-time API endpoint.
|
|
||||||
- **K8sIngressScore**: Configures an Ingress controller or resource.
|
|
||||||
- [HighAvailabilityHostNetworkScore](../../harmony/src/modules/okd/host_network.rs): Configures network bonds on a host and the corresponding port-channels on the switch stack for high-availability.
|
|
||||||
|
|
||||||
## Tenant Management
|
|
||||||
|
|
||||||
Scores for managing multi-tenancy within a cluster.
|
|
||||||
|
|
||||||
- **TenantScore**: Creates a new tenant (e.g., a namespace, quotas, network policies).
|
|
||||||
- **TenantCredentialScore**: Generates and provisions credentials for a new tenant.
|
|
||||||
|
|
||||||
## Utility
|
|
||||||
|
|
||||||
Helper scores for discovery and inspection.
|
|
||||||
|
|
||||||
- **LaunchDiscoverInventoryAgentScore**: Launches the agent responsible for the `OKDSetup01InventoryScore`.
|
|
||||||
- **DiscoverHostForRoleScore**: A utility score to find a host matching a specific role in the inventory.
|
|
||||||
- **InspectInventoryScore**: Dumps the discovered inventory for inspection.
|
|
||||||
@@ -1,59 +0,0 @@
|
|||||||
# Topologies Catalog
|
|
||||||
|
|
||||||
A `Topology` is the logical representation of your infrastructure and its `Capabilities`. You select a `Topology` in your Harmony project to define _where_ your `Scores` will be applied.
|
|
||||||
|
|
||||||
<!--toc:start-->
|
|
||||||
|
|
||||||
- [Topologies Catalog](#topologies-catalog)
|
|
||||||
- [HAClusterTopology](#haclustertopology)
|
|
||||||
- [K8sAnywhereTopology](#k8sanywheretopology)
|
|
||||||
|
|
||||||
<!--toc:end-->
|
|
||||||
|
|
||||||
### HAClusterTopology
|
|
||||||
|
|
||||||
- **`HAClusterTopology::autoload()`**
|
|
||||||
|
|
||||||
This `Topology` represents a high-availability, bare-metal cluster. It is designed for production-grade deployments like OKD.
|
|
||||||
|
|
||||||
It models an environment consisting of:
|
|
||||||
|
|
||||||
- At least 3 cluster nodes (for control plane/workers)
|
|
||||||
- 2 redundant firewalls (e.g., OPNsense)
|
|
||||||
- 2 redundant network switches
|
|
||||||
|
|
||||||
**Provided Capabilities:**
|
|
||||||
This topology provides a rich set of capabilities required for bare-metal provisioning and cluster management, including:
|
|
||||||
|
|
||||||
- `K8sClient` (once the cluster is bootstrapped)
|
|
||||||
- `DnsServer`
|
|
||||||
- `LoadBalancer`
|
|
||||||
- `DhcpServer`
|
|
||||||
- `TftpServer`
|
|
||||||
- `Router` (via the firewalls)
|
|
||||||
- `Switch`
|
|
||||||
- `NetworkManager` (for host-level network config)
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### K8sAnywhereTopology
|
|
||||||
|
|
||||||
- **`K8sAnywhereTopology::from_env()`**
|
|
||||||
|
|
||||||
This `Topology` is designed for development and application deployment. It provides a simple, abstract way to deploy to _any_ Kubernetes cluster.
|
|
||||||
|
|
||||||
**How it works:**
|
|
||||||
|
|
||||||
1. By default (`from_env()` with no env vars), it automatically provisions a **local K3D (k3s-in-docker) cluster** on your machine. This is perfect for local development and testing.
|
|
||||||
2. If you provide a `KUBECONFIG` environment variable, it will instead connect to that **existing Kubernetes cluster** (e.g., your staging or production OKD cluster).
|
|
||||||
|
|
||||||
This allows you to use the _exact same code_ to deploy your application locally as you do to deploy it to production.
|
|
||||||
|
|
||||||
**Provided Capabilities:**
|
|
||||||
|
|
||||||
- `K8sClient`
|
|
||||||
- `HelmCommand`
|
|
||||||
- `TenantManager`
|
|
||||||
- `Ingress`
|
|
||||||
- `Monitoring`
|
|
||||||
- ...and more.
|
|
||||||
@@ -1,40 +0,0 @@
|
|||||||
# Core Concepts
|
|
||||||
|
|
||||||
Harmony's design is based on a few key concepts. Understanding them is the key to unlocking the framework's power.
|
|
||||||
|
|
||||||
### 1. Score
|
|
||||||
|
|
||||||
- **What it is:** A **Score** is a declarative description of a desired state. It's a "resource" that defines _what_ you want to achieve, not _how_ to do it.
|
|
||||||
- **Example:** `ApplicationScore` declares "I want this web application to be running and monitored."
|
|
||||||
|
|
||||||
### 2. Topology
|
|
||||||
|
|
||||||
- **What it is:** A **Topology** is the logical representation of your infrastructure and its abilities. It's the "where" your Scores will be applied.
|
|
||||||
- **Key Job:** A Topology's most important job is to expose which `Capabilities` it supports.
|
|
||||||
- **Example:** `HAClusterTopology` represents a bare-metal cluster and exposes `Capabilities` like `NetworkManager` and `Switch`. `K8sAnywhereTopology` represents a Kubernetes cluster and exposes the `K8sClient` `Capability`.
|
|
||||||
|
|
||||||
### 3. Capability
|
|
||||||
|
|
||||||
- **What it is:** A **Capability** is a specific feature or API that a `Topology` offers. It's the "how" a `Topology` can fulfill a `Score`'s request.
|
|
||||||
- **Example:** The `K8sClient` capability offers a way to interact with a Kubernetes API. The `Switch` capability offers a way to configure a physical network switch.
|
|
||||||
|
|
||||||
### 4. Interpret
|
|
||||||
|
|
||||||
- **What it is:** An **Interpret** is the execution logic that makes a `Score` a reality. It's the "glue" that connects the _desired state_ (`Score`) to the _environment's abilities_ (`Topology`'s `Capabilities`).
|
|
||||||
- **How it works:** When you apply a `Score`, Harmony finds the matching `Interpret` for your `Topology`. This `Interpret` then uses the `Capabilities` provided by the `Topology` to execute the necessary steps.
|
|
||||||
|
|
||||||
### 5. Inventory
|
|
||||||
|
|
||||||
- **What it is:** An **Inventory** is the physical material (the "what") used in a cluster. This is most relevant for bare-metal or on-premise topologies.
|
|
||||||
- **Example:** A list of nodes with their roles (control plane, worker), CPU, RAM, and network interfaces. For the `K8sAnywhereTopology`, the inventory might be empty or autoloaded, as the infrastructure is more abstract.
|
|
||||||
|
|
||||||
---
|
|
||||||
|
|
||||||
### How They Work Together (The Compile-Time Check)
|
|
||||||
|
|
||||||
1. You **write a `Score`** (e.g., `ApplicationScore`).
|
|
||||||
2. Your `Score`'s `Interpret` logic requires certain **`Capabilities`** (e.g., `K8sClient` and `Ingress`).
|
|
||||||
3. You choose a **`Topology`** to run it on (e.g., `HAClusterTopology`).
|
|
||||||
4. **At compile-time**, Harmony checks: "Does `HAClusterTopology` provide the `K8sClient` and `Ingress` capabilities that `ApplicationScore` needs?"
|
|
||||||
- **If Yes:** Your code compiles. You can be confident it will run.
|
|
||||||
- **If No:** The compiler gives you an error. You've just prevented a "config-is-valid-but-platform-is-wrong" runtime error before you even deployed.
|
|
||||||
@@ -1,42 +0,0 @@
|
|||||||
# Getting Started Guide
|
|
||||||
|
|
||||||
Welcome to Harmony! This guide will walk you through installing the Harmony framework, setting up a new project, and deploying your first application.
|
|
||||||
|
|
||||||
We will build and deploy the "Rust Web App" example, which automatically:
|
|
||||||
|
|
||||||
1. Provisions a local K3D (Kubernetes in Docker) cluster.
|
|
||||||
2. Deploys a sample Rust web application.
|
|
||||||
3. Sets up monitoring for the application.
|
|
||||||
|
|
||||||
## Prerequisites
|
|
||||||
|
|
||||||
Before you begin, you'll need a few tools installed on your system:
|
|
||||||
|
|
||||||
- **Rust & Cargo:** [Install Rust](https://www.rust-lang.org/tools/install)
|
|
||||||
- **Docker:** [Install Docker](https://docs.docker.com/get-docker/) (Required for the K3D local cluster)
|
|
||||||
- **kubectl:** [Install kubectl](https://kubernetes.io/docs/tasks/tools/install-kubectl/) (For inspecting the cluster)
|
|
||||||
|
|
||||||
## 1. Install Harmony
|
|
||||||
|
|
||||||
First, clone the Harmony repository and build the project. This gives you the `harmony` CLI and all the core libraries.
|
|
||||||
|
|
||||||
```bash
|
|
||||||
# Clone the main repository
|
|
||||||
git clone https://git.nationtech.io/nationtech/harmony
|
|
||||||
cd harmony
|
|
||||||
|
|
||||||
# Build the project (this may take a few minutes)
|
|
||||||
cargo build --release
|
|
||||||
```
|
|
||||||
|
|
||||||
...
|
|
||||||
|
|
||||||
## Next Steps
|
|
||||||
|
|
||||||
Congratulations, you've just deployed an application using true infrastructure-as-code!
|
|
||||||
|
|
||||||
From here, you can:
|
|
||||||
|
|
||||||
- [Explore the Catalogs](../catalogs/README.md): See what other [Scores](../catalogs/scores.md) and [Topologies](../catalogs/topologies.md) are available.
|
|
||||||
- [Read the Use Cases](../use-cases/README.md): Check out the [OKD on Bare Metal](./use-cases/okd-on-bare-metal.md) guide for a more advanced scenario.
|
|
||||||
- [Write your own Score](../guides/writing-a-score.md): Dive into the [Developer Guide](./guides/developer-guide.md) to start building your own components.
|
|
||||||
@@ -17,5 +17,3 @@ harmony_secret = { path = "../../harmony_secret" }
|
|||||||
log = { workspace = true }
|
log = { workspace = true }
|
||||||
env_logger = { workspace = true }
|
env_logger = { workspace = true }
|
||||||
url = { workspace = true }
|
url = { workspace = true }
|
||||||
serde = { workspace = true }
|
|
||||||
brocade = { path = "../../brocade" }
|
|
||||||
|
|||||||
@@ -1,15 +1,14 @@
|
|||||||
use std::{
|
use std::{
|
||||||
net::{IpAddr, Ipv4Addr},
|
net::{IpAddr, Ipv4Addr},
|
||||||
sync::{Arc, OnceLock},
|
sync::Arc,
|
||||||
};
|
};
|
||||||
|
|
||||||
use brocade::BrocadeOptions;
|
|
||||||
use cidr::Ipv4Cidr;
|
use cidr::Ipv4Cidr;
|
||||||
use harmony::{
|
use harmony::{
|
||||||
config::secret::SshKeyPair,
|
config::secret::SshKeyPair,
|
||||||
data::{FileContent, FilePath},
|
data::{FileContent, FilePath},
|
||||||
hardware::{HostCategory, Location, PhysicalHost, SwitchGroup},
|
hardware::{HostCategory, Location, PhysicalHost, SwitchGroup},
|
||||||
infra::{brocade::BrocadeSwitchClient, opnsense::OPNSenseManagementInterface},
|
infra::opnsense::OPNSenseManagementInterface,
|
||||||
inventory::Inventory,
|
inventory::Inventory,
|
||||||
modules::{
|
modules::{
|
||||||
http::StaticFilesHttpScore,
|
http::StaticFilesHttpScore,
|
||||||
@@ -23,9 +22,8 @@ use harmony::{
|
|||||||
topology::{LogicalHost, UnmanagedRouter},
|
topology::{LogicalHost, UnmanagedRouter},
|
||||||
};
|
};
|
||||||
use harmony_macros::{ip, mac_address};
|
use harmony_macros::{ip, mac_address};
|
||||||
use harmony_secret::{Secret, SecretManager};
|
use harmony_secret::SecretManager;
|
||||||
use harmony_types::net::Url;
|
use harmony_types::net::Url;
|
||||||
use serde::{Deserialize, Serialize};
|
|
||||||
|
|
||||||
#[tokio::main]
|
#[tokio::main]
|
||||||
async fn main() {
|
async fn main() {
|
||||||
@@ -34,26 +32,6 @@ async fn main() {
|
|||||||
name: String::from("fw0"),
|
name: String::from("fw0"),
|
||||||
};
|
};
|
||||||
|
|
||||||
let switch_auth = SecretManager::get_or_prompt::<BrocadeSwitchAuth>()
|
|
||||||
.await
|
|
||||||
.expect("Failed to get credentials");
|
|
||||||
|
|
||||||
let switches: Vec<IpAddr> = vec![ip!("192.168.33.101")];
|
|
||||||
let brocade_options = Some(BrocadeOptions {
|
|
||||||
dry_run: *harmony::config::DRY_RUN,
|
|
||||||
..Default::default()
|
|
||||||
});
|
|
||||||
let switch_client = BrocadeSwitchClient::init(
|
|
||||||
&switches,
|
|
||||||
&switch_auth.username,
|
|
||||||
&switch_auth.password,
|
|
||||||
brocade_options,
|
|
||||||
)
|
|
||||||
.await
|
|
||||||
.expect("Failed to connect to switch");
|
|
||||||
|
|
||||||
let switch_client = Arc::new(switch_client);
|
|
||||||
|
|
||||||
let opnsense = Arc::new(
|
let opnsense = Arc::new(
|
||||||
harmony::infra::opnsense::OPNSenseFirewall::new(firewall, None, "root", "opnsense").await,
|
harmony::infra::opnsense::OPNSenseFirewall::new(firewall, None, "root", "opnsense").await,
|
||||||
);
|
);
|
||||||
@@ -61,7 +39,6 @@ async fn main() {
|
|||||||
let gateway_ipv4 = Ipv4Addr::new(192, 168, 33, 1);
|
let gateway_ipv4 = Ipv4Addr::new(192, 168, 33, 1);
|
||||||
let gateway_ip = IpAddr::V4(gateway_ipv4);
|
let gateway_ip = IpAddr::V4(gateway_ipv4);
|
||||||
let topology = harmony::topology::HAClusterTopology {
|
let topology = harmony::topology::HAClusterTopology {
|
||||||
kubeconfig: None,
|
|
||||||
domain_name: "ncd0.harmony.mcd".to_string(), // TODO this must be set manually correctly
|
domain_name: "ncd0.harmony.mcd".to_string(), // TODO this must be set manually correctly
|
||||||
// when setting up the opnsense firewall
|
// when setting up the opnsense firewall
|
||||||
router: Arc::new(UnmanagedRouter::new(
|
router: Arc::new(UnmanagedRouter::new(
|
||||||
@@ -106,8 +83,7 @@ async fn main() {
|
|||||||
name: "wk2".to_string(),
|
name: "wk2".to_string(),
|
||||||
},
|
},
|
||||||
],
|
],
|
||||||
switch_client: switch_client.clone(),
|
switch: vec![],
|
||||||
network_manager: OnceLock::new(),
|
|
||||||
};
|
};
|
||||||
|
|
||||||
let inventory = Inventory {
|
let inventory = Inventory {
|
||||||
@@ -190,9 +166,3 @@ async fn main() {
|
|||||||
.await
|
.await
|
||||||
.unwrap();
|
.unwrap();
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Secret, Serialize, Deserialize, Debug)]
|
|
||||||
pub struct BrocadeSwitchAuth {
|
|
||||||
pub username: String,
|
|
||||||
pub password: String,
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -19,4 +19,3 @@ log = { workspace = true }
|
|||||||
env_logger = { workspace = true }
|
env_logger = { workspace = true }
|
||||||
url = { workspace = true }
|
url = { workspace = true }
|
||||||
serde.workspace = true
|
serde.workspace = true
|
||||||
brocade = { path = "../../brocade" }
|
|
||||||
|
|||||||
@@ -1,18 +1,14 @@
|
|||||||
use brocade::BrocadeOptions;
|
|
||||||
use cidr::Ipv4Cidr;
|
use cidr::Ipv4Cidr;
|
||||||
use harmony::{
|
use harmony::{
|
||||||
hardware::{Location, SwitchGroup},
|
hardware::{FirewallGroup, HostCategory, Location, PhysicalHost, SwitchGroup},
|
||||||
infra::{brocade::BrocadeSwitchClient, opnsense::OPNSenseManagementInterface},
|
infra::opnsense::OPNSenseManagementInterface,
|
||||||
inventory::Inventory,
|
inventory::Inventory,
|
||||||
topology::{HAClusterTopology, LogicalHost, UnmanagedRouter},
|
topology::{HAClusterTopology, LogicalHost, UnmanagedRouter},
|
||||||
};
|
};
|
||||||
use harmony_macros::{ip, ipv4};
|
use harmony_macros::{ip, ipv4};
|
||||||
use harmony_secret::{Secret, SecretManager};
|
use harmony_secret::{Secret, SecretManager};
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use std::{
|
use std::{net::IpAddr, sync::Arc};
|
||||||
net::IpAddr,
|
|
||||||
sync::{Arc, OnceLock},
|
|
||||||
};
|
|
||||||
|
|
||||||
#[derive(Secret, Serialize, Deserialize, Debug, PartialEq)]
|
#[derive(Secret, Serialize, Deserialize, Debug, PartialEq)]
|
||||||
struct OPNSenseFirewallConfig {
|
struct OPNSenseFirewallConfig {
|
||||||
@@ -26,26 +22,6 @@ pub async fn get_topology() -> HAClusterTopology {
|
|||||||
name: String::from("opnsense-1"),
|
name: String::from("opnsense-1"),
|
||||||
};
|
};
|
||||||
|
|
||||||
let switch_auth = SecretManager::get_or_prompt::<BrocadeSwitchAuth>()
|
|
||||||
.await
|
|
||||||
.expect("Failed to get credentials");
|
|
||||||
|
|
||||||
let switches: Vec<IpAddr> = vec![ip!("192.168.1.101")]; // TODO: Adjust me
|
|
||||||
let brocade_options = Some(BrocadeOptions {
|
|
||||||
dry_run: *harmony::config::DRY_RUN,
|
|
||||||
..Default::default()
|
|
||||||
});
|
|
||||||
let switch_client = BrocadeSwitchClient::init(
|
|
||||||
&switches,
|
|
||||||
&switch_auth.username,
|
|
||||||
&switch_auth.password,
|
|
||||||
brocade_options,
|
|
||||||
)
|
|
||||||
.await
|
|
||||||
.expect("Failed to connect to switch");
|
|
||||||
|
|
||||||
let switch_client = Arc::new(switch_client);
|
|
||||||
|
|
||||||
let config = SecretManager::get_or_prompt::<OPNSenseFirewallConfig>().await;
|
let config = SecretManager::get_or_prompt::<OPNSenseFirewallConfig>().await;
|
||||||
let config = config.unwrap();
|
let config = config.unwrap();
|
||||||
|
|
||||||
@@ -62,7 +38,6 @@ pub async fn get_topology() -> HAClusterTopology {
|
|||||||
let gateway_ipv4 = ipv4!("192.168.1.1");
|
let gateway_ipv4 = ipv4!("192.168.1.1");
|
||||||
let gateway_ip = IpAddr::V4(gateway_ipv4);
|
let gateway_ip = IpAddr::V4(gateway_ipv4);
|
||||||
harmony::topology::HAClusterTopology {
|
harmony::topology::HAClusterTopology {
|
||||||
kubeconfig: None,
|
|
||||||
domain_name: "demo.harmony.mcd".to_string(),
|
domain_name: "demo.harmony.mcd".to_string(),
|
||||||
router: Arc::new(UnmanagedRouter::new(
|
router: Arc::new(UnmanagedRouter::new(
|
||||||
gateway_ip,
|
gateway_ip,
|
||||||
@@ -83,8 +58,7 @@ pub async fn get_topology() -> HAClusterTopology {
|
|||||||
name: "bootstrap".to_string(),
|
name: "bootstrap".to_string(),
|
||||||
},
|
},
|
||||||
workers: vec![],
|
workers: vec![],
|
||||||
switch_client: switch_client.clone(),
|
switch: vec![],
|
||||||
network_manager: OnceLock::new(),
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -101,9 +75,3 @@ pub fn get_inventory() -> Inventory {
|
|||||||
control_plane_host: vec![],
|
control_plane_host: vec![],
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Secret, Serialize, Deserialize, Debug)]
|
|
||||||
pub struct BrocadeSwitchAuth {
|
|
||||||
pub username: String,
|
|
||||||
pub password: String,
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -19,4 +19,3 @@ log = { workspace = true }
|
|||||||
env_logger = { workspace = true }
|
env_logger = { workspace = true }
|
||||||
url = { workspace = true }
|
url = { workspace = true }
|
||||||
serde.workspace = true
|
serde.workspace = true
|
||||||
brocade = { path = "../../brocade" }
|
|
||||||
|
|||||||
@@ -1,19 +1,14 @@
|
|||||||
use brocade::BrocadeOptions;
|
|
||||||
use cidr::Ipv4Cidr;
|
use cidr::Ipv4Cidr;
|
||||||
use harmony::{
|
use harmony::{
|
||||||
config::secret::OPNSenseFirewallCredentials,
|
config::secret::OPNSenseFirewallCredentials,
|
||||||
hardware::{Location, SwitchGroup},
|
hardware::{Location, SwitchGroup},
|
||||||
infra::{brocade::BrocadeSwitchClient, opnsense::OPNSenseManagementInterface},
|
infra::opnsense::OPNSenseManagementInterface,
|
||||||
inventory::Inventory,
|
inventory::Inventory,
|
||||||
topology::{HAClusterTopology, LogicalHost, UnmanagedRouter},
|
topology::{HAClusterTopology, LogicalHost, UnmanagedRouter},
|
||||||
};
|
};
|
||||||
use harmony_macros::{ip, ipv4};
|
use harmony_macros::{ip, ipv4};
|
||||||
use harmony_secret::{Secret, SecretManager};
|
use harmony_secret::SecretManager;
|
||||||
use serde::{Deserialize, Serialize};
|
use std::{net::IpAddr, sync::Arc};
|
||||||
use std::{
|
|
||||||
net::IpAddr,
|
|
||||||
sync::{Arc, OnceLock},
|
|
||||||
};
|
|
||||||
|
|
||||||
pub async fn get_topology() -> HAClusterTopology {
|
pub async fn get_topology() -> HAClusterTopology {
|
||||||
let firewall = harmony::topology::LogicalHost {
|
let firewall = harmony::topology::LogicalHost {
|
||||||
@@ -21,26 +16,6 @@ pub async fn get_topology() -> HAClusterTopology {
|
|||||||
name: String::from("opnsense-1"),
|
name: String::from("opnsense-1"),
|
||||||
};
|
};
|
||||||
|
|
||||||
let switch_auth = SecretManager::get_or_prompt::<BrocadeSwitchAuth>()
|
|
||||||
.await
|
|
||||||
.expect("Failed to get credentials");
|
|
||||||
|
|
||||||
let switches: Vec<IpAddr> = vec![ip!("192.168.1.101")]; // TODO: Adjust me
|
|
||||||
let brocade_options = Some(BrocadeOptions {
|
|
||||||
dry_run: *harmony::config::DRY_RUN,
|
|
||||||
..Default::default()
|
|
||||||
});
|
|
||||||
let switch_client = BrocadeSwitchClient::init(
|
|
||||||
&switches,
|
|
||||||
&switch_auth.username,
|
|
||||||
&switch_auth.password,
|
|
||||||
brocade_options,
|
|
||||||
)
|
|
||||||
.await
|
|
||||||
.expect("Failed to connect to switch");
|
|
||||||
|
|
||||||
let switch_client = Arc::new(switch_client);
|
|
||||||
|
|
||||||
let config = SecretManager::get_or_prompt::<OPNSenseFirewallCredentials>().await;
|
let config = SecretManager::get_or_prompt::<OPNSenseFirewallCredentials>().await;
|
||||||
let config = config.unwrap();
|
let config = config.unwrap();
|
||||||
|
|
||||||
@@ -57,7 +32,6 @@ pub async fn get_topology() -> HAClusterTopology {
|
|||||||
let gateway_ipv4 = ipv4!("192.168.1.1");
|
let gateway_ipv4 = ipv4!("192.168.1.1");
|
||||||
let gateway_ip = IpAddr::V4(gateway_ipv4);
|
let gateway_ip = IpAddr::V4(gateway_ipv4);
|
||||||
harmony::topology::HAClusterTopology {
|
harmony::topology::HAClusterTopology {
|
||||||
kubeconfig: None,
|
|
||||||
domain_name: "demo.harmony.mcd".to_string(),
|
domain_name: "demo.harmony.mcd".to_string(),
|
||||||
router: Arc::new(UnmanagedRouter::new(
|
router: Arc::new(UnmanagedRouter::new(
|
||||||
gateway_ip,
|
gateway_ip,
|
||||||
@@ -78,8 +52,7 @@ pub async fn get_topology() -> HAClusterTopology {
|
|||||||
name: "cp0".to_string(),
|
name: "cp0".to_string(),
|
||||||
},
|
},
|
||||||
workers: vec![],
|
workers: vec![],
|
||||||
switch_client: switch_client.clone(),
|
switch: vec![],
|
||||||
network_manager: OnceLock::new(),
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -96,9 +69,3 @@ pub fn get_inventory() -> Inventory {
|
|||||||
control_plane_host: vec![],
|
control_plane_host: vec![],
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Secret, Serialize, Deserialize, Debug)]
|
|
||||||
pub struct BrocadeSwitchAuth {
|
|
||||||
pub username: String,
|
|
||||||
pub password: String,
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -1,14 +0,0 @@
|
|||||||
[package]
|
|
||||||
name = "example-openbao"
|
|
||||||
edition = "2024"
|
|
||||||
version.workspace = true
|
|
||||||
readme.workspace = true
|
|
||||||
license.workspace = true
|
|
||||||
|
|
||||||
[dependencies]
|
|
||||||
harmony = { path = "../../harmony" }
|
|
||||||
harmony_cli = { path = "../../harmony_cli" }
|
|
||||||
harmony_macros = { path = "../../harmony_macros" }
|
|
||||||
harmony_types = { path = "../../harmony_types" }
|
|
||||||
tokio.workspace = true
|
|
||||||
url.workspace = true
|
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
To install an openbao instance with harmony simply `cargo run -p example-openbao` .
|
|
||||||
|
|
||||||
Depending on your environement configuration, it will either install a k3d cluster locally and deploy on it, or install to a remote cluster.
|
|
||||||
|
|
||||||
Then follow the openbao documentation to initialize and unseal, this will make openbao usable.
|
|
||||||
|
|
||||||
https://openbao.org/docs/platform/k8s/helm/run/
|
|
||||||
@@ -1,67 +0,0 @@
|
|||||||
use std::{collections::HashMap, str::FromStr};
|
|
||||||
|
|
||||||
use harmony::{
|
|
||||||
inventory::Inventory,
|
|
||||||
modules::helm::chart::{HelmChartScore, HelmRepository, NonBlankString},
|
|
||||||
topology::K8sAnywhereTopology,
|
|
||||||
};
|
|
||||||
use harmony_macros::hurl;
|
|
||||||
|
|
||||||
#[tokio::main]
|
|
||||||
async fn main() {
|
|
||||||
let values_yaml = Some(
|
|
||||||
r#"server:
|
|
||||||
standalone:
|
|
||||||
enabled: true
|
|
||||||
config: |
|
|
||||||
listener "tcp" {
|
|
||||||
tls_disable = true
|
|
||||||
address = "[::]:8200"
|
|
||||||
cluster_address = "[::]:8201"
|
|
||||||
}
|
|
||||||
|
|
||||||
storage "file" {
|
|
||||||
path = "/openbao/data"
|
|
||||||
}
|
|
||||||
|
|
||||||
service:
|
|
||||||
enabled: true
|
|
||||||
|
|
||||||
dataStorage:
|
|
||||||
enabled: true
|
|
||||||
size: 10Gi
|
|
||||||
storageClass: null
|
|
||||||
accessMode: ReadWriteOnce
|
|
||||||
|
|
||||||
auditStorage:
|
|
||||||
enabled: true
|
|
||||||
size: 10Gi
|
|
||||||
storageClass: null
|
|
||||||
accessMode: ReadWriteOnce"#
|
|
||||||
.to_string(),
|
|
||||||
);
|
|
||||||
let openbao = HelmChartScore {
|
|
||||||
namespace: Some(NonBlankString::from_str("openbao").unwrap()),
|
|
||||||
release_name: NonBlankString::from_str("openbao").unwrap(),
|
|
||||||
chart_name: NonBlankString::from_str("openbao/openbao").unwrap(),
|
|
||||||
chart_version: None,
|
|
||||||
values_overrides: None,
|
|
||||||
values_yaml,
|
|
||||||
create_namespace: true,
|
|
||||||
install_only: true,
|
|
||||||
repository: Some(HelmRepository::new(
|
|
||||||
"openbao".to_string(),
|
|
||||||
hurl!("https://openbao.github.io/openbao-helm"),
|
|
||||||
true,
|
|
||||||
)),
|
|
||||||
};
|
|
||||||
|
|
||||||
harmony_cli::run(
|
|
||||||
Inventory::autoload(),
|
|
||||||
K8sAnywhereTopology::from_env(),
|
|
||||||
vec![Box::new(openbao)],
|
|
||||||
None,
|
|
||||||
)
|
|
||||||
.await
|
|
||||||
.unwrap();
|
|
||||||
}
|
|
||||||
@@ -16,6 +16,3 @@ harmony_macros = { path = "../../harmony_macros" }
|
|||||||
log = { workspace = true }
|
log = { workspace = true }
|
||||||
env_logger = { workspace = true }
|
env_logger = { workspace = true }
|
||||||
url = { workspace = true }
|
url = { workspace = true }
|
||||||
harmony_secret = { path = "../../harmony_secret" }
|
|
||||||
brocade = { path = "../../brocade" }
|
|
||||||
serde = { workspace = true }
|
|
||||||
|
|||||||
@@ -1,13 +1,12 @@
|
|||||||
use std::{
|
use std::{
|
||||||
net::{IpAddr, Ipv4Addr},
|
net::{IpAddr, Ipv4Addr},
|
||||||
sync::{Arc, OnceLock},
|
sync::Arc,
|
||||||
};
|
};
|
||||||
|
|
||||||
use brocade::BrocadeOptions;
|
|
||||||
use cidr::Ipv4Cidr;
|
use cidr::Ipv4Cidr;
|
||||||
use harmony::{
|
use harmony::{
|
||||||
hardware::{HostCategory, Location, PhysicalHost, SwitchGroup},
|
hardware::{HostCategory, Location, PhysicalHost, SwitchGroup},
|
||||||
infra::{brocade::BrocadeSwitchClient, opnsense::OPNSenseManagementInterface},
|
infra::opnsense::OPNSenseManagementInterface,
|
||||||
inventory::Inventory,
|
inventory::Inventory,
|
||||||
modules::{
|
modules::{
|
||||||
dummy::{ErrorScore, PanicScore, SuccessScore},
|
dummy::{ErrorScore, PanicScore, SuccessScore},
|
||||||
@@ -19,9 +18,7 @@ use harmony::{
|
|||||||
topology::{LogicalHost, UnmanagedRouter},
|
topology::{LogicalHost, UnmanagedRouter},
|
||||||
};
|
};
|
||||||
use harmony_macros::{ip, mac_address};
|
use harmony_macros::{ip, mac_address};
|
||||||
use harmony_secret::{Secret, SecretManager};
|
|
||||||
use harmony_types::net::Url;
|
use harmony_types::net::Url;
|
||||||
use serde::{Deserialize, Serialize};
|
|
||||||
|
|
||||||
#[tokio::main]
|
#[tokio::main]
|
||||||
async fn main() {
|
async fn main() {
|
||||||
@@ -30,26 +27,6 @@ async fn main() {
|
|||||||
name: String::from("opnsense-1"),
|
name: String::from("opnsense-1"),
|
||||||
};
|
};
|
||||||
|
|
||||||
let switch_auth = SecretManager::get_or_prompt::<BrocadeSwitchAuth>()
|
|
||||||
.await
|
|
||||||
.expect("Failed to get credentials");
|
|
||||||
|
|
||||||
let switches: Vec<IpAddr> = vec![ip!("192.168.5.101")]; // TODO: Adjust me
|
|
||||||
let brocade_options = Some(BrocadeOptions {
|
|
||||||
dry_run: *harmony::config::DRY_RUN,
|
|
||||||
..Default::default()
|
|
||||||
});
|
|
||||||
let switch_client = BrocadeSwitchClient::init(
|
|
||||||
&switches,
|
|
||||||
&switch_auth.username,
|
|
||||||
&switch_auth.password,
|
|
||||||
brocade_options,
|
|
||||||
)
|
|
||||||
.await
|
|
||||||
.expect("Failed to connect to switch");
|
|
||||||
|
|
||||||
let switch_client = Arc::new(switch_client);
|
|
||||||
|
|
||||||
let opnsense = Arc::new(
|
let opnsense = Arc::new(
|
||||||
harmony::infra::opnsense::OPNSenseFirewall::new(firewall, None, "root", "opnsense").await,
|
harmony::infra::opnsense::OPNSenseFirewall::new(firewall, None, "root", "opnsense").await,
|
||||||
);
|
);
|
||||||
@@ -57,7 +34,6 @@ async fn main() {
|
|||||||
let gateway_ipv4 = Ipv4Addr::new(10, 100, 8, 1);
|
let gateway_ipv4 = Ipv4Addr::new(10, 100, 8, 1);
|
||||||
let gateway_ip = IpAddr::V4(gateway_ipv4);
|
let gateway_ip = IpAddr::V4(gateway_ipv4);
|
||||||
let topology = harmony::topology::HAClusterTopology {
|
let topology = harmony::topology::HAClusterTopology {
|
||||||
kubeconfig: None,
|
|
||||||
domain_name: "demo.harmony.mcd".to_string(),
|
domain_name: "demo.harmony.mcd".to_string(),
|
||||||
router: Arc::new(UnmanagedRouter::new(
|
router: Arc::new(UnmanagedRouter::new(
|
||||||
gateway_ip,
|
gateway_ip,
|
||||||
@@ -78,8 +54,7 @@ async fn main() {
|
|||||||
name: "cp0".to_string(),
|
name: "cp0".to_string(),
|
||||||
},
|
},
|
||||||
workers: vec![],
|
workers: vec![],
|
||||||
switch_client: switch_client.clone(),
|
switch: vec![],
|
||||||
network_manager: OnceLock::new(),
|
|
||||||
};
|
};
|
||||||
|
|
||||||
let inventory = Inventory {
|
let inventory = Inventory {
|
||||||
@@ -134,9 +109,3 @@ async fn main() {
|
|||||||
.await
|
.await
|
||||||
.unwrap();
|
.unwrap();
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Secret, Serialize, Deserialize, Debug)]
|
|
||||||
pub struct BrocadeSwitchAuth {
|
|
||||||
pub username: String,
|
|
||||||
pub password: String,
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -1,11 +0,0 @@
|
|||||||
[package]
|
|
||||||
name = "example-remove-rook-osd"
|
|
||||||
edition = "2024"
|
|
||||||
version.workspace = true
|
|
||||||
readme.workspace = true
|
|
||||||
license.workspace = true
|
|
||||||
|
|
||||||
[dependencies]
|
|
||||||
harmony = { version = "0.1.0", path = "../../harmony" }
|
|
||||||
harmony_cli = { version = "0.1.0", path = "../../harmony_cli" }
|
|
||||||
tokio.workspace = true
|
|
||||||
@@ -1,18 +0,0 @@
|
|||||||
use harmony::{
|
|
||||||
inventory::Inventory, modules::storage::ceph::ceph_remove_osd_score::CephRemoveOsd,
|
|
||||||
topology::K8sAnywhereTopology,
|
|
||||||
};
|
|
||||||
|
|
||||||
#[tokio::main]
|
|
||||||
async fn main() {
|
|
||||||
let ceph_score = CephRemoveOsd {
|
|
||||||
osd_deployment_name: "rook-ceph-osd-2".to_string(),
|
|
||||||
rook_ceph_namespace: "rook-ceph".to_string(),
|
|
||||||
};
|
|
||||||
|
|
||||||
let topology = K8sAnywhereTopology::from_env();
|
|
||||||
let inventory = Inventory::autoload();
|
|
||||||
harmony_cli::run(inventory, topology, vec![Box::new(ceph_score)], None)
|
|
||||||
.await
|
|
||||||
.unwrap();
|
|
||||||
}
|
|
||||||
@@ -4,7 +4,8 @@ use harmony::{
|
|||||||
inventory::Inventory,
|
inventory::Inventory,
|
||||||
modules::{
|
modules::{
|
||||||
application::{
|
application::{
|
||||||
ApplicationScore, RustWebFramework, RustWebapp, features::rhob_monitoring::Monitoring,
|
ApplicationScore, RustWebFramework, RustWebapp,
|
||||||
|
features::rhob_monitoring::RHOBMonitoring,
|
||||||
},
|
},
|
||||||
monitoring::alert_channel::discord_alert_channel::DiscordWebhook,
|
monitoring::alert_channel::discord_alert_channel::DiscordWebhook,
|
||||||
},
|
},
|
||||||
@@ -28,7 +29,7 @@ async fn main() {
|
|||||||
|
|
||||||
let app = ApplicationScore {
|
let app = ApplicationScore {
|
||||||
features: vec![
|
features: vec![
|
||||||
Box::new(Monitoring {
|
Box::new(RHOBMonitoring {
|
||||||
application: application.clone(),
|
application: application.clone(),
|
||||||
alert_receiver: vec![Box::new(discord_receiver)],
|
alert_receiver: vec![Box::new(discord_receiver)],
|
||||||
}),
|
}),
|
||||||
|
|||||||
@@ -5,7 +5,7 @@ use harmony::{
|
|||||||
modules::{
|
modules::{
|
||||||
application::{
|
application::{
|
||||||
ApplicationScore, RustWebFramework, RustWebapp,
|
ApplicationScore, RustWebFramework, RustWebapp,
|
||||||
features::{Monitoring, PackagingDeployment},
|
features::{ContinuousDelivery, Monitoring},
|
||||||
},
|
},
|
||||||
monitoring::alert_channel::{
|
monitoring::alert_channel::{
|
||||||
discord_alert_channel::DiscordWebhook, webhook_receiver::WebhookReceiver,
|
discord_alert_channel::DiscordWebhook, webhook_receiver::WebhookReceiver,
|
||||||
@@ -36,7 +36,7 @@ async fn main() {
|
|||||||
|
|
||||||
let app = ApplicationScore {
|
let app = ApplicationScore {
|
||||||
features: vec![
|
features: vec![
|
||||||
Box::new(PackagingDeployment {
|
Box::new(ContinuousDelivery {
|
||||||
application: application.clone(),
|
application: application.clone(),
|
||||||
}),
|
}),
|
||||||
Box::new(Monitoring {
|
Box::new(Monitoring {
|
||||||
|
|||||||
@@ -5,10 +5,6 @@ version.workspace = true
|
|||||||
readme.workspace = true
|
readme.workspace = true
|
||||||
license.workspace = true
|
license.workspace = true
|
||||||
|
|
||||||
[[example]]
|
|
||||||
name = "try_rust_webapp"
|
|
||||||
path = "src/main.rs"
|
|
||||||
|
|
||||||
[dependencies]
|
[dependencies]
|
||||||
harmony = { path = "../../harmony" }
|
harmony = { path = "../../harmony" }
|
||||||
harmony_cli = { path = "../../harmony_cli" }
|
harmony_cli = { path = "../../harmony_cli" }
|
||||||
|
|||||||
@@ -1 +0,0 @@
|
|||||||
harmony
|
|
||||||
@@ -1,20 +0,0 @@
|
|||||||
[package]
|
|
||||||
name = "harmony-tryrust"
|
|
||||||
edition = "2024"
|
|
||||||
version = "0.1.0"
|
|
||||||
|
|
||||||
[dependencies]
|
|
||||||
harmony = { path = "../../../nationtech/harmony/harmony" }
|
|
||||||
harmony_cli = { path = "../../../nationtech/harmony/harmony_cli" }
|
|
||||||
harmony_types = { path = "../../../nationtech/harmony/harmony_types" }
|
|
||||||
harmony_macros = { path = "../../../nationtech/harmony/harmony_macros" }
|
|
||||||
tokio = { version = "1.40", features = [
|
|
||||||
"io-std",
|
|
||||||
"fs",
|
|
||||||
"macros",
|
|
||||||
"rt-multi-thread",
|
|
||||||
] }
|
|
||||||
log = { version = "0.4", features = ["kv"] }
|
|
||||||
env_logger = "0.11"
|
|
||||||
url = "2.5"
|
|
||||||
base64 = "0.22.1"
|
|
||||||
@@ -1,50 +0,0 @@
|
|||||||
use harmony::{
|
|
||||||
inventory::Inventory,
|
|
||||||
modules::{
|
|
||||||
application::{
|
|
||||||
ApplicationScore, RustWebFramework, RustWebapp,
|
|
||||||
features::{PackagingDeployment, rhob_monitoring::Monitoring},
|
|
||||||
},
|
|
||||||
monitoring::alert_channel::discord_alert_channel::DiscordWebhook,
|
|
||||||
},
|
|
||||||
topology::K8sAnywhereTopology,
|
|
||||||
};
|
|
||||||
use harmony_macros::hurl;
|
|
||||||
use std::{path::PathBuf, sync::Arc};
|
|
||||||
|
|
||||||
#[tokio::main]
|
|
||||||
async fn main() {
|
|
||||||
let application = Arc::new(RustWebapp {
|
|
||||||
name: "tryrust".to_string(),
|
|
||||||
project_root: PathBuf::from(".."),
|
|
||||||
framework: Some(RustWebFramework::Leptos),
|
|
||||||
service_port: 8080,
|
|
||||||
});
|
|
||||||
|
|
||||||
let discord_webhook = DiscordWebhook {
|
|
||||||
name: "harmony_demo".to_string(),
|
|
||||||
url: hurl!("http://not_a_url.com"),
|
|
||||||
};
|
|
||||||
|
|
||||||
let app = ApplicationScore {
|
|
||||||
features: vec![
|
|
||||||
Box::new(PackagingDeployment {
|
|
||||||
application: application.clone(),
|
|
||||||
}),
|
|
||||||
Box::new(Monitoring {
|
|
||||||
application: application.clone(),
|
|
||||||
alert_receiver: vec![Box::new(discord_webhook)],
|
|
||||||
}),
|
|
||||||
],
|
|
||||||
application,
|
|
||||||
};
|
|
||||||
|
|
||||||
harmony_cli::run(
|
|
||||||
Inventory::autoload(),
|
|
||||||
K8sAnywhereTopology::from_env(),
|
|
||||||
vec![Box::new(app)],
|
|
||||||
None,
|
|
||||||
)
|
|
||||||
.await
|
|
||||||
.unwrap();
|
|
||||||
}
|
|
||||||
@@ -3,7 +3,7 @@ use harmony::{
|
|||||||
modules::{
|
modules::{
|
||||||
application::{
|
application::{
|
||||||
ApplicationScore, RustWebFramework, RustWebapp,
|
ApplicationScore, RustWebFramework, RustWebapp,
|
||||||
features::{Monitoring, PackagingDeployment},
|
features::{ContinuousDelivery, Monitoring, rhob_monitoring::RHOBMonitoring},
|
||||||
},
|
},
|
||||||
monitoring::alert_channel::discord_alert_channel::DiscordWebhook,
|
monitoring::alert_channel::discord_alert_channel::DiscordWebhook,
|
||||||
},
|
},
|
||||||
@@ -16,24 +16,24 @@ use std::{path::PathBuf, sync::Arc};
|
|||||||
async fn main() {
|
async fn main() {
|
||||||
let application = Arc::new(RustWebapp {
|
let application = Arc::new(RustWebapp {
|
||||||
name: "harmony-example-tryrust".to_string(),
|
name: "harmony-example-tryrust".to_string(),
|
||||||
project_root: PathBuf::from("./tryrust.org"), // <== Project root, in this case it is a
|
project_root: PathBuf::from("./tryrust.org"),
|
||||||
// submodule
|
|
||||||
framework: Some(RustWebFramework::Leptos),
|
framework: Some(RustWebFramework::Leptos),
|
||||||
service_port: 8080,
|
service_port: 8080,
|
||||||
});
|
});
|
||||||
|
|
||||||
// Define your Application deployment and the features you want
|
let discord_receiver = DiscordWebhook {
|
||||||
|
name: "test-discord".to_string(),
|
||||||
|
url: hurl!("https://discord.doesnt.exist.com"),
|
||||||
|
};
|
||||||
|
|
||||||
let app = ApplicationScore {
|
let app = ApplicationScore {
|
||||||
features: vec![
|
features: vec![
|
||||||
Box::new(PackagingDeployment {
|
Box::new(ContinuousDelivery {
|
||||||
application: application.clone(),
|
application: application.clone(),
|
||||||
}),
|
}),
|
||||||
Box::new(Monitoring {
|
Box::new(RHOBMonitoring {
|
||||||
application: application.clone(),
|
application: application.clone(),
|
||||||
alert_receiver: vec![Box::new(DiscordWebhook {
|
alert_receiver: vec![Box::new(discord_receiver)],
|
||||||
name: "test-discord".to_string(),
|
|
||||||
url: hurl!("https://discord.doesnt.exist.com"),
|
|
||||||
})],
|
|
||||||
}),
|
}),
|
||||||
],
|
],
|
||||||
application,
|
application,
|
||||||
@@ -41,7 +41,7 @@ async fn main() {
|
|||||||
|
|
||||||
harmony_cli::run(
|
harmony_cli::run(
|
||||||
Inventory::autoload(),
|
Inventory::autoload(),
|
||||||
K8sAnywhereTopology::from_env(), // <== Deploy to local automatically provisioned k3d by default or connect to any kubernetes cluster
|
K8sAnywhereTopology::from_env(),
|
||||||
vec![Box::new(app)],
|
vec![Box::new(app)],
|
||||||
None,
|
None,
|
||||||
)
|
)
|
||||||
|
|||||||
@@ -77,9 +77,6 @@ harmony_secret = { path = "../harmony_secret" }
|
|||||||
askama.workspace = true
|
askama.workspace = true
|
||||||
sqlx.workspace = true
|
sqlx.workspace = true
|
||||||
inquire.workspace = true
|
inquire.workspace = true
|
||||||
brocade = { path = "../brocade" }
|
|
||||||
option-ext = "0.2.0"
|
|
||||||
|
|
||||||
[dev-dependencies]
|
[dev-dependencies]
|
||||||
pretty_assertions.workspace = true
|
pretty_assertions.workspace = true
|
||||||
assertor.workspace = true
|
|
||||||
|
|||||||
@@ -30,12 +30,10 @@ pub enum InterpretName {
|
|||||||
Lamp,
|
Lamp,
|
||||||
ApplicationMonitoring,
|
ApplicationMonitoring,
|
||||||
K8sPrometheusCrdAlerting,
|
K8sPrometheusCrdAlerting,
|
||||||
CephRemoveOsd,
|
|
||||||
DiscoverInventoryAgent,
|
DiscoverInventoryAgent,
|
||||||
CephClusterHealth,
|
CephClusterHealth,
|
||||||
Custom(&'static str),
|
Custom(&'static str),
|
||||||
RHOBAlerting,
|
RHOBAlerting,
|
||||||
K8sIngress,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
impl std::fmt::Display for InterpretName {
|
impl std::fmt::Display for InterpretName {
|
||||||
@@ -62,12 +60,10 @@ impl std::fmt::Display for InterpretName {
|
|||||||
InterpretName::Lamp => f.write_str("LAMP"),
|
InterpretName::Lamp => f.write_str("LAMP"),
|
||||||
InterpretName::ApplicationMonitoring => f.write_str("ApplicationMonitoring"),
|
InterpretName::ApplicationMonitoring => f.write_str("ApplicationMonitoring"),
|
||||||
InterpretName::K8sPrometheusCrdAlerting => f.write_str("K8sPrometheusCrdAlerting"),
|
InterpretName::K8sPrometheusCrdAlerting => f.write_str("K8sPrometheusCrdAlerting"),
|
||||||
InterpretName::CephRemoveOsd => f.write_str("CephRemoveOsd"),
|
|
||||||
InterpretName::DiscoverInventoryAgent => f.write_str("DiscoverInventoryAgent"),
|
InterpretName::DiscoverInventoryAgent => f.write_str("DiscoverInventoryAgent"),
|
||||||
InterpretName::CephClusterHealth => f.write_str("CephClusterHealth"),
|
InterpretName::CephClusterHealth => f.write_str("CephClusterHealth"),
|
||||||
InterpretName::Custom(name) => f.write_str(name),
|
InterpretName::Custom(name) => f.write_str(name),
|
||||||
InterpretName::RHOBAlerting => f.write_str("RHOBAlerting"),
|
InterpretName::RHOBAlerting => f.write_str("RHOBAlerting"),
|
||||||
InterpretName::K8sIngress => f.write_str("K8sIngress"),
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -86,15 +82,13 @@ pub trait Interpret<T>: std::fmt::Debug + Send {
|
|||||||
pub struct Outcome {
|
pub struct Outcome {
|
||||||
pub status: InterpretStatus,
|
pub status: InterpretStatus,
|
||||||
pub message: String,
|
pub message: String,
|
||||||
pub details: Vec<String>,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Outcome {
|
impl Outcome {
|
||||||
pub fn noop(message: String) -> Self {
|
pub fn noop() -> Self {
|
||||||
Self {
|
Self {
|
||||||
status: InterpretStatus::NOOP,
|
status: InterpretStatus::NOOP,
|
||||||
message,
|
message: String::new(),
|
||||||
details: vec![],
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -102,23 +96,6 @@ impl Outcome {
|
|||||||
Self {
|
Self {
|
||||||
status: InterpretStatus::SUCCESS,
|
status: InterpretStatus::SUCCESS,
|
||||||
message,
|
message,
|
||||||
details: vec![],
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn success_with_details(message: String, details: Vec<String>) -> Self {
|
|
||||||
Self {
|
|
||||||
status: InterpretStatus::SUCCESS,
|
|
||||||
message,
|
|
||||||
details,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn running(message: String) -> Self {
|
|
||||||
Self {
|
|
||||||
status: InterpretStatus::RUNNING,
|
|
||||||
message,
|
|
||||||
details: vec![],
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,25 +1,34 @@
|
|||||||
use async_trait::async_trait;
|
use async_trait::async_trait;
|
||||||
use harmony_macros::ip;
|
use harmony_macros::ip;
|
||||||
use harmony_types::{
|
use harmony_types::net::MacAddress;
|
||||||
id::Id,
|
use harmony_types::net::Url;
|
||||||
net::{MacAddress, Url},
|
|
||||||
switch::PortLocation,
|
|
||||||
};
|
|
||||||
use log::debug;
|
use log::debug;
|
||||||
use log::info;
|
use log::info;
|
||||||
|
|
||||||
use crate::infra::network_manager::OpenShiftNmStateNetworkManager;
|
use crate::data::FileContent;
|
||||||
|
use crate::executors::ExecutorError;
|
||||||
use crate::topology::PxeOptions;
|
use crate::topology::PxeOptions;
|
||||||
use crate::{data::FileContent, executors::ExecutorError};
|
|
||||||
|
|
||||||
use super::{
|
use super::DHCPStaticEntry;
|
||||||
DHCPStaticEntry, DhcpServer, DnsRecord, DnsRecordType, DnsServer, Firewall, HostNetworkConfig,
|
use super::DhcpServer;
|
||||||
HttpServer, IpAddress, K8sclient, LoadBalancer, LoadBalancerService, LogicalHost, NetworkError,
|
use super::DnsRecord;
|
||||||
NetworkManager, PreparationError, PreparationOutcome, Router, Switch, SwitchClient,
|
use super::DnsRecordType;
|
||||||
SwitchError, TftpServer, Topology, k8s::K8sClient,
|
use super::DnsServer;
|
||||||
};
|
use super::Firewall;
|
||||||
|
use super::HttpServer;
|
||||||
|
use super::IpAddress;
|
||||||
|
use super::K8sclient;
|
||||||
|
use super::LoadBalancer;
|
||||||
|
use super::LoadBalancerService;
|
||||||
|
use super::LogicalHost;
|
||||||
|
use super::PreparationError;
|
||||||
|
use super::PreparationOutcome;
|
||||||
|
use super::Router;
|
||||||
|
use super::TftpServer;
|
||||||
|
|
||||||
use std::sync::{Arc, OnceLock};
|
use super::Topology;
|
||||||
|
use super::k8s::K8sClient;
|
||||||
|
use std::sync::Arc;
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
#[derive(Debug, Clone)]
|
||||||
pub struct HAClusterTopology {
|
pub struct HAClusterTopology {
|
||||||
@@ -31,12 +40,10 @@ pub struct HAClusterTopology {
|
|||||||
pub tftp_server: Arc<dyn TftpServer>,
|
pub tftp_server: Arc<dyn TftpServer>,
|
||||||
pub http_server: Arc<dyn HttpServer>,
|
pub http_server: Arc<dyn HttpServer>,
|
||||||
pub dns_server: Arc<dyn DnsServer>,
|
pub dns_server: Arc<dyn DnsServer>,
|
||||||
pub switch_client: Arc<dyn SwitchClient>,
|
|
||||||
pub bootstrap_host: LogicalHost,
|
pub bootstrap_host: LogicalHost,
|
||||||
pub control_plane: Vec<LogicalHost>,
|
pub control_plane: Vec<LogicalHost>,
|
||||||
pub workers: Vec<LogicalHost>,
|
pub workers: Vec<LogicalHost>,
|
||||||
pub kubeconfig: Option<String>,
|
pub switch: Vec<LogicalHost>,
|
||||||
pub network_manager: OnceLock<Arc<dyn NetworkManager>>,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[async_trait]
|
#[async_trait]
|
||||||
@@ -55,17 +62,9 @@ impl Topology for HAClusterTopology {
|
|||||||
#[async_trait]
|
#[async_trait]
|
||||||
impl K8sclient for HAClusterTopology {
|
impl K8sclient for HAClusterTopology {
|
||||||
async fn k8s_client(&self) -> Result<Arc<K8sClient>, String> {
|
async fn k8s_client(&self) -> Result<Arc<K8sClient>, String> {
|
||||||
match &self.kubeconfig {
|
Ok(Arc::new(
|
||||||
None => Ok(Arc::new(
|
K8sClient::try_default().await.map_err(|e| e.to_string())?,
|
||||||
K8sClient::try_default().await.map_err(|e| e.to_string())?,
|
))
|
||||||
)),
|
|
||||||
Some(kubeconfig) => {
|
|
||||||
let Some(client) = K8sClient::from_kubeconfig(kubeconfig).await else {
|
|
||||||
return Err("Failed to create k8s client".to_string());
|
|
||||||
};
|
|
||||||
Ok(Arc::new(client))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -90,14 +89,6 @@ impl HAClusterTopology {
|
|||||||
.to_string()
|
.to_string()
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn network_manager(&self) -> &dyn NetworkManager {
|
|
||||||
let k8s_client = self.k8s_client().await.unwrap();
|
|
||||||
|
|
||||||
self.network_manager
|
|
||||||
.get_or_init(|| Arc::new(OpenShiftNmStateNetworkManager::new(k8s_client.clone())))
|
|
||||||
.as_ref()
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn autoload() -> Self {
|
pub fn autoload() -> Self {
|
||||||
let dummy_infra = Arc::new(DummyInfra {});
|
let dummy_infra = Arc::new(DummyInfra {});
|
||||||
let dummy_host = LogicalHost {
|
let dummy_host = LogicalHost {
|
||||||
@@ -106,7 +97,6 @@ impl HAClusterTopology {
|
|||||||
};
|
};
|
||||||
|
|
||||||
Self {
|
Self {
|
||||||
kubeconfig: None,
|
|
||||||
domain_name: "DummyTopology".to_string(),
|
domain_name: "DummyTopology".to_string(),
|
||||||
router: dummy_infra.clone(),
|
router: dummy_infra.clone(),
|
||||||
load_balancer: dummy_infra.clone(),
|
load_balancer: dummy_infra.clone(),
|
||||||
@@ -115,11 +105,10 @@ impl HAClusterTopology {
|
|||||||
tftp_server: dummy_infra.clone(),
|
tftp_server: dummy_infra.clone(),
|
||||||
http_server: dummy_infra.clone(),
|
http_server: dummy_infra.clone(),
|
||||||
dns_server: dummy_infra.clone(),
|
dns_server: dummy_infra.clone(),
|
||||||
switch_client: dummy_infra.clone(),
|
|
||||||
bootstrap_host: dummy_host,
|
bootstrap_host: dummy_host,
|
||||||
control_plane: vec![],
|
control_plane: vec![],
|
||||||
workers: vec![],
|
workers: vec![],
|
||||||
network_manager: OnceLock::new(),
|
switch: vec![],
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -274,46 +263,6 @@ impl HttpServer for HAClusterTopology {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[async_trait]
|
|
||||||
impl Switch for HAClusterTopology {
|
|
||||||
async fn setup_switch(&self) -> Result<(), SwitchError> {
|
|
||||||
self.switch_client.setup().await.map(|_| ())
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn get_port_for_mac_address(
|
|
||||||
&self,
|
|
||||||
mac_address: &MacAddress,
|
|
||||||
) -> Result<Option<PortLocation>, SwitchError> {
|
|
||||||
self.switch_client.find_port(mac_address).await
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn configure_port_channel(&self, config: &HostNetworkConfig) -> Result<(), SwitchError> {
|
|
||||||
debug!("Configuring port channel: {config:#?}");
|
|
||||||
let switch_ports = config.switch_ports.iter().map(|s| s.port.clone()).collect();
|
|
||||||
|
|
||||||
self.switch_client
|
|
||||||
.configure_port_channel(&format!("Harmony_{}", config.host_id), switch_ports)
|
|
||||||
.await
|
|
||||||
.map_err(|e| SwitchError::new(format!("Failed to configure port-channel: {e}")))?;
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[async_trait]
|
|
||||||
impl NetworkManager for HAClusterTopology {
|
|
||||||
async fn ensure_network_manager_installed(&self) -> Result<(), NetworkError> {
|
|
||||||
self.network_manager()
|
|
||||||
.await
|
|
||||||
.ensure_network_manager_installed()
|
|
||||||
.await
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn configure_bond(&self, config: &HostNetworkConfig) -> Result<(), NetworkError> {
|
|
||||||
self.network_manager().await.configure_bond(config).await
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug)]
|
#[derive(Debug)]
|
||||||
pub struct DummyInfra;
|
pub struct DummyInfra;
|
||||||
|
|
||||||
@@ -383,8 +332,8 @@ impl DhcpServer for DummyInfra {
|
|||||||
}
|
}
|
||||||
async fn set_dhcp_range(
|
async fn set_dhcp_range(
|
||||||
&self,
|
&self,
|
||||||
_start: &IpAddress,
|
start: &IpAddress,
|
||||||
_end: &IpAddress,
|
end: &IpAddress,
|
||||||
) -> Result<(), ExecutorError> {
|
) -> Result<(), ExecutorError> {
|
||||||
unimplemented!("{}", UNIMPLEMENTED_DUMMY_INFRA)
|
unimplemented!("{}", UNIMPLEMENTED_DUMMY_INFRA)
|
||||||
}
|
}
|
||||||
@@ -500,25 +449,3 @@ impl DnsServer for DummyInfra {
|
|||||||
unimplemented!("{}", UNIMPLEMENTED_DUMMY_INFRA)
|
unimplemented!("{}", UNIMPLEMENTED_DUMMY_INFRA)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[async_trait]
|
|
||||||
impl SwitchClient for DummyInfra {
|
|
||||||
async fn setup(&self) -> Result<(), SwitchError> {
|
|
||||||
unimplemented!("{}", UNIMPLEMENTED_DUMMY_INFRA)
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn find_port(
|
|
||||||
&self,
|
|
||||||
_mac_address: &MacAddress,
|
|
||||||
) -> Result<Option<PortLocation>, SwitchError> {
|
|
||||||
unimplemented!("{}", UNIMPLEMENTED_DUMMY_INFRA)
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn configure_port_channel(
|
|
||||||
&self,
|
|
||||||
_channel_name: &str,
|
|
||||||
_switch_ports: Vec<PortLocation>,
|
|
||||||
) -> Result<u8, SwitchError> {
|
|
||||||
unimplemented!("{}", UNIMPLEMENTED_DUMMY_INFRA)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -1,23 +1,13 @@
|
|||||||
use std::time::Duration;
|
|
||||||
|
|
||||||
use derive_new::new;
|
use derive_new::new;
|
||||||
use k8s_openapi::{
|
use k8s_openapi::{
|
||||||
ClusterResourceScope, NamespaceResourceScope,
|
ClusterResourceScope, NamespaceResourceScope,
|
||||||
api::{
|
api::{apps::v1::Deployment, core::v1::Pod},
|
||||||
apps::v1::Deployment,
|
|
||||||
core::v1::{Node, Pod, ServiceAccount},
|
|
||||||
},
|
|
||||||
apimachinery::pkg::version::Info,
|
|
||||||
};
|
};
|
||||||
use kube::{
|
use kube::{
|
||||||
Client, Config, Discovery, Error, Resource,
|
Client, Config, Error, Resource,
|
||||||
api::{
|
api::{Api, AttachParams, DeleteParams, ListParams, Patch, PatchParams, ResourceExt},
|
||||||
Api, AttachParams, DeleteParams, ListParams, ObjectList, Patch, PatchParams, ResourceExt,
|
|
||||||
},
|
|
||||||
config::{KubeConfigOptions, Kubeconfig},
|
config::{KubeConfigOptions, Kubeconfig},
|
||||||
core::ErrorResponse,
|
core::ErrorResponse,
|
||||||
discovery::{ApiCapabilities, Scope},
|
|
||||||
error::DiscoveryError,
|
|
||||||
runtime::reflector::Lookup,
|
runtime::reflector::Lookup,
|
||||||
};
|
};
|
||||||
use kube::{api::DynamicObject, runtime::conditions};
|
use kube::{api::DynamicObject, runtime::conditions};
|
||||||
@@ -25,12 +15,11 @@ use kube::{
|
|||||||
api::{ApiResource, GroupVersionKind},
|
api::{ApiResource, GroupVersionKind},
|
||||||
runtime::wait::await_condition,
|
runtime::wait::await_condition,
|
||||||
};
|
};
|
||||||
use log::{debug, error, trace, warn};
|
use log::{debug, error, trace};
|
||||||
use serde::{Serialize, de::DeserializeOwned};
|
use serde::{Serialize, de::DeserializeOwned};
|
||||||
use serde_json::json;
|
use serde_json::{Value, json};
|
||||||
use similar::TextDiff;
|
use similar::TextDiff;
|
||||||
use tokio::{io::AsyncReadExt, time::sleep};
|
use tokio::io::AsyncReadExt;
|
||||||
use url::Url;
|
|
||||||
|
|
||||||
#[derive(new, Clone)]
|
#[derive(new, Clone)]
|
||||||
pub struct K8sClient {
|
pub struct K8sClient {
|
||||||
@@ -64,22 +53,6 @@ impl K8sClient {
|
|||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn service_account_api(&self, namespace: &str) -> Api<ServiceAccount> {
|
|
||||||
let api: Api<ServiceAccount> = Api::namespaced(self.client.clone(), namespace);
|
|
||||||
api
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn get_apiserver_version(&self) -> Result<Info, Error> {
|
|
||||||
let client: Client = self.client.clone();
|
|
||||||
let version_info: Info = client.apiserver_version().await?;
|
|
||||||
Ok(version_info)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn discovery(&self) -> Result<Discovery, Error> {
|
|
||||||
let discovery: Discovery = Discovery::new(self.client.clone()).run().await?;
|
|
||||||
Ok(discovery)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn get_resource_json_value(
|
pub async fn get_resource_json_value(
|
||||||
&self,
|
&self,
|
||||||
name: &str,
|
name: &str,
|
||||||
@@ -92,8 +65,7 @@ impl K8sClient {
|
|||||||
} else {
|
} else {
|
||||||
Api::default_namespaced_with(self.client.clone(), &gvk)
|
Api::default_namespaced_with(self.client.clone(), &gvk)
|
||||||
};
|
};
|
||||||
|
Ok(resource.get(name).await?)
|
||||||
resource.get(name).await
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn get_deployment(
|
pub async fn get_deployment(
|
||||||
@@ -102,15 +74,11 @@ impl K8sClient {
|
|||||||
namespace: Option<&str>,
|
namespace: Option<&str>,
|
||||||
) -> Result<Option<Deployment>, Error> {
|
) -> Result<Option<Deployment>, Error> {
|
||||||
let deps: Api<Deployment> = if let Some(ns) = namespace {
|
let deps: Api<Deployment> = if let Some(ns) = namespace {
|
||||||
debug!("getting namespaced deployment");
|
|
||||||
Api::namespaced(self.client.clone(), ns)
|
Api::namespaced(self.client.clone(), ns)
|
||||||
} else {
|
} else {
|
||||||
debug!("getting default namespace deployment");
|
|
||||||
Api::default_namespaced(self.client.clone())
|
Api::default_namespaced(self.client.clone())
|
||||||
};
|
};
|
||||||
|
Ok(deps.get_opt(name).await?)
|
||||||
debug!("getting deployment {} in ns {}", name, namespace.unwrap());
|
|
||||||
deps.get_opt(name).await
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn get_pod(&self, name: &str, namespace: Option<&str>) -> Result<Option<Pod>, Error> {
|
pub async fn get_pod(&self, name: &str, namespace: Option<&str>) -> Result<Option<Pod>, Error> {
|
||||||
@@ -119,8 +87,7 @@ impl K8sClient {
|
|||||||
} else {
|
} else {
|
||||||
Api::default_namespaced(self.client.clone())
|
Api::default_namespaced(self.client.clone())
|
||||||
};
|
};
|
||||||
|
Ok(pods.get_opt(name).await?)
|
||||||
pods.get_opt(name).await
|
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn scale_deployment(
|
pub async fn scale_deployment(
|
||||||
@@ -141,7 +108,7 @@ impl K8sClient {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
let pp = PatchParams::default();
|
let pp = PatchParams::default();
|
||||||
let scale = Patch::Merge(&patch);
|
let scale = Patch::Apply(&patch);
|
||||||
deployments.patch_scale(name, &pp, &scale).await?;
|
deployments.patch_scale(name, &pp, &scale).await?;
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
@@ -163,9 +130,9 @@ impl K8sClient {
|
|||||||
|
|
||||||
pub async fn wait_until_deployment_ready(
|
pub async fn wait_until_deployment_ready(
|
||||||
&self,
|
&self,
|
||||||
name: &str,
|
name: String,
|
||||||
namespace: Option<&str>,
|
namespace: Option<&str>,
|
||||||
timeout: Option<Duration>,
|
timeout: Option<u64>,
|
||||||
) -> Result<(), String> {
|
) -> Result<(), String> {
|
||||||
let api: Api<Deployment>;
|
let api: Api<Deployment>;
|
||||||
|
|
||||||
@@ -175,9 +142,9 @@ impl K8sClient {
|
|||||||
api = Api::default_namespaced(self.client.clone());
|
api = Api::default_namespaced(self.client.clone());
|
||||||
}
|
}
|
||||||
|
|
||||||
let establish = await_condition(api, name, conditions::is_deployment_completed());
|
let establish = await_condition(api, name.as_str(), conditions::is_deployment_completed());
|
||||||
let timeout = timeout.unwrap_or(Duration::from_secs(120));
|
let t = timeout.unwrap_or(300);
|
||||||
let res = tokio::time::timeout(timeout, establish).await;
|
let res = tokio::time::timeout(std::time::Duration::from_secs(t), establish).await;
|
||||||
|
|
||||||
if res.is_ok() {
|
if res.is_ok() {
|
||||||
Ok(())
|
Ok(())
|
||||||
@@ -186,41 +153,6 @@ impl K8sClient {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn wait_for_pod_ready(
|
|
||||||
&self,
|
|
||||||
pod_name: &str,
|
|
||||||
namespace: Option<&str>,
|
|
||||||
) -> Result<(), Error> {
|
|
||||||
let mut elapsed = 0;
|
|
||||||
let interval = 5; // seconds between checks
|
|
||||||
let timeout_secs = 120;
|
|
||||||
loop {
|
|
||||||
let pod = self.get_pod(pod_name, namespace).await?;
|
|
||||||
|
|
||||||
if let Some(p) = pod {
|
|
||||||
if let Some(status) = p.status {
|
|
||||||
if let Some(phase) = status.phase {
|
|
||||||
if phase.to_lowercase() == "running" {
|
|
||||||
return Ok(());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if elapsed >= timeout_secs {
|
|
||||||
return Err(Error::Discovery(DiscoveryError::MissingResource(format!(
|
|
||||||
"'{}' in ns '{}' did not become ready within {}s",
|
|
||||||
pod_name,
|
|
||||||
namespace.unwrap(),
|
|
||||||
timeout_secs
|
|
||||||
))));
|
|
||||||
}
|
|
||||||
|
|
||||||
sleep(Duration::from_secs(interval)).await;
|
|
||||||
elapsed += interval;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Will execute a commond in the first pod found that matches the specified label
|
/// Will execute a commond in the first pod found that matches the specified label
|
||||||
/// '{label}={name}'
|
/// '{label}={name}'
|
||||||
pub async fn exec_app_capture_output(
|
pub async fn exec_app_capture_output(
|
||||||
@@ -267,7 +199,7 @@ impl K8sClient {
|
|||||||
|
|
||||||
if let Some(s) = status.status {
|
if let Some(s) = status.status {
|
||||||
let mut stdout_buf = String::new();
|
let mut stdout_buf = String::new();
|
||||||
if let Some(mut stdout) = process.stdout() {
|
if let Some(mut stdout) = process.stdout().take() {
|
||||||
stdout
|
stdout
|
||||||
.read_to_string(&mut stdout_buf)
|
.read_to_string(&mut stdout_buf)
|
||||||
.await
|
.await
|
||||||
@@ -373,14 +305,14 @@ impl K8sClient {
|
|||||||
Ok(current) => {
|
Ok(current) => {
|
||||||
trace!("Received current value {current:#?}");
|
trace!("Received current value {current:#?}");
|
||||||
// The resource exists, so we calculate and display a diff.
|
// The resource exists, so we calculate and display a diff.
|
||||||
println!("\nPerforming dry-run for resource: '{name}'");
|
println!("\nPerforming dry-run for resource: '{}'", name);
|
||||||
let mut current_yaml = serde_yaml::to_value(¤t).unwrap_or_else(|_| {
|
let mut current_yaml = serde_yaml::to_value(¤t).unwrap_or_else(|_| {
|
||||||
panic!("Could not serialize current value : {current:#?}")
|
panic!("Could not serialize current value : {current:#?}")
|
||||||
});
|
});
|
||||||
if current_yaml.is_mapping() && current_yaml.get("status").is_some() {
|
if current_yaml.is_mapping() && current_yaml.get("status").is_some() {
|
||||||
let map = current_yaml.as_mapping_mut().unwrap();
|
let map = current_yaml.as_mapping_mut().unwrap();
|
||||||
let removed = map.remove_entry("status");
|
let removed = map.remove_entry("status");
|
||||||
trace!("Removed status {removed:?}");
|
trace!("Removed status {:?}", removed);
|
||||||
} else {
|
} else {
|
||||||
trace!(
|
trace!(
|
||||||
"Did not find status entry for current object {}/{}",
|
"Did not find status entry for current object {}/{}",
|
||||||
@@ -409,14 +341,14 @@ impl K8sClient {
|
|||||||
similar::ChangeTag::Insert => "+",
|
similar::ChangeTag::Insert => "+",
|
||||||
similar::ChangeTag::Equal => " ",
|
similar::ChangeTag::Equal => " ",
|
||||||
};
|
};
|
||||||
print!("{sign}{change}");
|
print!("{}{}", sign, change);
|
||||||
}
|
}
|
||||||
// In a dry run, we return the new resource state that would have been applied.
|
// In a dry run, we return the new resource state that would have been applied.
|
||||||
Ok(resource.clone())
|
Ok(resource.clone())
|
||||||
}
|
}
|
||||||
Err(Error::Api(ErrorResponse { code: 404, .. })) => {
|
Err(Error::Api(ErrorResponse { code: 404, .. })) => {
|
||||||
// The resource does not exist, so the "diff" is the entire new resource.
|
// The resource does not exist, so the "diff" is the entire new resource.
|
||||||
println!("\nPerforming dry-run for new resource: '{name}'");
|
println!("\nPerforming dry-run for new resource: '{}'", name);
|
||||||
println!(
|
println!(
|
||||||
"Resource does not exist. It would be created with the following content:"
|
"Resource does not exist. It would be created with the following content:"
|
||||||
);
|
);
|
||||||
@@ -425,14 +357,14 @@ impl K8sClient {
|
|||||||
|
|
||||||
// Print each line of the new resource with a '+' prefix.
|
// Print each line of the new resource with a '+' prefix.
|
||||||
for line in new_yaml.lines() {
|
for line in new_yaml.lines() {
|
||||||
println!("+{line}");
|
println!("+{}", line);
|
||||||
}
|
}
|
||||||
// In a dry run, we return the new resource state that would have been created.
|
// In a dry run, we return the new resource state that would have been created.
|
||||||
Ok(resource.clone())
|
Ok(resource.clone())
|
||||||
}
|
}
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
// Another API error occurred.
|
// Another API error occurred.
|
||||||
error!("Failed to get resource '{name}': {e}");
|
error!("Failed to get resource '{}': {}", name, e);
|
||||||
Err(e)
|
Err(e)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -447,7 +379,7 @@ impl K8sClient {
|
|||||||
where
|
where
|
||||||
K: Resource + Clone + std::fmt::Debug + DeserializeOwned + serde::Serialize,
|
K: Resource + Clone + std::fmt::Debug + DeserializeOwned + serde::Serialize,
|
||||||
<K as Resource>::Scope: ApplyStrategy<K>,
|
<K as Resource>::Scope: ApplyStrategy<K>,
|
||||||
<K as Resource>::DynamicType: Default,
|
<K as kube::Resource>::DynamicType: Default,
|
||||||
{
|
{
|
||||||
let mut result = Vec::new();
|
let mut result = Vec::new();
|
||||||
for r in resource.iter() {
|
for r in resource.iter() {
|
||||||
@@ -487,12 +419,9 @@ impl K8sClient {
|
|||||||
.as_str()
|
.as_str()
|
||||||
.expect("couldn't get kind as str");
|
.expect("couldn't get kind as str");
|
||||||
|
|
||||||
let mut it = api_version.splitn(2, '/');
|
let split: Vec<&str> = api_version.splitn(2, "/").collect();
|
||||||
let first = it.next().unwrap();
|
let g = split[0];
|
||||||
let (g, v) = match it.next() {
|
let v = split[1];
|
||||||
Some(second) => (first, second),
|
|
||||||
None => ("", first),
|
|
||||||
};
|
|
||||||
|
|
||||||
let gvk = GroupVersionKind::gvk(g, v, kind);
|
let gvk = GroupVersionKind::gvk(g, v, kind);
|
||||||
let api_resource = ApiResource::from_gvk(&gvk);
|
let api_resource = ApiResource::from_gvk(&gvk);
|
||||||
@@ -512,7 +441,10 @@ impl K8sClient {
|
|||||||
|
|
||||||
// 6. Apply the object to the cluster using Server-Side Apply.
|
// 6. Apply the object to the cluster using Server-Side Apply.
|
||||||
// This will create the resource if it doesn't exist, or update it if it does.
|
// This will create the resource if it doesn't exist, or update it if it does.
|
||||||
println!("Applying '{name}' in namespace '{namespace}'...",);
|
println!(
|
||||||
|
"Applying Argo Application '{}' in namespace '{}'...",
|
||||||
|
name, namespace
|
||||||
|
);
|
||||||
let patch_params = PatchParams::apply("harmony"); // Use a unique field manager name
|
let patch_params = PatchParams::apply("harmony"); // Use a unique field manager name
|
||||||
let result = api.patch(name, &patch_params, &Patch::Apply(&obj)).await?;
|
let result = api.patch(name, &patch_params, &Patch::Apply(&obj)).await?;
|
||||||
|
|
||||||
@@ -521,103 +453,7 @@ impl K8sClient {
|
|||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
/// Apply a resource from a URL
|
pub(crate) async fn from_kubeconfig(path: &str) -> Option<K8sClient> {
|
||||||
///
|
|
||||||
/// It is the equivalent of `kubectl apply -f <url>`
|
|
||||||
pub async fn apply_url(&self, url: Url, ns: Option<&str>) -> Result<(), Error> {
|
|
||||||
let patch_params = PatchParams::apply("harmony");
|
|
||||||
let discovery = kube::Discovery::new(self.client.clone()).run().await?;
|
|
||||||
|
|
||||||
let yaml = reqwest::get(url)
|
|
||||||
.await
|
|
||||||
.expect("Could not get URL")
|
|
||||||
.text()
|
|
||||||
.await
|
|
||||||
.expect("Could not get content from URL");
|
|
||||||
|
|
||||||
for doc in multidoc_deserialize(&yaml).expect("failed to parse YAML from file") {
|
|
||||||
let obj: DynamicObject =
|
|
||||||
serde_yaml::from_value(doc).expect("cannot apply without valid YAML");
|
|
||||||
let namespace = obj.metadata.namespace.as_deref().or(ns);
|
|
||||||
let type_meta = obj
|
|
||||||
.types
|
|
||||||
.as_ref()
|
|
||||||
.expect("cannot apply object without valid TypeMeta");
|
|
||||||
let gvk = GroupVersionKind::try_from(type_meta)
|
|
||||||
.expect("cannot apply object without valid GroupVersionKind");
|
|
||||||
let name = obj.name_any();
|
|
||||||
|
|
||||||
if let Some((ar, caps)) = discovery.resolve_gvk(&gvk) {
|
|
||||||
let api = get_dynamic_api(ar, caps, self.client.clone(), namespace, false);
|
|
||||||
trace!(
|
|
||||||
"Applying {}: \n{}",
|
|
||||||
gvk.kind,
|
|
||||||
serde_yaml::to_string(&obj).expect("Failed to serialize YAML")
|
|
||||||
);
|
|
||||||
let data: serde_json::Value =
|
|
||||||
serde_json::to_value(&obj).expect("Failed to serialize JSON");
|
|
||||||
let _r = api.patch(&name, &patch_params, &Patch::Apply(data)).await?;
|
|
||||||
debug!("applied {} {}", gvk.kind, name);
|
|
||||||
} else {
|
|
||||||
warn!("Cannot apply document for unknown {gvk:?}");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Gets a single named resource of a specific type `K`.
|
|
||||||
///
|
|
||||||
/// This function uses the `ApplyStrategy` trait to correctly determine
|
|
||||||
/// whether to look in a specific namespace or in the entire cluster.
|
|
||||||
///
|
|
||||||
/// Returns `Ok(None)` if the resource is not found (404).
|
|
||||||
pub async fn get_resource<K>(
|
|
||||||
&self,
|
|
||||||
name: &str,
|
|
||||||
namespace: Option<&str>,
|
|
||||||
) -> Result<Option<K>, Error>
|
|
||||||
where
|
|
||||||
K: Resource + Clone + std::fmt::Debug + DeserializeOwned,
|
|
||||||
<K as Resource>::Scope: ApplyStrategy<K>,
|
|
||||||
<K as kube::Resource>::DynamicType: Default,
|
|
||||||
{
|
|
||||||
let api: Api<K> =
|
|
||||||
<<K as Resource>::Scope as ApplyStrategy<K>>::get_api(&self.client, namespace);
|
|
||||||
|
|
||||||
api.get_opt(name).await
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Lists all resources of a specific type `K`.
|
|
||||||
///
|
|
||||||
/// This function uses the `ApplyStrategy` trait to correctly determine
|
|
||||||
/// whether to list from a specific namespace or from the entire cluster.
|
|
||||||
pub async fn list_resources<K>(
|
|
||||||
&self,
|
|
||||||
namespace: Option<&str>,
|
|
||||||
list_params: Option<ListParams>,
|
|
||||||
) -> Result<ObjectList<K>, Error>
|
|
||||||
where
|
|
||||||
K: Resource + Clone + std::fmt::Debug + DeserializeOwned,
|
|
||||||
<K as Resource>::Scope: ApplyStrategy<K>,
|
|
||||||
<K as kube::Resource>::DynamicType: Default,
|
|
||||||
{
|
|
||||||
let api: Api<K> =
|
|
||||||
<<K as Resource>::Scope as ApplyStrategy<K>>::get_api(&self.client, namespace);
|
|
||||||
|
|
||||||
let list_params = list_params.unwrap_or_default();
|
|
||||||
api.list(&list_params).await
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Fetches a list of all Nodes in the cluster.
|
|
||||||
pub async fn get_nodes(
|
|
||||||
&self,
|
|
||||||
list_params: Option<ListParams>,
|
|
||||||
) -> Result<ObjectList<Node>, Error> {
|
|
||||||
self.list_resources(None, list_params).await
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn from_kubeconfig(path: &str) -> Option<K8sClient> {
|
|
||||||
let k = match Kubeconfig::read_from(path) {
|
let k = match Kubeconfig::read_from(path) {
|
||||||
Ok(k) => k,
|
Ok(k) => k,
|
||||||
Err(e) => {
|
Err(e) => {
|
||||||
@@ -636,31 +472,6 @@ impl K8sClient {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fn get_dynamic_api(
|
|
||||||
resource: ApiResource,
|
|
||||||
capabilities: ApiCapabilities,
|
|
||||||
client: Client,
|
|
||||||
ns: Option<&str>,
|
|
||||||
all: bool,
|
|
||||||
) -> Api<DynamicObject> {
|
|
||||||
if capabilities.scope == Scope::Cluster || all {
|
|
||||||
Api::all_with(client, &resource)
|
|
||||||
} else if let Some(namespace) = ns {
|
|
||||||
Api::namespaced_with(client, namespace, &resource)
|
|
||||||
} else {
|
|
||||||
Api::default_namespaced_with(client, &resource)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn multidoc_deserialize(data: &str) -> Result<Vec<serde_yaml::Value>, serde_yaml::Error> {
|
|
||||||
use serde::Deserialize;
|
|
||||||
let mut docs = vec![];
|
|
||||||
for de in serde_yaml::Deserializer::from_str(data) {
|
|
||||||
docs.push(serde_yaml::Value::deserialize(de)?);
|
|
||||||
}
|
|
||||||
Ok(docs)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub trait ApplyStrategy<K: Resource> {
|
pub trait ApplyStrategy<K: Resource> {
|
||||||
fn get_api(client: &Client, ns: Option<&str>) -> Api<K>;
|
fn get_api(client: &Client, ns: Option<&str>) -> Api<K>;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,12 +1,7 @@
|
|||||||
use std::{collections::BTreeMap, process::Command, sync::Arc, time::Duration};
|
use std::{process::Command, sync::Arc};
|
||||||
|
|
||||||
use async_trait::async_trait;
|
use async_trait::async_trait;
|
||||||
use base64::{Engine, engine::general_purpose};
|
use kube::api::GroupVersionKind;
|
||||||
use k8s_openapi::api::{
|
|
||||||
core::v1::Secret,
|
|
||||||
rbac::v1::{ClusterRoleBinding, RoleRef, Subject},
|
|
||||||
};
|
|
||||||
use kube::api::{DynamicObject, GroupVersionKind, ObjectMeta};
|
|
||||||
use log::{debug, info, warn};
|
use log::{debug, info, warn};
|
||||||
use serde::Serialize;
|
use serde::Serialize;
|
||||||
use tokio::sync::OnceCell;
|
use tokio::sync::OnceCell;
|
||||||
@@ -17,26 +12,14 @@ use crate::{
|
|||||||
inventory::Inventory,
|
inventory::Inventory,
|
||||||
modules::{
|
modules::{
|
||||||
k3d::K3DInstallationScore,
|
k3d::K3DInstallationScore,
|
||||||
k8s::ingress::{K8sIngressScore, PathType},
|
monitoring::kube_prometheus::crd::{
|
||||||
monitoring::{
|
crd_alertmanager_config::CRDPrometheus,
|
||||||
grafana::{grafana::Grafana, helm::helm_grafana::grafana_helm_chart_score},
|
prometheus_operator::prometheus_operator_helm_chart_score,
|
||||||
kube_prometheus::crd::{
|
rhob_alertmanager_config::RHOBObservability,
|
||||||
crd_alertmanager_config::CRDPrometheus,
|
|
||||||
crd_grafana::{
|
|
||||||
Grafana as GrafanaCRD, GrafanaCom, GrafanaDashboard,
|
|
||||||
GrafanaDashboardDatasource, GrafanaDashboardSpec, GrafanaDatasource,
|
|
||||||
GrafanaDatasourceConfig, GrafanaDatasourceJsonData,
|
|
||||||
GrafanaDatasourceSecureJsonData, GrafanaDatasourceSpec, GrafanaSpec,
|
|
||||||
},
|
|
||||||
crd_prometheuses::LabelSelector,
|
|
||||||
prometheus_operator::prometheus_operator_helm_chart_score,
|
|
||||||
rhob_alertmanager_config::RHOBObservability,
|
|
||||||
service_monitor::ServiceMonitor,
|
|
||||||
},
|
|
||||||
},
|
},
|
||||||
prometheus::{
|
prometheus::{
|
||||||
k8s_prometheus_alerting_score::K8sPrometheusCRDAlertingScore,
|
k8s_prometheus_alerting_score::K8sPrometheusCRDAlertingScore,
|
||||||
prometheus::PrometheusMonitoring, rhob_alerting_score::RHOBAlertingScore,
|
prometheus::PrometheusApplicationMonitoring, rhob_alerting_score::RHOBAlertingScore,
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
score::Score,
|
score::Score,
|
||||||
@@ -64,13 +47,6 @@ struct K8sState {
|
|||||||
message: String,
|
message: String,
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
|
||||||
pub enum KubernetesDistribution {
|
|
||||||
OpenshiftFamily,
|
|
||||||
K3sFamily,
|
|
||||||
Default,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
#[derive(Debug, Clone)]
|
||||||
enum K8sSource {
|
enum K8sSource {
|
||||||
LocalK3d,
|
LocalK3d,
|
||||||
@@ -81,7 +57,6 @@ enum K8sSource {
|
|||||||
pub struct K8sAnywhereTopology {
|
pub struct K8sAnywhereTopology {
|
||||||
k8s_state: Arc<OnceCell<Option<K8sState>>>,
|
k8s_state: Arc<OnceCell<Option<K8sState>>>,
|
||||||
tenant_manager: Arc<OnceCell<K8sTenantManager>>,
|
tenant_manager: Arc<OnceCell<K8sTenantManager>>,
|
||||||
k8s_distribution: Arc<OnceCell<KubernetesDistribution>>,
|
|
||||||
config: Arc<K8sAnywhereConfig>,
|
config: Arc<K8sAnywhereConfig>,
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -103,172 +78,41 @@ impl K8sclient for K8sAnywhereTopology {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[async_trait]
|
#[async_trait]
|
||||||
impl Grafana for K8sAnywhereTopology {
|
impl PrometheusApplicationMonitoring<CRDPrometheus> for K8sAnywhereTopology {
|
||||||
async fn ensure_grafana_operator(
|
|
||||||
&self,
|
|
||||||
inventory: &Inventory,
|
|
||||||
) -> Result<PreparationOutcome, PreparationError> {
|
|
||||||
debug!("ensure grafana operator");
|
|
||||||
let client = self.k8s_client().await.unwrap();
|
|
||||||
let grafana_gvk = GroupVersionKind {
|
|
||||||
group: "grafana.integreatly.org".to_string(),
|
|
||||||
version: "v1beta1".to_string(),
|
|
||||||
kind: "Grafana".to_string(),
|
|
||||||
};
|
|
||||||
let name = "grafanas.grafana.integreatly.org";
|
|
||||||
let ns = "grafana";
|
|
||||||
|
|
||||||
let grafana_crd = client
|
|
||||||
.get_resource_json_value(name, Some(ns), &grafana_gvk)
|
|
||||||
.await;
|
|
||||||
match grafana_crd {
|
|
||||||
Ok(_) => {
|
|
||||||
return Ok(PreparationOutcome::Success {
|
|
||||||
details: "Found grafana CRDs in cluster".to_string(),
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
Err(_) => {
|
|
||||||
return self
|
|
||||||
.install_grafana_operator(inventory, Some("grafana"))
|
|
||||||
.await;
|
|
||||||
}
|
|
||||||
};
|
|
||||||
}
|
|
||||||
async fn install_grafana(&self) -> Result<PreparationOutcome, PreparationError> {
|
|
||||||
let ns = "grafana";
|
|
||||||
|
|
||||||
let mut label = BTreeMap::new();
|
|
||||||
|
|
||||||
label.insert("dashboards".to_string(), "grafana".to_string());
|
|
||||||
|
|
||||||
let label_selector = LabelSelector {
|
|
||||||
match_labels: label.clone(),
|
|
||||||
match_expressions: vec![],
|
|
||||||
};
|
|
||||||
|
|
||||||
let client = self.k8s_client().await?;
|
|
||||||
|
|
||||||
let grafana = self.build_grafana(ns, &label);
|
|
||||||
|
|
||||||
client.apply(&grafana, Some(ns)).await?;
|
|
||||||
//TODO change this to a ensure ready or something better than just a timeout
|
|
||||||
client
|
|
||||||
.wait_until_deployment_ready(
|
|
||||||
"grafana-grafana-deployment",
|
|
||||||
Some("grafana"),
|
|
||||||
Some(Duration::from_secs(30)),
|
|
||||||
)
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
let sa_name = "grafana-grafana-sa";
|
|
||||||
let token_secret_name = "grafana-sa-token-secret";
|
|
||||||
|
|
||||||
let sa_token_secret = self.build_sa_token_secret(token_secret_name, sa_name, ns);
|
|
||||||
|
|
||||||
client.apply(&sa_token_secret, Some(ns)).await?;
|
|
||||||
let secret_gvk = GroupVersionKind {
|
|
||||||
group: "".to_string(),
|
|
||||||
version: "v1".to_string(),
|
|
||||||
kind: "Secret".to_string(),
|
|
||||||
};
|
|
||||||
|
|
||||||
let secret = client
|
|
||||||
.get_resource_json_value(token_secret_name, Some(ns), &secret_gvk)
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
let token = format!(
|
|
||||||
"Bearer {}",
|
|
||||||
self.extract_and_normalize_token(&secret).unwrap()
|
|
||||||
);
|
|
||||||
|
|
||||||
debug!("creating grafana clusterrole binding");
|
|
||||||
|
|
||||||
let clusterrolebinding =
|
|
||||||
self.build_cluster_rolebinding(sa_name, "cluster-monitoring-view", ns);
|
|
||||||
|
|
||||||
client.apply(&clusterrolebinding, Some(ns)).await?;
|
|
||||||
|
|
||||||
debug!("creating grafana datasource crd");
|
|
||||||
|
|
||||||
let thanos_url = format!(
|
|
||||||
"https://{}",
|
|
||||||
self.get_domain("thanos-querier-openshift-monitoring")
|
|
||||||
.await
|
|
||||||
.unwrap()
|
|
||||||
);
|
|
||||||
|
|
||||||
let thanos_openshift_datasource = self.build_grafana_datasource(
|
|
||||||
"thanos-openshift-monitoring",
|
|
||||||
ns,
|
|
||||||
&label_selector,
|
|
||||||
&thanos_url,
|
|
||||||
&token,
|
|
||||||
);
|
|
||||||
|
|
||||||
client.apply(&thanos_openshift_datasource, Some(ns)).await?;
|
|
||||||
|
|
||||||
debug!("creating grafana dashboard crd");
|
|
||||||
let dashboard = self.build_grafana_dashboard(ns, &label_selector);
|
|
||||||
|
|
||||||
client.apply(&dashboard, Some(ns)).await?;
|
|
||||||
debug!("creating grafana ingress");
|
|
||||||
let grafana_ingress = self.build_grafana_ingress(ns).await;
|
|
||||||
|
|
||||||
grafana_ingress
|
|
||||||
.interpret(&Inventory::empty(), self)
|
|
||||||
.await
|
|
||||||
.map_err(|e| PreparationError::new(e.to_string()))?;
|
|
||||||
|
|
||||||
Ok(PreparationOutcome::Success {
|
|
||||||
details: "Installed grafana composants".to_string(),
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[async_trait]
|
|
||||||
impl PrometheusMonitoring<CRDPrometheus> for K8sAnywhereTopology {
|
|
||||||
async fn install_prometheus(
|
async fn install_prometheus(
|
||||||
&self,
|
&self,
|
||||||
sender: &CRDPrometheus,
|
sender: &CRDPrometheus,
|
||||||
_inventory: &Inventory,
|
inventory: &Inventory,
|
||||||
_receivers: Option<Vec<Box<dyn AlertReceiver<CRDPrometheus>>>>,
|
receivers: Option<Vec<Box<dyn AlertReceiver<CRDPrometheus>>>>,
|
||||||
) -> Result<PreparationOutcome, PreparationError> {
|
|
||||||
let client = self.k8s_client().await?;
|
|
||||||
|
|
||||||
for monitor in sender.service_monitor.iter() {
|
|
||||||
client
|
|
||||||
.apply(monitor, Some(&sender.namespace))
|
|
||||||
.await
|
|
||||||
.map_err(|e| PreparationError::new(e.to_string()))?;
|
|
||||||
}
|
|
||||||
Ok(PreparationOutcome::Success {
|
|
||||||
details: "successfuly installed prometheus components".to_string(),
|
|
||||||
})
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn ensure_prometheus_operator(
|
|
||||||
&self,
|
|
||||||
sender: &CRDPrometheus,
|
|
||||||
_inventory: &Inventory,
|
|
||||||
) -> Result<PreparationOutcome, PreparationError> {
|
) -> Result<PreparationOutcome, PreparationError> {
|
||||||
let po_result = self.ensure_prometheus_operator(sender).await?;
|
let po_result = self.ensure_prometheus_operator(sender).await?;
|
||||||
|
|
||||||
match po_result {
|
if po_result == PreparationOutcome::Noop {
|
||||||
PreparationOutcome::Success { details: _ } => {
|
debug!("Skipping Prometheus CR installation due to missing operator.");
|
||||||
debug!("Detected prometheus crds operator present in cluster.");
|
return Ok(po_result);
|
||||||
return Ok(po_result);
|
}
|
||||||
}
|
|
||||||
PreparationOutcome::Noop => {
|
let result = self
|
||||||
debug!("Skipping Prometheus CR installation due to missing operator.");
|
.get_k8s_prometheus_application_score(sender.clone(), receivers)
|
||||||
return Ok(po_result);
|
.await
|
||||||
}
|
.interpret(inventory, self)
|
||||||
|
.await;
|
||||||
|
|
||||||
|
match result {
|
||||||
|
Ok(outcome) => match outcome.status {
|
||||||
|
InterpretStatus::SUCCESS => Ok(PreparationOutcome::Success {
|
||||||
|
details: outcome.message,
|
||||||
|
}),
|
||||||
|
InterpretStatus::NOOP => Ok(PreparationOutcome::Noop),
|
||||||
|
_ => Err(PreparationError::new(outcome.message)),
|
||||||
|
},
|
||||||
|
Err(err) => Err(PreparationError::new(err.to_string())),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[async_trait]
|
#[async_trait]
|
||||||
impl PrometheusMonitoring<RHOBObservability> for K8sAnywhereTopology {
|
impl PrometheusApplicationMonitoring<RHOBObservability> for K8sAnywhereTopology {
|
||||||
async fn install_prometheus(
|
async fn install_prometheus(
|
||||||
&self,
|
&self,
|
||||||
sender: &RHOBObservability,
|
sender: &RHOBObservability,
|
||||||
@@ -302,14 +146,6 @@ impl PrometheusMonitoring<RHOBObservability> for K8sAnywhereTopology {
|
|||||||
Err(err) => Err(PreparationError::new(err.to_string())),
|
Err(err) => Err(PreparationError::new(err.to_string())),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn ensure_prometheus_operator(
|
|
||||||
&self,
|
|
||||||
sender: &RHOBObservability,
|
|
||||||
inventory: &Inventory,
|
|
||||||
) -> Result<PreparationOutcome, PreparationError> {
|
|
||||||
todo!()
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Serialize for K8sAnywhereTopology {
|
impl Serialize for K8sAnywhereTopology {
|
||||||
@@ -326,7 +162,6 @@ impl K8sAnywhereTopology {
|
|||||||
Self {
|
Self {
|
||||||
k8s_state: Arc::new(OnceCell::new()),
|
k8s_state: Arc::new(OnceCell::new()),
|
||||||
tenant_manager: Arc::new(OnceCell::new()),
|
tenant_manager: Arc::new(OnceCell::new()),
|
||||||
k8s_distribution: Arc::new(OnceCell::new()),
|
|
||||||
config: Arc::new(K8sAnywhereConfig::from_env()),
|
config: Arc::new(K8sAnywhereConfig::from_env()),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -335,216 +170,10 @@ impl K8sAnywhereTopology {
|
|||||||
Self {
|
Self {
|
||||||
k8s_state: Arc::new(OnceCell::new()),
|
k8s_state: Arc::new(OnceCell::new()),
|
||||||
tenant_manager: Arc::new(OnceCell::new()),
|
tenant_manager: Arc::new(OnceCell::new()),
|
||||||
k8s_distribution: Arc::new(OnceCell::new()),
|
|
||||||
config: Arc::new(config),
|
config: Arc::new(config),
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
pub async fn get_k8s_distribution(&self) -> Result<&KubernetesDistribution, PreparationError> {
|
|
||||||
self.k8s_distribution
|
|
||||||
.get_or_try_init(async || {
|
|
||||||
let client = self.k8s_client().await.unwrap();
|
|
||||||
|
|
||||||
let discovery = client.discovery().await.map_err(|e| {
|
|
||||||
PreparationError::new(format!("Could not discover API groups: {}", e))
|
|
||||||
})?;
|
|
||||||
|
|
||||||
let version = client.get_apiserver_version().await.map_err(|e| {
|
|
||||||
PreparationError::new(format!("Could not get server version: {}", e))
|
|
||||||
})?;
|
|
||||||
|
|
||||||
// OpenShift / OKD
|
|
||||||
if discovery
|
|
||||||
.groups()
|
|
||||||
.any(|g| g.name() == "project.openshift.io")
|
|
||||||
{
|
|
||||||
return Ok(KubernetesDistribution::OpenshiftFamily);
|
|
||||||
}
|
|
||||||
|
|
||||||
// K3d / K3s
|
|
||||||
if version.git_version.contains("k3s") {
|
|
||||||
return Ok(KubernetesDistribution::K3sFamily);
|
|
||||||
}
|
|
||||||
|
|
||||||
return Ok(KubernetesDistribution::Default);
|
|
||||||
})
|
|
||||||
.await
|
|
||||||
}
|
|
||||||
|
|
||||||
fn extract_and_normalize_token(&self, secret: &DynamicObject) -> Option<String> {
|
|
||||||
let token_b64 = secret
|
|
||||||
.data
|
|
||||||
.get("token")
|
|
||||||
.or_else(|| secret.data.get("data").and_then(|d| d.get("token")))
|
|
||||||
.and_then(|v| v.as_str())?;
|
|
||||||
|
|
||||||
let bytes = general_purpose::STANDARD.decode(token_b64).ok()?;
|
|
||||||
|
|
||||||
let s = String::from_utf8(bytes).ok()?;
|
|
||||||
|
|
||||||
let cleaned = s
|
|
||||||
.trim_matches(|c: char| c.is_whitespace() || c == '\0')
|
|
||||||
.to_string();
|
|
||||||
Some(cleaned)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn build_cluster_rolebinding(
|
|
||||||
&self,
|
|
||||||
service_account_name: &str,
|
|
||||||
clusterrole_name: &str,
|
|
||||||
ns: &str,
|
|
||||||
) -> ClusterRoleBinding {
|
|
||||||
ClusterRoleBinding {
|
|
||||||
metadata: ObjectMeta {
|
|
||||||
name: Some(format!("{}-view-binding", service_account_name)),
|
|
||||||
..Default::default()
|
|
||||||
},
|
|
||||||
role_ref: RoleRef {
|
|
||||||
api_group: "rbac.authorization.k8s.io".into(),
|
|
||||||
kind: "ClusterRole".into(),
|
|
||||||
name: clusterrole_name.into(),
|
|
||||||
},
|
|
||||||
subjects: Some(vec![Subject {
|
|
||||||
kind: "ServiceAccount".into(),
|
|
||||||
name: service_account_name.into(),
|
|
||||||
namespace: Some(ns.into()),
|
|
||||||
..Default::default()
|
|
||||||
}]),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn build_sa_token_secret(
|
|
||||||
&self,
|
|
||||||
secret_name: &str,
|
|
||||||
service_account_name: &str,
|
|
||||||
ns: &str,
|
|
||||||
) -> Secret {
|
|
||||||
let mut annotations = BTreeMap::new();
|
|
||||||
annotations.insert(
|
|
||||||
"kubernetes.io/service-account.name".to_string(),
|
|
||||||
service_account_name.to_string(),
|
|
||||||
);
|
|
||||||
|
|
||||||
Secret {
|
|
||||||
metadata: ObjectMeta {
|
|
||||||
name: Some(secret_name.into()),
|
|
||||||
namespace: Some(ns.into()),
|
|
||||||
annotations: Some(annotations),
|
|
||||||
..Default::default()
|
|
||||||
},
|
|
||||||
type_: Some("kubernetes.io/service-account-token".to_string()),
|
|
||||||
..Default::default()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn build_grafana_datasource(
|
|
||||||
&self,
|
|
||||||
name: &str,
|
|
||||||
ns: &str,
|
|
||||||
label_selector: &LabelSelector,
|
|
||||||
url: &str,
|
|
||||||
token: &str,
|
|
||||||
) -> GrafanaDatasource {
|
|
||||||
let mut json_data = BTreeMap::new();
|
|
||||||
json_data.insert("timeInterval".to_string(), "5s".to_string());
|
|
||||||
|
|
||||||
GrafanaDatasource {
|
|
||||||
metadata: ObjectMeta {
|
|
||||||
name: Some(name.to_string()),
|
|
||||||
namespace: Some(ns.to_string()),
|
|
||||||
..Default::default()
|
|
||||||
},
|
|
||||||
spec: GrafanaDatasourceSpec {
|
|
||||||
instance_selector: label_selector.clone(),
|
|
||||||
allow_cross_namespace_import: Some(true),
|
|
||||||
values_from: None,
|
|
||||||
datasource: GrafanaDatasourceConfig {
|
|
||||||
access: "proxy".to_string(),
|
|
||||||
name: name.to_string(),
|
|
||||||
r#type: "prometheus".to_string(),
|
|
||||||
url: url.to_string(),
|
|
||||||
database: None,
|
|
||||||
json_data: Some(GrafanaDatasourceJsonData {
|
|
||||||
time_interval: Some("60s".to_string()),
|
|
||||||
http_header_name1: Some("Authorization".to_string()),
|
|
||||||
tls_skip_verify: Some(true),
|
|
||||||
oauth_pass_thru: Some(true),
|
|
||||||
}),
|
|
||||||
secure_json_data: Some(GrafanaDatasourceSecureJsonData {
|
|
||||||
http_header_value1: Some(format!("Bearer {token}")),
|
|
||||||
}),
|
|
||||||
is_default: Some(false),
|
|
||||||
editable: Some(true),
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn build_grafana_dashboard(
|
|
||||||
&self,
|
|
||||||
ns: &str,
|
|
||||||
label_selector: &LabelSelector,
|
|
||||||
) -> GrafanaDashboard {
|
|
||||||
let graf_dashboard = GrafanaDashboard {
|
|
||||||
metadata: ObjectMeta {
|
|
||||||
name: Some(format!("grafana-dashboard-{}", ns)),
|
|
||||||
namespace: Some(ns.to_string()),
|
|
||||||
..Default::default()
|
|
||||||
},
|
|
||||||
spec: GrafanaDashboardSpec {
|
|
||||||
resync_period: Some("30s".to_string()),
|
|
||||||
instance_selector: label_selector.clone(),
|
|
||||||
datasources: Some(vec![GrafanaDashboardDatasource {
|
|
||||||
input_name: "DS_PROMETHEUS".to_string(),
|
|
||||||
datasource_name: "thanos-openshift-monitoring".to_string(),
|
|
||||||
}]),
|
|
||||||
json: None,
|
|
||||||
grafana_com: Some(GrafanaCom {
|
|
||||||
id: 17406,
|
|
||||||
revision: None,
|
|
||||||
}),
|
|
||||||
},
|
|
||||||
};
|
|
||||||
graf_dashboard
|
|
||||||
}
|
|
||||||
|
|
||||||
fn build_grafana(&self, ns: &str, labels: &BTreeMap<String, String>) -> GrafanaCRD {
|
|
||||||
let grafana = GrafanaCRD {
|
|
||||||
metadata: ObjectMeta {
|
|
||||||
name: Some(format!("grafana-{}", ns)),
|
|
||||||
namespace: Some(ns.to_string()),
|
|
||||||
labels: Some(labels.clone()),
|
|
||||||
..Default::default()
|
|
||||||
},
|
|
||||||
spec: GrafanaSpec {
|
|
||||||
config: None,
|
|
||||||
admin_user: None,
|
|
||||||
admin_password: None,
|
|
||||||
ingress: None,
|
|
||||||
persistence: None,
|
|
||||||
resources: None,
|
|
||||||
},
|
|
||||||
};
|
|
||||||
grafana
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn build_grafana_ingress(&self, ns: &str) -> K8sIngressScore {
|
|
||||||
let domain = self.get_domain(&format!("grafana-{}", ns)).await.unwrap();
|
|
||||||
let name = format!("{}-grafana", ns);
|
|
||||||
let backend_service = format!("grafana-{}-service", ns);
|
|
||||||
|
|
||||||
K8sIngressScore {
|
|
||||||
name: fqdn::fqdn!(&name),
|
|
||||||
host: fqdn::fqdn!(&domain),
|
|
||||||
backend_service: fqdn::fqdn!(&backend_service),
|
|
||||||
port: 3000,
|
|
||||||
path: Some("/".to_string()),
|
|
||||||
path_type: Some(PathType::Prefix),
|
|
||||||
namespace: Some(fqdn::fqdn!(&ns)),
|
|
||||||
ingress_class_name: Some("openshift-default".to_string()),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn get_cluster_observability_operator_prometheus_application_score(
|
async fn get_cluster_observability_operator_prometheus_application_score(
|
||||||
&self,
|
&self,
|
||||||
sender: RHOBObservability,
|
sender: RHOBObservability,
|
||||||
@@ -562,14 +191,13 @@ impl K8sAnywhereTopology {
|
|||||||
&self,
|
&self,
|
||||||
sender: CRDPrometheus,
|
sender: CRDPrometheus,
|
||||||
receivers: Option<Vec<Box<dyn AlertReceiver<CRDPrometheus>>>>,
|
receivers: Option<Vec<Box<dyn AlertReceiver<CRDPrometheus>>>>,
|
||||||
service_monitors: Option<Vec<ServiceMonitor>>,
|
|
||||||
) -> K8sPrometheusCRDAlertingScore {
|
) -> K8sPrometheusCRDAlertingScore {
|
||||||
return K8sPrometheusCRDAlertingScore {
|
K8sPrometheusCRDAlertingScore {
|
||||||
sender,
|
sender,
|
||||||
receivers: receivers.unwrap_or_default(),
|
receivers: receivers.unwrap_or_default(),
|
||||||
service_monitors: service_monitors.unwrap_or_default(),
|
service_monitors: vec![],
|
||||||
prometheus_rules: vec![],
|
prometheus_rules: vec![],
|
||||||
};
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn openshift_ingress_operator_available(&self) -> Result<(), PreparationError> {
|
async fn openshift_ingress_operator_available(&self) -> Result<(), PreparationError> {
|
||||||
@@ -744,9 +372,7 @@ impl K8sAnywhereTopology {
|
|||||||
if let Some(Some(k8s_state)) = self.k8s_state.get() {
|
if let Some(Some(k8s_state)) = self.k8s_state.get() {
|
||||||
match k8s_state.source {
|
match k8s_state.source {
|
||||||
K8sSource::LocalK3d => {
|
K8sSource::LocalK3d => {
|
||||||
warn!(
|
warn!("Installing observability operator is not supported on LocalK3d source");
|
||||||
"Installing observability operator is not supported on LocalK3d source"
|
|
||||||
);
|
|
||||||
return Ok(PreparationOutcome::Noop);
|
return Ok(PreparationOutcome::Noop);
|
||||||
debug!("installing cluster observability operator");
|
debug!("installing cluster observability operator");
|
||||||
todo!();
|
todo!();
|
||||||
@@ -837,30 +463,6 @@ impl K8sAnywhereTopology {
|
|||||||
details: "prometheus operator present in cluster".into(),
|
details: "prometheus operator present in cluster".into(),
|
||||||
})
|
})
|
||||||
}
|
}
|
||||||
|
|
||||||
async fn install_grafana_operator(
|
|
||||||
&self,
|
|
||||||
inventory: &Inventory,
|
|
||||||
ns: Option<&str>,
|
|
||||||
) -> Result<PreparationOutcome, PreparationError> {
|
|
||||||
let namespace = ns.unwrap_or("grafana");
|
|
||||||
info!("installing grafana operator in ns {namespace}");
|
|
||||||
let tenant = self.get_k8s_tenant_manager()?.get_tenant_config().await;
|
|
||||||
let mut namespace_scope = false;
|
|
||||||
if tenant.is_some() {
|
|
||||||
namespace_scope = true;
|
|
||||||
}
|
|
||||||
let _grafana_operator_score = grafana_helm_chart_score(namespace, namespace_scope)
|
|
||||||
.interpret(inventory, self)
|
|
||||||
.await
|
|
||||||
.map_err(|e| PreparationError::new(e.to_string()));
|
|
||||||
Ok(PreparationOutcome::Success {
|
|
||||||
details: format!(
|
|
||||||
"Successfully installed grafana operator in ns {}",
|
|
||||||
ns.unwrap()
|
|
||||||
),
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Clone, Debug)]
|
#[derive(Clone, Debug)]
|
||||||
|
|||||||
@@ -28,7 +28,13 @@ pub trait LoadBalancer: Send + Sync {
|
|||||||
&self,
|
&self,
|
||||||
service: &LoadBalancerService,
|
service: &LoadBalancerService,
|
||||||
) -> Result<(), ExecutorError> {
|
) -> Result<(), ExecutorError> {
|
||||||
self.add_service(service).await?;
|
debug!(
|
||||||
|
"Listing LoadBalancer services {:?}",
|
||||||
|
self.list_services().await
|
||||||
|
);
|
||||||
|
if !self.list_services().await.contains(service) {
|
||||||
|
self.add_service(service).await?;
|
||||||
|
}
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,10 +1,9 @@
|
|||||||
use async_trait::async_trait;
|
use async_trait::async_trait;
|
||||||
use derive_new::new;
|
use derive_new::new;
|
||||||
use serde::{Deserialize, Serialize};
|
|
||||||
|
|
||||||
use super::{HelmCommand, PreparationError, PreparationOutcome, Topology};
|
use super::{HelmCommand, PreparationError, PreparationOutcome, Topology};
|
||||||
|
|
||||||
#[derive(new, Clone, Debug, Serialize, Deserialize)]
|
#[derive(new)]
|
||||||
pub struct LocalhostTopology;
|
pub struct LocalhostTopology;
|
||||||
|
|
||||||
#[async_trait]
|
#[async_trait]
|
||||||
|
|||||||
@@ -1,18 +1,7 @@
|
|||||||
use std::{
|
use std::{net::Ipv4Addr, str::FromStr, sync::Arc};
|
||||||
error::Error,
|
|
||||||
fmt::{self, Debug},
|
|
||||||
net::Ipv4Addr,
|
|
||||||
str::FromStr,
|
|
||||||
sync::Arc,
|
|
||||||
};
|
|
||||||
|
|
||||||
use async_trait::async_trait;
|
use async_trait::async_trait;
|
||||||
use derive_new::new;
|
use harmony_types::net::{IpAddress, MacAddress};
|
||||||
use harmony_types::{
|
|
||||||
id::Id,
|
|
||||||
net::{IpAddress, MacAddress},
|
|
||||||
switch::PortLocation,
|
|
||||||
};
|
|
||||||
use serde::Serialize;
|
use serde::Serialize;
|
||||||
|
|
||||||
use crate::executors::ExecutorError;
|
use crate::executors::ExecutorError;
|
||||||
@@ -26,8 +15,8 @@ pub struct DHCPStaticEntry {
|
|||||||
pub ip: Ipv4Addr,
|
pub ip: Ipv4Addr,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl fmt::Display for DHCPStaticEntry {
|
impl std::fmt::Display for DHCPStaticEntry {
|
||||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||||
let mac = self
|
let mac = self
|
||||||
.mac
|
.mac
|
||||||
.iter()
|
.iter()
|
||||||
@@ -49,8 +38,8 @@ pub trait Firewall: Send + Sync {
|
|||||||
fn get_host(&self) -> LogicalHost;
|
fn get_host(&self) -> LogicalHost;
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Debug for dyn Firewall {
|
impl std::fmt::Debug for dyn Firewall {
|
||||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||||
f.write_fmt(format_args!("Firewall {}", self.get_ip()))
|
f.write_fmt(format_args!("Firewall {}", self.get_ip()))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -72,7 +61,7 @@ pub struct PxeOptions {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[async_trait]
|
#[async_trait]
|
||||||
pub trait DhcpServer: Send + Sync + Debug {
|
pub trait DhcpServer: Send + Sync + std::fmt::Debug {
|
||||||
async fn add_static_mapping(&self, entry: &DHCPStaticEntry) -> Result<(), ExecutorError>;
|
async fn add_static_mapping(&self, entry: &DHCPStaticEntry) -> Result<(), ExecutorError>;
|
||||||
async fn remove_static_mapping(&self, mac: &MacAddress) -> Result<(), ExecutorError>;
|
async fn remove_static_mapping(&self, mac: &MacAddress) -> Result<(), ExecutorError>;
|
||||||
async fn list_static_mappings(&self) -> Vec<(MacAddress, IpAddress)>;
|
async fn list_static_mappings(&self) -> Vec<(MacAddress, IpAddress)>;
|
||||||
@@ -111,8 +100,8 @@ pub trait DnsServer: Send + Sync {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
impl Debug for dyn DnsServer {
|
impl std::fmt::Debug for dyn DnsServer {
|
||||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||||
f.write_fmt(format_args!("DnsServer {}", self.get_ip()))
|
f.write_fmt(format_args!("DnsServer {}", self.get_ip()))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -148,8 +137,8 @@ pub enum DnsRecordType {
|
|||||||
TXT,
|
TXT,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl fmt::Display for DnsRecordType {
|
impl std::fmt::Display for DnsRecordType {
|
||||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
||||||
match self {
|
match self {
|
||||||
DnsRecordType::A => write!(f, "A"),
|
DnsRecordType::A => write!(f, "A"),
|
||||||
DnsRecordType::AAAA => write!(f, "AAAA"),
|
DnsRecordType::AAAA => write!(f, "AAAA"),
|
||||||
@@ -183,108 +172,6 @@ impl FromStr for DnsRecordType {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[async_trait]
|
|
||||||
pub trait NetworkManager: Debug + Send + Sync {
|
|
||||||
async fn ensure_network_manager_installed(&self) -> Result<(), NetworkError>;
|
|
||||||
async fn configure_bond(&self, config: &HostNetworkConfig) -> Result<(), NetworkError>;
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Clone, new)]
|
|
||||||
pub struct NetworkError {
|
|
||||||
msg: String,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl fmt::Display for NetworkError {
|
|
||||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
|
||||||
f.write_str(&self.msg)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Error for NetworkError {}
|
|
||||||
|
|
||||||
impl From<kube::Error> for NetworkError {
|
|
||||||
fn from(value: kube::Error) -> Self {
|
|
||||||
NetworkError::new(value.to_string())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl From<String> for NetworkError {
|
|
||||||
fn from(value: String) -> Self {
|
|
||||||
NetworkError::new(value)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[async_trait]
|
|
||||||
pub trait Switch: Send + Sync {
|
|
||||||
async fn setup_switch(&self) -> Result<(), SwitchError>;
|
|
||||||
|
|
||||||
async fn get_port_for_mac_address(
|
|
||||||
&self,
|
|
||||||
mac_address: &MacAddress,
|
|
||||||
) -> Result<Option<PortLocation>, SwitchError>;
|
|
||||||
|
|
||||||
async fn configure_port_channel(&self, config: &HostNetworkConfig) -> Result<(), SwitchError>;
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Clone, Debug, PartialEq)]
|
|
||||||
pub struct HostNetworkConfig {
|
|
||||||
pub host_id: Id,
|
|
||||||
pub switch_ports: Vec<SwitchPort>,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Clone, Debug, PartialEq)]
|
|
||||||
pub struct SwitchPort {
|
|
||||||
pub interface: NetworkInterface,
|
|
||||||
pub port: PortLocation,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Clone, Debug, PartialEq)]
|
|
||||||
pub struct NetworkInterface {
|
|
||||||
pub name: String,
|
|
||||||
pub mac_address: MacAddress,
|
|
||||||
pub speed_mbps: Option<u32>,
|
|
||||||
pub mtu: u32,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Clone, new)]
|
|
||||||
pub struct SwitchError {
|
|
||||||
msg: String,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl fmt::Display for SwitchError {
|
|
||||||
fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
|
|
||||||
f.write_str(&self.msg)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Error for SwitchError {}
|
|
||||||
|
|
||||||
#[async_trait]
|
|
||||||
pub trait SwitchClient: Debug + Send + Sync {
|
|
||||||
/// Executes essential, idempotent, one-time initial configuration steps.
|
|
||||||
///
|
|
||||||
/// This is an opiniated procedure that setups a switch to provide high availability
|
|
||||||
/// capabilities as decided by the NationTech team.
|
|
||||||
///
|
|
||||||
/// This includes tasks like enabling switchport for all interfaces
|
|
||||||
/// except the ones intended for Fabric Networking, etc.
|
|
||||||
///
|
|
||||||
/// The implementation must ensure the operation is **idempotent** (safe to run multiple times)
|
|
||||||
/// and that it doesn't break existing configurations.
|
|
||||||
async fn setup(&self) -> Result<(), SwitchError>;
|
|
||||||
|
|
||||||
async fn find_port(
|
|
||||||
&self,
|
|
||||||
mac_address: &MacAddress,
|
|
||||||
) -> Result<Option<PortLocation>, SwitchError>;
|
|
||||||
|
|
||||||
async fn configure_port_channel(
|
|
||||||
&self,
|
|
||||||
channel_name: &str,
|
|
||||||
switch_ports: Vec<PortLocation>,
|
|
||||||
) -> Result<u8, SwitchError>;
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(test)]
|
#[cfg(test)]
|
||||||
mod test {
|
mod test {
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
|
|||||||
@@ -21,7 +21,6 @@ pub struct AlertingInterpret<S: AlertSender> {
|
|||||||
pub sender: S,
|
pub sender: S,
|
||||||
pub receivers: Vec<Box<dyn AlertReceiver<S>>>,
|
pub receivers: Vec<Box<dyn AlertReceiver<S>>>,
|
||||||
pub rules: Vec<Box<dyn AlertRule<S>>>,
|
pub rules: Vec<Box<dyn AlertRule<S>>>,
|
||||||
pub scrape_targets: Option<Vec<Box<dyn ScrapeTarget<S>>>>,
|
|
||||||
}
|
}
|
||||||
|
|
||||||
#[async_trait]
|
#[async_trait]
|
||||||
@@ -31,7 +30,6 @@ impl<S: AlertSender + Installable<T>, T: Topology> Interpret<T> for AlertingInte
|
|||||||
inventory: &Inventory,
|
inventory: &Inventory,
|
||||||
topology: &T,
|
topology: &T,
|
||||||
) -> Result<Outcome, InterpretError> {
|
) -> Result<Outcome, InterpretError> {
|
||||||
debug!("hit sender configure for AlertingInterpret");
|
|
||||||
self.sender.configure(inventory, topology).await?;
|
self.sender.configure(inventory, topology).await?;
|
||||||
for receiver in self.receivers.iter() {
|
for receiver in self.receivers.iter() {
|
||||||
receiver.install(&self.sender).await?;
|
receiver.install(&self.sender).await?;
|
||||||
@@ -40,12 +38,6 @@ impl<S: AlertSender + Installable<T>, T: Topology> Interpret<T> for AlertingInte
|
|||||||
debug!("installing rule: {:#?}", rule);
|
debug!("installing rule: {:#?}", rule);
|
||||||
rule.install(&self.sender).await?;
|
rule.install(&self.sender).await?;
|
||||||
}
|
}
|
||||||
if let Some(targets) = &self.scrape_targets {
|
|
||||||
for target in targets.iter() {
|
|
||||||
debug!("installing scrape_target: {:#?}", target);
|
|
||||||
target.install(&self.sender).await?;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
self.sender.ensure_installed(inventory, topology).await?;
|
self.sender.ensure_installed(inventory, topology).await?;
|
||||||
Ok(Outcome::success(format!(
|
Ok(Outcome::success(format!(
|
||||||
"successfully installed alert sender {}",
|
"successfully installed alert sender {}",
|
||||||
@@ -85,7 +77,6 @@ pub trait AlertRule<S: AlertSender>: std::fmt::Debug + Send + Sync {
|
|||||||
}
|
}
|
||||||
|
|
||||||
#[async_trait]
|
#[async_trait]
|
||||||
pub trait ScrapeTarget<S: AlertSender>: std::fmt::Debug + Send + Sync {
|
pub trait ScrapeTarget<S: AlertSender> {
|
||||||
async fn install(&self, sender: &S) -> Result<Outcome, InterpretError>;
|
async fn install(&self, sender: &S) -> Result<(), InterpretError>;
|
||||||
fn clone_box(&self) -> Box<dyn ScrapeTarget<S>>;
|
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,378 +0,0 @@
|
|||||||
use async_trait::async_trait;
|
|
||||||
use brocade::{BrocadeClient, BrocadeOptions, InterSwitchLink, InterfaceStatus, PortOperatingMode};
|
|
||||||
use harmony_types::{
|
|
||||||
net::{IpAddress, MacAddress},
|
|
||||||
switch::{PortDeclaration, PortLocation},
|
|
||||||
};
|
|
||||||
use option_ext::OptionExt;
|
|
||||||
|
|
||||||
use crate::topology::{SwitchClient, SwitchError};
|
|
||||||
|
|
||||||
#[derive(Debug)]
|
|
||||||
pub struct BrocadeSwitchClient {
|
|
||||||
brocade: Box<dyn BrocadeClient + Send + Sync>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl BrocadeSwitchClient {
|
|
||||||
pub async fn init(
|
|
||||||
ip_addresses: &[IpAddress],
|
|
||||||
username: &str,
|
|
||||||
password: &str,
|
|
||||||
options: Option<BrocadeOptions>,
|
|
||||||
) -> Result<Self, brocade::Error> {
|
|
||||||
let brocade = brocade::init(ip_addresses, 22, username, password, options).await?;
|
|
||||||
Ok(Self { brocade })
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[async_trait]
|
|
||||||
impl SwitchClient for BrocadeSwitchClient {
|
|
||||||
async fn setup(&self) -> Result<(), SwitchError> {
|
|
||||||
let stack_topology = self
|
|
||||||
.brocade
|
|
||||||
.get_stack_topology()
|
|
||||||
.await
|
|
||||||
.map_err(|e| SwitchError::new(e.to_string()))?;
|
|
||||||
|
|
||||||
let interfaces = self
|
|
||||||
.brocade
|
|
||||||
.get_interfaces()
|
|
||||||
.await
|
|
||||||
.map_err(|e| SwitchError::new(e.to_string()))?;
|
|
||||||
|
|
||||||
let interfaces: Vec<(String, PortOperatingMode)> = interfaces
|
|
||||||
.into_iter()
|
|
||||||
.filter(|interface| {
|
|
||||||
interface.operating_mode.is_none() && interface.status == InterfaceStatus::Connected
|
|
||||||
})
|
|
||||||
.filter(|interface| {
|
|
||||||
!stack_topology.iter().any(|link: &InterSwitchLink| {
|
|
||||||
link.local_port == interface.port_location
|
|
||||||
|| link.remote_port.contains(&interface.port_location)
|
|
||||||
})
|
|
||||||
})
|
|
||||||
.map(|interface| (interface.name.clone(), PortOperatingMode::Access))
|
|
||||||
.collect();
|
|
||||||
|
|
||||||
if interfaces.is_empty() {
|
|
||||||
return Ok(());
|
|
||||||
}
|
|
||||||
|
|
||||||
self.brocade
|
|
||||||
.configure_interfaces(interfaces)
|
|
||||||
.await
|
|
||||||
.map_err(|e| SwitchError::new(e.to_string()))?;
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn find_port(
|
|
||||||
&self,
|
|
||||||
mac_address: &MacAddress,
|
|
||||||
) -> Result<Option<PortLocation>, SwitchError> {
|
|
||||||
let table = self
|
|
||||||
.brocade
|
|
||||||
.get_mac_address_table()
|
|
||||||
.await
|
|
||||||
.map_err(|e| SwitchError::new(format!("{e}")))?;
|
|
||||||
|
|
||||||
let port = table
|
|
||||||
.iter()
|
|
||||||
.find(|entry| entry.mac_address == *mac_address)
|
|
||||||
.map(|entry| match &entry.port {
|
|
||||||
PortDeclaration::Single(port_location) => Ok(port_location.clone()),
|
|
||||||
_ => Err(SwitchError::new(
|
|
||||||
"Multiple ports found for MAC address".into(),
|
|
||||||
)),
|
|
||||||
});
|
|
||||||
|
|
||||||
match port {
|
|
||||||
Some(Ok(p)) => Ok(Some(p)),
|
|
||||||
Some(Err(e)) => Err(e),
|
|
||||||
None => Ok(None),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn configure_port_channel(
|
|
||||||
&self,
|
|
||||||
channel_name: &str,
|
|
||||||
switch_ports: Vec<PortLocation>,
|
|
||||||
) -> Result<u8, SwitchError> {
|
|
||||||
let channel_id = self
|
|
||||||
.brocade
|
|
||||||
.find_available_channel_id()
|
|
||||||
.await
|
|
||||||
.map_err(|e| SwitchError::new(format!("{e}")))?;
|
|
||||||
|
|
||||||
self.brocade
|
|
||||||
.create_port_channel(channel_id, channel_name, &switch_ports)
|
|
||||||
.await
|
|
||||||
.map_err(|e| SwitchError::new(format!("{e}")))?;
|
|
||||||
|
|
||||||
Ok(channel_id)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[cfg(test)]
|
|
||||||
mod tests {
|
|
||||||
use std::sync::{Arc, Mutex};
|
|
||||||
|
|
||||||
use assertor::*;
|
|
||||||
use async_trait::async_trait;
|
|
||||||
use brocade::{
|
|
||||||
BrocadeClient, BrocadeInfo, Error, InterSwitchLink, InterfaceInfo, InterfaceStatus,
|
|
||||||
InterfaceType, MacAddressEntry, PortChannelId, PortOperatingMode,
|
|
||||||
};
|
|
||||||
use harmony_types::switch::PortLocation;
|
|
||||||
|
|
||||||
use crate::{infra::brocade::BrocadeSwitchClient, topology::SwitchClient};
|
|
||||||
|
|
||||||
#[tokio::test]
|
|
||||||
async fn setup_should_configure_ethernet_interfaces_as_access_ports() {
|
|
||||||
let first_interface = given_interface()
|
|
||||||
.with_port_location(PortLocation(1, 0, 1))
|
|
||||||
.build();
|
|
||||||
let second_interface = given_interface()
|
|
||||||
.with_port_location(PortLocation(1, 0, 4))
|
|
||||||
.build();
|
|
||||||
let brocade = Box::new(FakeBrocadeClient::new(
|
|
||||||
vec![],
|
|
||||||
vec![first_interface.clone(), second_interface.clone()],
|
|
||||||
));
|
|
||||||
let client = BrocadeSwitchClient {
|
|
||||||
brocade: brocade.clone(),
|
|
||||||
};
|
|
||||||
|
|
||||||
client.setup().await.unwrap();
|
|
||||||
|
|
||||||
let configured_interfaces = brocade.configured_interfaces.lock().unwrap();
|
|
||||||
assert_that!(*configured_interfaces).contains_exactly(vec![
|
|
||||||
(first_interface.name.clone(), PortOperatingMode::Access),
|
|
||||||
(second_interface.name.clone(), PortOperatingMode::Access),
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[tokio::test]
|
|
||||||
async fn setup_with_an_already_configured_interface_should_skip_configuration() {
|
|
||||||
let brocade = Box::new(FakeBrocadeClient::new(
|
|
||||||
vec![],
|
|
||||||
vec![
|
|
||||||
given_interface()
|
|
||||||
.with_operating_mode(Some(PortOperatingMode::Access))
|
|
||||||
.build(),
|
|
||||||
],
|
|
||||||
));
|
|
||||||
let client = BrocadeSwitchClient {
|
|
||||||
brocade: brocade.clone(),
|
|
||||||
};
|
|
||||||
|
|
||||||
client.setup().await.unwrap();
|
|
||||||
|
|
||||||
let configured_interfaces = brocade.configured_interfaces.lock().unwrap();
|
|
||||||
assert_that!(*configured_interfaces).is_empty();
|
|
||||||
}
|
|
||||||
|
|
||||||
#[tokio::test]
|
|
||||||
async fn setup_with_a_disconnected_interface_should_skip_configuration() {
|
|
||||||
let brocade = Box::new(FakeBrocadeClient::new(
|
|
||||||
vec![],
|
|
||||||
vec![
|
|
||||||
given_interface()
|
|
||||||
.with_status(InterfaceStatus::SfpAbsent)
|
|
||||||
.build(),
|
|
||||||
given_interface()
|
|
||||||
.with_status(InterfaceStatus::NotConnected)
|
|
||||||
.build(),
|
|
||||||
],
|
|
||||||
));
|
|
||||||
let client = BrocadeSwitchClient {
|
|
||||||
brocade: brocade.clone(),
|
|
||||||
};
|
|
||||||
|
|
||||||
client.setup().await.unwrap();
|
|
||||||
|
|
||||||
let configured_interfaces = brocade.configured_interfaces.lock().unwrap();
|
|
||||||
assert_that!(*configured_interfaces).is_empty();
|
|
||||||
}
|
|
||||||
|
|
||||||
#[tokio::test]
|
|
||||||
async fn setup_with_inter_switch_links_should_not_configure_interfaces_used_to_form_stack() {
|
|
||||||
let brocade = Box::new(FakeBrocadeClient::new(
|
|
||||||
vec![
|
|
||||||
given_inter_switch_link()
|
|
||||||
.between(PortLocation(1, 0, 1), PortLocation(2, 0, 1))
|
|
||||||
.build(),
|
|
||||||
given_inter_switch_link()
|
|
||||||
.between(PortLocation(2, 0, 2), PortLocation(3, 0, 1))
|
|
||||||
.build(),
|
|
||||||
],
|
|
||||||
vec![
|
|
||||||
given_interface()
|
|
||||||
.with_port_location(PortLocation(1, 0, 1))
|
|
||||||
.build(),
|
|
||||||
given_interface()
|
|
||||||
.with_port_location(PortLocation(2, 0, 1))
|
|
||||||
.build(),
|
|
||||||
given_interface()
|
|
||||||
.with_port_location(PortLocation(3, 0, 1))
|
|
||||||
.build(),
|
|
||||||
],
|
|
||||||
));
|
|
||||||
let client = BrocadeSwitchClient {
|
|
||||||
brocade: brocade.clone(),
|
|
||||||
};
|
|
||||||
|
|
||||||
client.setup().await.unwrap();
|
|
||||||
|
|
||||||
let configured_interfaces = brocade.configured_interfaces.lock().unwrap();
|
|
||||||
assert_that!(*configured_interfaces).is_empty();
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
|
||||||
struct FakeBrocadeClient {
|
|
||||||
stack_topology: Vec<InterSwitchLink>,
|
|
||||||
interfaces: Vec<InterfaceInfo>,
|
|
||||||
configured_interfaces: Arc<Mutex<Vec<(String, PortOperatingMode)>>>,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[async_trait]
|
|
||||||
impl BrocadeClient for FakeBrocadeClient {
|
|
||||||
async fn version(&self) -> Result<BrocadeInfo, Error> {
|
|
||||||
todo!()
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn get_mac_address_table(&self) -> Result<Vec<MacAddressEntry>, Error> {
|
|
||||||
todo!()
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn get_stack_topology(&self) -> Result<Vec<InterSwitchLink>, Error> {
|
|
||||||
Ok(self.stack_topology.clone())
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn get_interfaces(&self) -> Result<Vec<InterfaceInfo>, Error> {
|
|
||||||
Ok(self.interfaces.clone())
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn configure_interfaces(
|
|
||||||
&self,
|
|
||||||
interfaces: Vec<(String, PortOperatingMode)>,
|
|
||||||
) -> Result<(), Error> {
|
|
||||||
let mut configured_interfaces = self.configured_interfaces.lock().unwrap();
|
|
||||||
*configured_interfaces = interfaces;
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn find_available_channel_id(&self) -> Result<PortChannelId, Error> {
|
|
||||||
todo!()
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn create_port_channel(
|
|
||||||
&self,
|
|
||||||
_channel_id: PortChannelId,
|
|
||||||
_channel_name: &str,
|
|
||||||
_ports: &[PortLocation],
|
|
||||||
) -> Result<(), Error> {
|
|
||||||
todo!()
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn clear_port_channel(&self, _channel_name: &str) -> Result<(), Error> {
|
|
||||||
todo!()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl FakeBrocadeClient {
|
|
||||||
fn new(stack_topology: Vec<InterSwitchLink>, interfaces: Vec<InterfaceInfo>) -> Self {
|
|
||||||
Self {
|
|
||||||
stack_topology,
|
|
||||||
interfaces,
|
|
||||||
configured_interfaces: Arc::new(Mutex::new(vec![])),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
struct InterfaceInfoBuilder {
|
|
||||||
port_location: Option<PortLocation>,
|
|
||||||
interface_type: Option<InterfaceType>,
|
|
||||||
operating_mode: Option<PortOperatingMode>,
|
|
||||||
status: Option<InterfaceStatus>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl InterfaceInfoBuilder {
|
|
||||||
fn build(&self) -> InterfaceInfo {
|
|
||||||
let interface_type = self
|
|
||||||
.interface_type
|
|
||||||
.clone()
|
|
||||||
.unwrap_or(InterfaceType::Ethernet("TenGigabitEthernet".into()));
|
|
||||||
let port_location = self.port_location.clone().unwrap_or(PortLocation(1, 0, 1));
|
|
||||||
let name = format!("{interface_type} {port_location}");
|
|
||||||
let status = self.status.clone().unwrap_or(InterfaceStatus::Connected);
|
|
||||||
|
|
||||||
InterfaceInfo {
|
|
||||||
name,
|
|
||||||
port_location,
|
|
||||||
interface_type,
|
|
||||||
operating_mode: self.operating_mode.clone(),
|
|
||||||
status,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn with_port_location(self, port_location: PortLocation) -> Self {
|
|
||||||
Self {
|
|
||||||
port_location: Some(port_location),
|
|
||||||
..self
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn with_operating_mode(self, operating_mode: Option<PortOperatingMode>) -> Self {
|
|
||||||
Self {
|
|
||||||
operating_mode,
|
|
||||||
..self
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn with_status(self, status: InterfaceStatus) -> Self {
|
|
||||||
Self {
|
|
||||||
status: Some(status),
|
|
||||||
..self
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
struct InterSwitchLinkBuilder {
|
|
||||||
link: Option<(PortLocation, PortLocation)>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl InterSwitchLinkBuilder {
|
|
||||||
fn build(&self) -> InterSwitchLink {
|
|
||||||
let link = self
|
|
||||||
.link
|
|
||||||
.clone()
|
|
||||||
.unwrap_or((PortLocation(1, 0, 1), PortLocation(2, 0, 1)));
|
|
||||||
|
|
||||||
InterSwitchLink {
|
|
||||||
local_port: link.0,
|
|
||||||
remote_port: Some(link.1),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn between(self, local_port: PortLocation, remote_port: PortLocation) -> Self {
|
|
||||||
Self {
|
|
||||||
link: Some((local_port, remote_port)),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn given_interface() -> InterfaceInfoBuilder {
|
|
||||||
InterfaceInfoBuilder {
|
|
||||||
port_location: None,
|
|
||||||
interface_type: None,
|
|
||||||
operating_mode: None,
|
|
||||||
status: None,
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn given_inter_switch_link() -> InterSwitchLinkBuilder {
|
|
||||||
InterSwitchLinkBuilder { link: None }
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -11,7 +11,7 @@ pub struct InventoryRepositoryFactory;
|
|||||||
impl InventoryRepositoryFactory {
|
impl InventoryRepositoryFactory {
|
||||||
pub async fn build() -> Result<Box<dyn InventoryRepository>, RepoError> {
|
pub async fn build() -> Result<Box<dyn InventoryRepository>, RepoError> {
|
||||||
Ok(Box::new(
|
Ok(Box::new(
|
||||||
SqliteInventoryRepository::new(&DATABASE_URL).await?,
|
SqliteInventoryRepository::new(&(*DATABASE_URL)).await?,
|
||||||
))
|
))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,182 +0,0 @@
|
|||||||
use k8s_openapi::Resource as K8sResource;
|
|
||||||
use kube::api::{ApiResource, DynamicObject, GroupVersionKind};
|
|
||||||
use kube::core::TypeMeta;
|
|
||||||
use serde::Serialize;
|
|
||||||
use serde::de::DeserializeOwned;
|
|
||||||
use serde_json::Value;
|
|
||||||
|
|
||||||
/// Convert a typed Kubernetes resource `K` into a `DynamicObject`.
|
|
||||||
///
|
|
||||||
/// Requirements:
|
|
||||||
/// - `K` must be a k8s_openapi resource (provides static GVK via `Resource`).
|
|
||||||
/// - `K` must have standard Kubernetes shape (metadata + payload fields).
|
|
||||||
///
|
|
||||||
/// Notes:
|
|
||||||
/// - We set `types` (apiVersion/kind) and copy `metadata`.
|
|
||||||
/// - We place the remaining top-level fields into `obj.data` as JSON.
|
|
||||||
/// - Scope is not encoded on the object itself; you still need the corresponding
|
|
||||||
/// `DynamicResource` (derived from K::group/version/kind) when constructing an Api.
|
|
||||||
///
|
|
||||||
/// Example usage:
|
|
||||||
/// let dyn_obj = kube_resource_to_dynamic(secret)?;
|
|
||||||
/// let api: Api<DynamicObject> = Api::namespaced_with(client, "ns", &dr);
|
|
||||||
/// api.patch(&dyn_obj.name_any(), &PatchParams::apply("mgr"), &Patch::Apply(dyn_obj)).await?;
|
|
||||||
pub fn kube_resource_to_dynamic<K>(res: &K) -> Result<DynamicObject, String>
|
|
||||||
where
|
|
||||||
K: K8sResource + Serialize + DeserializeOwned,
|
|
||||||
{
|
|
||||||
// Serialize the typed resource to JSON so we can split metadata and payload
|
|
||||||
let mut v = serde_json::to_value(res).map_err(|e| format!("Failed to serialize : {e}"))?;
|
|
||||||
let obj = v
|
|
||||||
.as_object_mut()
|
|
||||||
.ok_or_else(|| "expected object JSON".to_string())?;
|
|
||||||
|
|
||||||
// Extract and parse metadata into kube::core::ObjectMeta
|
|
||||||
let metadata_value = obj
|
|
||||||
.remove("metadata")
|
|
||||||
.ok_or_else(|| "missing metadata".to_string())?;
|
|
||||||
let metadata: kube::core::ObjectMeta = serde_json::from_value(metadata_value)
|
|
||||||
.map_err(|e| format!("Failed to deserialize : {e}"))?;
|
|
||||||
|
|
||||||
// Name is required for DynamicObject::new; prefer metadata.name
|
|
||||||
let name = metadata
|
|
||||||
.name
|
|
||||||
.clone()
|
|
||||||
.ok_or_else(|| "metadata.name is required".to_string())?;
|
|
||||||
|
|
||||||
// Remaining fields (spec/status/data/etc.) become the dynamic payload
|
|
||||||
let payload = Value::Object(obj.clone());
|
|
||||||
|
|
||||||
// Construct the DynamicObject
|
|
||||||
let mut dyn_obj = DynamicObject::new(
|
|
||||||
&name,
|
|
||||||
&ApiResource::from_gvk(&GroupVersionKind::gvk(K::GROUP, K::VERSION, K::KIND)),
|
|
||||||
);
|
|
||||||
dyn_obj.types = Some(TypeMeta {
|
|
||||||
api_version: api_version_for::<K>(),
|
|
||||||
kind: K::KIND.into(),
|
|
||||||
});
|
|
||||||
|
|
||||||
// Preserve namespace/labels/annotations/etc.
|
|
||||||
dyn_obj.metadata = metadata;
|
|
||||||
|
|
||||||
// Attach payload
|
|
||||||
dyn_obj.data = payload;
|
|
||||||
|
|
||||||
Ok(dyn_obj)
|
|
||||||
}
|
|
||||||
|
|
||||||
/// Helper: compute apiVersion string ("group/version" or "v1" for core).
|
|
||||||
fn api_version_for<K>() -> String
|
|
||||||
where
|
|
||||||
K: K8sResource,
|
|
||||||
{
|
|
||||||
let group = K::GROUP;
|
|
||||||
let version = K::VERSION;
|
|
||||||
if group.is_empty() {
|
|
||||||
version.to_string() // core/v1 => "v1"
|
|
||||||
} else {
|
|
||||||
format!("{}/{}", group, version)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
#[cfg(test)]
|
|
||||||
mod test {
|
|
||||||
use super::*;
|
|
||||||
use k8s_openapi::api::{
|
|
||||||
apps::v1::{Deployment, DeploymentSpec},
|
|
||||||
core::v1::{PodTemplateSpec, Secret},
|
|
||||||
};
|
|
||||||
use kube::api::ObjectMeta;
|
|
||||||
use pretty_assertions::assert_eq;
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn secret_to_dynamic_roundtrip() {
|
|
||||||
// Create a sample Secret resource
|
|
||||||
let mut secret = Secret {
|
|
||||||
metadata: ObjectMeta {
|
|
||||||
name: Some("my-secret".to_string()),
|
|
||||||
..Default::default()
|
|
||||||
},
|
|
||||||
type_: Some("kubernetes.io/service-account-token".to_string()),
|
|
||||||
..Default::default()
|
|
||||||
};
|
|
||||||
|
|
||||||
// Convert to DynamicResource
|
|
||||||
let dynamic: DynamicObject =
|
|
||||||
kube_resource_to_dynamic(&secret).expect("Failed to convert Secret to DynamicResource");
|
|
||||||
|
|
||||||
// Serialize both the original and dynamic resources to Value
|
|
||||||
let original_value = serde_json::to_value(&secret).expect("Failed to serialize Secret");
|
|
||||||
let dynamic_value =
|
|
||||||
serde_json::to_value(&dynamic).expect("Failed to serialize DynamicResource");
|
|
||||||
|
|
||||||
// Assert that they are identical
|
|
||||||
assert_eq!(original_value, dynamic_value);
|
|
||||||
|
|
||||||
secret.metadata.namespace = Some("false".to_string());
|
|
||||||
let modified_value = serde_json::to_value(&secret).expect("Failed to serialize Secret");
|
|
||||||
assert_ne!(modified_value, dynamic_value);
|
|
||||||
}
|
|
||||||
|
|
||||||
#[test]
|
|
||||||
fn deployment_to_dynamic_roundtrip() {
|
|
||||||
// Create a sample Deployment with nested structures
|
|
||||||
let mut deployment = Deployment {
|
|
||||||
metadata: ObjectMeta {
|
|
||||||
name: Some("my-deployment".to_string()),
|
|
||||||
labels: Some({
|
|
||||||
let mut map = std::collections::BTreeMap::new();
|
|
||||||
map.insert("app".to_string(), "nginx".to_string());
|
|
||||||
map
|
|
||||||
}),
|
|
||||||
..Default::default()
|
|
||||||
},
|
|
||||||
spec: Some(DeploymentSpec {
|
|
||||||
replicas: Some(3),
|
|
||||||
selector: Default::default(),
|
|
||||||
template: PodTemplateSpec {
|
|
||||||
metadata: Some(ObjectMeta {
|
|
||||||
labels: Some({
|
|
||||||
let mut map = std::collections::BTreeMap::new();
|
|
||||||
map.insert("app".to_string(), "nginx".to_string());
|
|
||||||
map
|
|
||||||
}),
|
|
||||||
..Default::default()
|
|
||||||
}),
|
|
||||||
spec: Some(Default::default()), // PodSpec with empty containers for simplicity
|
|
||||||
},
|
|
||||||
..Default::default()
|
|
||||||
}),
|
|
||||||
..Default::default()
|
|
||||||
};
|
|
||||||
|
|
||||||
let dynamic = kube_resource_to_dynamic(&deployment).expect("Failed to convert Deployment");
|
|
||||||
|
|
||||||
let original_value = serde_json::to_value(&deployment).unwrap();
|
|
||||||
let dynamic_value = serde_json::to_value(&dynamic).unwrap();
|
|
||||||
|
|
||||||
assert_eq!(original_value, dynamic_value);
|
|
||||||
|
|
||||||
assert_eq!(
|
|
||||||
dynamic.data.get("spec").unwrap().get("replicas").unwrap(),
|
|
||||||
3
|
|
||||||
);
|
|
||||||
assert_eq!(
|
|
||||||
dynamic
|
|
||||||
.data
|
|
||||||
.get("spec")
|
|
||||||
.unwrap()
|
|
||||||
.get("template")
|
|
||||||
.unwrap()
|
|
||||||
.get("metadata")
|
|
||||||
.unwrap()
|
|
||||||
.get("labels")
|
|
||||||
.unwrap()
|
|
||||||
.get("app")
|
|
||||||
.unwrap()
|
|
||||||
.as_str()
|
|
||||||
.unwrap(),
|
|
||||||
"nginx".to_string()
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,9 +1,6 @@
|
|||||||
pub mod brocade;
|
|
||||||
pub mod executors;
|
pub mod executors;
|
||||||
pub mod hp_ilo;
|
pub mod hp_ilo;
|
||||||
pub mod intel_amt;
|
pub mod intel_amt;
|
||||||
pub mod inventory;
|
pub mod inventory;
|
||||||
pub mod kube;
|
|
||||||
pub mod network_manager;
|
|
||||||
pub mod opnsense;
|
pub mod opnsense;
|
||||||
mod sqlx;
|
mod sqlx;
|
||||||
|
|||||||
@@ -1,257 +0,0 @@
|
|||||||
use std::{
|
|
||||||
collections::{BTreeMap, HashSet},
|
|
||||||
sync::Arc,
|
|
||||||
};
|
|
||||||
|
|
||||||
use async_trait::async_trait;
|
|
||||||
use harmony_types::id::Id;
|
|
||||||
use k8s_openapi::api::core::v1::Node;
|
|
||||||
use kube::{
|
|
||||||
ResourceExt,
|
|
||||||
api::{ObjectList, ObjectMeta},
|
|
||||||
};
|
|
||||||
use log::{debug, info};
|
|
||||||
|
|
||||||
use crate::{
|
|
||||||
modules::okd::crd::nmstate,
|
|
||||||
topology::{HostNetworkConfig, NetworkError, NetworkManager, k8s::K8sClient},
|
|
||||||
};
|
|
||||||
|
|
||||||
pub struct OpenShiftNmStateNetworkManager {
|
|
||||||
k8s_client: Arc<K8sClient>,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl std::fmt::Debug for OpenShiftNmStateNetworkManager {
|
|
||||||
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
|
||||||
f.debug_struct("OpenShiftNmStateNetworkManager").finish()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[async_trait]
|
|
||||||
impl NetworkManager for OpenShiftNmStateNetworkManager {
|
|
||||||
async fn ensure_network_manager_installed(&self) -> Result<(), NetworkError> {
|
|
||||||
debug!("Installing NMState controller...");
|
|
||||||
self.k8s_client.apply_url(url::Url::parse("https://github.com/nmstate/kubernetes-nmstate/releases/download/v0.84.0/nmstate.io_nmstates.yaml
|
|
||||||
").unwrap(), Some("nmstate"))
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
debug!("Creating NMState namespace...");
|
|
||||||
self.k8s_client.apply_url(url::Url::parse("https://github.com/nmstate/kubernetes-nmstate/releases/download/v0.84.0/namespace.yaml
|
|
||||||
").unwrap(), Some("nmstate"))
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
debug!("Creating NMState service account...");
|
|
||||||
self.k8s_client.apply_url(url::Url::parse("https://github.com/nmstate/kubernetes-nmstate/releases/download/v0.84.0/service_account.yaml
|
|
||||||
").unwrap(), Some("nmstate"))
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
debug!("Creating NMState role...");
|
|
||||||
self.k8s_client.apply_url(url::Url::parse("https://github.com/nmstate/kubernetes-nmstate/releases/download/v0.84.0/role.yaml
|
|
||||||
").unwrap(), Some("nmstate"))
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
debug!("Creating NMState role binding...");
|
|
||||||
self.k8s_client.apply_url(url::Url::parse("https://github.com/nmstate/kubernetes-nmstate/releases/download/v0.84.0/role_binding.yaml
|
|
||||||
").unwrap(), Some("nmstate"))
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
debug!("Creating NMState operator...");
|
|
||||||
self.k8s_client.apply_url(url::Url::parse("https://github.com/nmstate/kubernetes-nmstate/releases/download/v0.84.0/operator.yaml
|
|
||||||
").unwrap(), Some("nmstate"))
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
self.k8s_client
|
|
||||||
.wait_until_deployment_ready("nmstate-operator", Some("nmstate"), None)
|
|
||||||
.await?;
|
|
||||||
|
|
||||||
let nmstate = nmstate::NMState {
|
|
||||||
metadata: ObjectMeta {
|
|
||||||
name: Some("nmstate".to_string()),
|
|
||||||
..Default::default()
|
|
||||||
},
|
|
||||||
..Default::default()
|
|
||||||
};
|
|
||||||
debug!(
|
|
||||||
"Creating NMState:\n{}",
|
|
||||||
serde_yaml::to_string(&nmstate).unwrap()
|
|
||||||
);
|
|
||||||
self.k8s_client.apply(&nmstate, None).await?;
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn configure_bond(&self, config: &HostNetworkConfig) -> Result<(), NetworkError> {
|
|
||||||
let hostname = self.get_hostname(&config.host_id).await.map_err(|e| {
|
|
||||||
NetworkError::new(format!(
|
|
||||||
"Can't configure bond, can't get hostname for host '{}': {e}",
|
|
||||||
config.host_id
|
|
||||||
))
|
|
||||||
})?;
|
|
||||||
let bond_id = self.get_next_bond_id(&hostname).await.map_err(|e| {
|
|
||||||
NetworkError::new(format!(
|
|
||||||
"Can't configure bond, can't get an available bond id for host '{}': {e}",
|
|
||||||
config.host_id
|
|
||||||
))
|
|
||||||
})?;
|
|
||||||
let bond_config = self.create_bond_configuration(&hostname, &bond_id, config);
|
|
||||||
|
|
||||||
debug!(
|
|
||||||
"Applying NMState bond config for host {}:\n{}",
|
|
||||||
config.host_id,
|
|
||||||
serde_yaml::to_string(&bond_config).unwrap(),
|
|
||||||
);
|
|
||||||
self.k8s_client
|
|
||||||
.apply(&bond_config, None)
|
|
||||||
.await
|
|
||||||
.map_err(|e| NetworkError::new(format!("Failed to configure bond: {e}")))?;
|
|
||||||
|
|
||||||
Ok(())
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl OpenShiftNmStateNetworkManager {
|
|
||||||
pub fn new(k8s_client: Arc<K8sClient>) -> Self {
|
|
||||||
Self { k8s_client }
|
|
||||||
}
|
|
||||||
|
|
||||||
fn create_bond_configuration(
|
|
||||||
&self,
|
|
||||||
host: &str,
|
|
||||||
bond_name: &str,
|
|
||||||
config: &HostNetworkConfig,
|
|
||||||
) -> nmstate::NodeNetworkConfigurationPolicy {
|
|
||||||
info!("Configuring bond '{bond_name}' for host '{host}'...");
|
|
||||||
|
|
||||||
let mut bond_mtu: Option<u32> = None;
|
|
||||||
let mut copy_mac_from: Option<String> = None;
|
|
||||||
let mut bond_ports = Vec::new();
|
|
||||||
let mut interfaces: Vec<nmstate::Interface> = Vec::new();
|
|
||||||
|
|
||||||
for switch_port in &config.switch_ports {
|
|
||||||
let interface_name = switch_port.interface.name.clone();
|
|
||||||
|
|
||||||
interfaces.push(nmstate::Interface {
|
|
||||||
name: interface_name.clone(),
|
|
||||||
description: Some(format!("Member of bond {bond_name}")),
|
|
||||||
r#type: nmstate::InterfaceType::Ethernet,
|
|
||||||
state: "up".to_string(),
|
|
||||||
ipv4: Some(nmstate::IpStackSpec {
|
|
||||||
enabled: Some(false),
|
|
||||||
..Default::default()
|
|
||||||
}),
|
|
||||||
ipv6: Some(nmstate::IpStackSpec {
|
|
||||||
enabled: Some(false),
|
|
||||||
..Default::default()
|
|
||||||
}),
|
|
||||||
link_aggregation: None,
|
|
||||||
..Default::default()
|
|
||||||
});
|
|
||||||
|
|
||||||
bond_ports.push(interface_name.clone());
|
|
||||||
|
|
||||||
// Use the first port's details for the bond mtu and mac address
|
|
||||||
if bond_mtu.is_none() {
|
|
||||||
bond_mtu = Some(switch_port.interface.mtu);
|
|
||||||
}
|
|
||||||
if copy_mac_from.is_none() {
|
|
||||||
copy_mac_from = Some(interface_name);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
interfaces.push(nmstate::Interface {
|
|
||||||
name: bond_name.to_string(),
|
|
||||||
description: Some(format!("HARMONY - Network bond for host {host}")),
|
|
||||||
r#type: nmstate::InterfaceType::Bond,
|
|
||||||
state: "up".to_string(),
|
|
||||||
copy_mac_from,
|
|
||||||
ipv4: Some(nmstate::IpStackSpec {
|
|
||||||
dhcp: Some(true),
|
|
||||||
enabled: Some(true),
|
|
||||||
..Default::default()
|
|
||||||
}),
|
|
||||||
ipv6: Some(nmstate::IpStackSpec {
|
|
||||||
dhcp: Some(true),
|
|
||||||
autoconf: Some(true),
|
|
||||||
enabled: Some(true),
|
|
||||||
..Default::default()
|
|
||||||
}),
|
|
||||||
link_aggregation: Some(nmstate::BondSpec {
|
|
||||||
mode: "802.3ad".to_string(),
|
|
||||||
ports: bond_ports,
|
|
||||||
..Default::default()
|
|
||||||
}),
|
|
||||||
..Default::default()
|
|
||||||
});
|
|
||||||
|
|
||||||
nmstate::NodeNetworkConfigurationPolicy {
|
|
||||||
metadata: ObjectMeta {
|
|
||||||
name: Some(format!("{host}-bond-config")),
|
|
||||||
..Default::default()
|
|
||||||
},
|
|
||||||
spec: nmstate::NodeNetworkConfigurationPolicySpec {
|
|
||||||
node_selector: Some(BTreeMap::from([(
|
|
||||||
"kubernetes.io/hostname".to_string(),
|
|
||||||
host.to_string(),
|
|
||||||
)])),
|
|
||||||
desired_state: nmstate::NetworkState {
|
|
||||||
interfaces,
|
|
||||||
..Default::default()
|
|
||||||
},
|
|
||||||
},
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn get_hostname(&self, host_id: &Id) -> Result<String, String> {
|
|
||||||
let nodes: ObjectList<Node> = self
|
|
||||||
.k8s_client
|
|
||||||
.list_resources(None, None)
|
|
||||||
.await
|
|
||||||
.map_err(|e| format!("Failed to list nodes: {e}"))?;
|
|
||||||
|
|
||||||
let Some(node) = nodes.iter().find(|n| {
|
|
||||||
n.status
|
|
||||||
.as_ref()
|
|
||||||
.and_then(|s| s.node_info.as_ref())
|
|
||||||
.map(|i| i.system_uuid == host_id.to_string())
|
|
||||||
.unwrap_or(false)
|
|
||||||
}) else {
|
|
||||||
return Err(format!("No node found for host '{host_id}'"));
|
|
||||||
};
|
|
||||||
|
|
||||||
node.labels()
|
|
||||||
.get("kubernetes.io/hostname")
|
|
||||||
.ok_or(format!(
|
|
||||||
"Node '{host_id}' has no kubernetes.io/hostname label"
|
|
||||||
))
|
|
||||||
.cloned()
|
|
||||||
}
|
|
||||||
|
|
||||||
async fn get_next_bond_id(&self, hostname: &str) -> Result<String, String> {
|
|
||||||
let network_state: Option<nmstate::NodeNetworkState> = self
|
|
||||||
.k8s_client
|
|
||||||
.get_resource(hostname, None)
|
|
||||||
.await
|
|
||||||
.map_err(|e| format!("Failed to list nodes: {e}"))?;
|
|
||||||
|
|
||||||
let interfaces = vec![];
|
|
||||||
let existing_bonds: Vec<&nmstate::Interface> = network_state
|
|
||||||
.as_ref()
|
|
||||||
.and_then(|network_state| network_state.status.current_state.as_ref())
|
|
||||||
.map_or(&interfaces, |current_state| ¤t_state.interfaces)
|
|
||||||
.iter()
|
|
||||||
.filter(|i| i.r#type == nmstate::InterfaceType::Bond)
|
|
||||||
.collect();
|
|
||||||
|
|
||||||
let used_ids: HashSet<u32> = existing_bonds
|
|
||||||
.iter()
|
|
||||||
.filter_map(|i| {
|
|
||||||
i.name
|
|
||||||
.strip_prefix("bond")
|
|
||||||
.and_then(|id| id.parse::<u32>().ok())
|
|
||||||
})
|
|
||||||
.collect();
|
|
||||||
|
|
||||||
let next_id = (0..).find(|id| !used_ids.contains(id)).unwrap();
|
|
||||||
Ok(format!("bond{next_id}"))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -26,13 +26,19 @@ impl LoadBalancer for OPNSenseFirewall {
|
|||||||
}
|
}
|
||||||
|
|
||||||
async fn add_service(&self, service: &LoadBalancerService) -> Result<(), ExecutorError> {
|
async fn add_service(&self, service: &LoadBalancerService) -> Result<(), ExecutorError> {
|
||||||
|
warn!(
|
||||||
|
"TODO : the current implementation does not check / cleanup / merge with existing haproxy services properly. Make sure to manually verify that the configuration is correct after executing any operation here"
|
||||||
|
);
|
||||||
let mut config = self.opnsense_config.write().await;
|
let mut config = self.opnsense_config.write().await;
|
||||||
let mut load_balancer = config.load_balancer();
|
|
||||||
|
|
||||||
let (frontend, backend, servers, healthcheck) =
|
let (frontend, backend, servers, healthcheck) =
|
||||||
harmony_load_balancer_service_to_haproxy_xml(service);
|
harmony_load_balancer_service_to_haproxy_xml(service);
|
||||||
|
let mut load_balancer = config.load_balancer();
|
||||||
load_balancer.configure_service(frontend, backend, servers, healthcheck);
|
load_balancer.add_backend(backend);
|
||||||
|
load_balancer.add_frontend(frontend);
|
||||||
|
load_balancer.add_servers(servers);
|
||||||
|
if let Some(healthcheck) = healthcheck {
|
||||||
|
load_balancer.add_healthcheck(healthcheck);
|
||||||
|
}
|
||||||
|
|
||||||
Ok(())
|
Ok(())
|
||||||
}
|
}
|
||||||
@@ -100,7 +106,7 @@ pub(crate) fn haproxy_xml_config_to_harmony_loadbalancer(
|
|||||||
.backends
|
.backends
|
||||||
.backends
|
.backends
|
||||||
.iter()
|
.iter()
|
||||||
.find(|b| Some(b.uuid.clone()) == frontend.default_backend);
|
.find(|b| b.uuid == frontend.default_backend);
|
||||||
|
|
||||||
let mut health_check = None;
|
let mut health_check = None;
|
||||||
match matching_backend {
|
match matching_backend {
|
||||||
@@ -110,7 +116,8 @@ pub(crate) fn haproxy_xml_config_to_harmony_loadbalancer(
|
|||||||
}
|
}
|
||||||
None => {
|
None => {
|
||||||
warn!(
|
warn!(
|
||||||
"HAProxy config could not find a matching backend for frontend {frontend:?}"
|
"HAProxy config could not find a matching backend for frontend {:?}",
|
||||||
|
frontend
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -145,11 +152,11 @@ pub(crate) fn get_servers_for_backend(
|
|||||||
.servers
|
.servers
|
||||||
.iter()
|
.iter()
|
||||||
.filter_map(|server| {
|
.filter_map(|server| {
|
||||||
let address = server.address.clone()?;
|
|
||||||
let port = server.port?;
|
|
||||||
|
|
||||||
if backend_servers.contains(&server.uuid.as_str()) {
|
if backend_servers.contains(&server.uuid.as_str()) {
|
||||||
return Some(BackendServer { address, port });
|
return Some(BackendServer {
|
||||||
|
address: server.address.clone(),
|
||||||
|
port: server.port,
|
||||||
|
});
|
||||||
}
|
}
|
||||||
None
|
None
|
||||||
})
|
})
|
||||||
@@ -340,7 +347,7 @@ pub(crate) fn harmony_load_balancer_service_to_haproxy_xml(
|
|||||||
name: format!("frontend_{}", service.listening_port),
|
name: format!("frontend_{}", service.listening_port),
|
||||||
bind: service.listening_port.to_string(),
|
bind: service.listening_port.to_string(),
|
||||||
mode: "tcp".to_string(), // TODO do not depend on health check here
|
mode: "tcp".to_string(), // TODO do not depend on health check here
|
||||||
default_backend: Some(backend.uuid.clone()),
|
default_backend: backend.uuid.clone(),
|
||||||
..Default::default()
|
..Default::default()
|
||||||
};
|
};
|
||||||
info!("HAPRoxy frontend and backend mode currently hardcoded to tcp");
|
info!("HAPRoxy frontend and backend mode currently hardcoded to tcp");
|
||||||
@@ -354,8 +361,8 @@ fn server_to_haproxy_server(server: &BackendServer) -> HAProxyServer {
|
|||||||
uuid: Uuid::new_v4().to_string(),
|
uuid: Uuid::new_v4().to_string(),
|
||||||
name: format!("{}_{}", &server.address, &server.port),
|
name: format!("{}_{}", &server.address, &server.port),
|
||||||
enabled: 1,
|
enabled: 1,
|
||||||
address: Some(server.address.clone()),
|
address: server.address.clone(),
|
||||||
port: Some(server.port),
|
port: server.port,
|
||||||
mode: "active".to_string(),
|
mode: "active".to_string(),
|
||||||
server_type: "static".to_string(),
|
server_type: "static".to_string(),
|
||||||
..Default::default()
|
..Default::default()
|
||||||
@@ -378,8 +385,8 @@ mod tests {
|
|||||||
let mut haproxy = HAProxy::default();
|
let mut haproxy = HAProxy::default();
|
||||||
let server = HAProxyServer {
|
let server = HAProxyServer {
|
||||||
uuid: "server1".to_string(),
|
uuid: "server1".to_string(),
|
||||||
address: Some("192.168.1.1".to_string()),
|
address: "192.168.1.1".to_string(),
|
||||||
port: Some(80),
|
port: 80,
|
||||||
..Default::default()
|
..Default::default()
|
||||||
};
|
};
|
||||||
haproxy.servers.servers.push(server);
|
haproxy.servers.servers.push(server);
|
||||||
@@ -404,8 +411,8 @@ mod tests {
|
|||||||
let mut haproxy = HAProxy::default();
|
let mut haproxy = HAProxy::default();
|
||||||
let server = HAProxyServer {
|
let server = HAProxyServer {
|
||||||
uuid: "server1".to_string(),
|
uuid: "server1".to_string(),
|
||||||
address: Some("192.168.1.1".to_string()),
|
address: "192.168.1.1".to_string(),
|
||||||
port: Some(80),
|
port: 80,
|
||||||
..Default::default()
|
..Default::default()
|
||||||
};
|
};
|
||||||
haproxy.servers.servers.push(server);
|
haproxy.servers.servers.push(server);
|
||||||
@@ -424,8 +431,8 @@ mod tests {
|
|||||||
let mut haproxy = HAProxy::default();
|
let mut haproxy = HAProxy::default();
|
||||||
let server = HAProxyServer {
|
let server = HAProxyServer {
|
||||||
uuid: "server1".to_string(),
|
uuid: "server1".to_string(),
|
||||||
address: Some("192.168.1.1".to_string()),
|
address: "192.168.1.1".to_string(),
|
||||||
port: Some(80),
|
port: 80,
|
||||||
..Default::default()
|
..Default::default()
|
||||||
};
|
};
|
||||||
haproxy.servers.servers.push(server);
|
haproxy.servers.servers.push(server);
|
||||||
@@ -446,16 +453,16 @@ mod tests {
|
|||||||
let mut haproxy = HAProxy::default();
|
let mut haproxy = HAProxy::default();
|
||||||
let server = HAProxyServer {
|
let server = HAProxyServer {
|
||||||
uuid: "server1".to_string(),
|
uuid: "server1".to_string(),
|
||||||
address: Some("some-hostname.test.mcd".to_string()),
|
address: "some-hostname.test.mcd".to_string(),
|
||||||
port: Some(80),
|
port: 80,
|
||||||
..Default::default()
|
..Default::default()
|
||||||
};
|
};
|
||||||
haproxy.servers.servers.push(server);
|
haproxy.servers.servers.push(server);
|
||||||
|
|
||||||
let server = HAProxyServer {
|
let server = HAProxyServer {
|
||||||
uuid: "server2".to_string(),
|
uuid: "server2".to_string(),
|
||||||
address: Some("192.168.1.2".to_string()),
|
address: "192.168.1.2".to_string(),
|
||||||
port: Some(8080),
|
port: 8080,
|
||||||
..Default::default()
|
..Default::default()
|
||||||
};
|
};
|
||||||
haproxy.servers.servers.push(server);
|
haproxy.servers.servers.push(server);
|
||||||
|
|||||||
@@ -1,10 +1,7 @@
|
|||||||
use std::error::Error;
|
|
||||||
|
|
||||||
use async_trait::async_trait;
|
use async_trait::async_trait;
|
||||||
use derive_new::new;
|
|
||||||
use serde::Serialize;
|
use serde::Serialize;
|
||||||
|
|
||||||
use crate::{executors::ExecutorError, topology::Topology};
|
use crate::topology::Topology;
|
||||||
|
|
||||||
/// An ApplicationFeature provided by harmony, such as Backups, Monitoring, MultisiteAvailability,
|
/// An ApplicationFeature provided by harmony, such as Backups, Monitoring, MultisiteAvailability,
|
||||||
/// ContinuousIntegration, ContinuousDelivery
|
/// ContinuousIntegration, ContinuousDelivery
|
||||||
@@ -12,10 +9,7 @@ use crate::{executors::ExecutorError, topology::Topology};
|
|||||||
pub trait ApplicationFeature<T: Topology>:
|
pub trait ApplicationFeature<T: Topology>:
|
||||||
std::fmt::Debug + Send + Sync + ApplicationFeatureClone<T>
|
std::fmt::Debug + Send + Sync + ApplicationFeatureClone<T>
|
||||||
{
|
{
|
||||||
async fn ensure_installed(
|
async fn ensure_installed(&self, topology: &T) -> Result<(), String>;
|
||||||
&self,
|
|
||||||
topology: &T,
|
|
||||||
) -> Result<InstallationOutcome, InstallationError>;
|
|
||||||
fn name(&self) -> String;
|
fn name(&self) -> String;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -46,60 +40,3 @@ impl<T: Topology> Clone for Box<dyn ApplicationFeature<T>> {
|
|||||||
self.clone_box()
|
self.clone_box()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
#[derive(Debug, Clone, PartialEq, Eq)]
|
|
||||||
pub enum InstallationOutcome {
|
|
||||||
Success { details: Vec<String> },
|
|
||||||
Noop,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl InstallationOutcome {
|
|
||||||
pub fn success() -> Self {
|
|
||||||
Self::Success { details: vec![] }
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn success_with_details(details: Vec<String>) -> Self {
|
|
||||||
Self::Success { details }
|
|
||||||
}
|
|
||||||
|
|
||||||
pub fn noop() -> Self {
|
|
||||||
Self::Noop
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Clone, new)]
|
|
||||||
pub struct InstallationError {
|
|
||||||
msg: String,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl std::fmt::Display for InstallationError {
|
|
||||||
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
|
|
||||||
f.write_str(&self.msg)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl Error for InstallationError {}
|
|
||||||
|
|
||||||
impl From<ExecutorError> for InstallationError {
|
|
||||||
fn from(value: ExecutorError) -> Self {
|
|
||||||
Self {
|
|
||||||
msg: format!("InstallationError : {value}"),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl From<kube::Error> for InstallationError {
|
|
||||||
fn from(value: kube::Error) -> Self {
|
|
||||||
Self {
|
|
||||||
msg: format!("InstallationError : {value}"),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl From<String> for InstallationError {
|
|
||||||
fn from(value: String) -> Self {
|
|
||||||
Self {
|
|
||||||
msg: format!("PreparationError : {value}"),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ use crate::{
|
|||||||
data::Version,
|
data::Version,
|
||||||
inventory::Inventory,
|
inventory::Inventory,
|
||||||
modules::application::{
|
modules::application::{
|
||||||
ApplicationFeature, HelmPackage, InstallationError, InstallationOutcome, OCICompliant,
|
ApplicationFeature, HelmPackage, OCICompliant,
|
||||||
features::{ArgoApplication, ArgoHelmScore},
|
features::{ArgoApplication, ArgoHelmScore},
|
||||||
},
|
},
|
||||||
score::Score,
|
score::Score,
|
||||||
@@ -47,11 +47,11 @@ use crate::{
|
|||||||
/// - ArgoCD to install/upgrade/rollback/inspect k8s resources
|
/// - ArgoCD to install/upgrade/rollback/inspect k8s resources
|
||||||
/// - Kubernetes for runtime orchestration
|
/// - Kubernetes for runtime orchestration
|
||||||
#[derive(Debug, Default, Clone)]
|
#[derive(Debug, Default, Clone)]
|
||||||
pub struct PackagingDeployment<A: OCICompliant + HelmPackage> {
|
pub struct ContinuousDelivery<A: OCICompliant + HelmPackage> {
|
||||||
pub application: Arc<A>,
|
pub application: Arc<A>,
|
||||||
}
|
}
|
||||||
|
|
||||||
impl<A: OCICompliant + HelmPackage> PackagingDeployment<A> {
|
impl<A: OCICompliant + HelmPackage> ContinuousDelivery<A> {
|
||||||
async fn deploy_to_local_k3d(
|
async fn deploy_to_local_k3d(
|
||||||
&self,
|
&self,
|
||||||
app_name: String,
|
app_name: String,
|
||||||
@@ -139,12 +139,9 @@ impl<A: OCICompliant + HelmPackage> PackagingDeployment<A> {
|
|||||||
impl<
|
impl<
|
||||||
A: OCICompliant + HelmPackage + Clone + 'static,
|
A: OCICompliant + HelmPackage + Clone + 'static,
|
||||||
T: Topology + HelmCommand + MultiTargetTopology + K8sclient + Ingress + 'static,
|
T: Topology + HelmCommand + MultiTargetTopology + K8sclient + Ingress + 'static,
|
||||||
> ApplicationFeature<T> for PackagingDeployment<A>
|
> ApplicationFeature<T> for ContinuousDelivery<A>
|
||||||
{
|
{
|
||||||
async fn ensure_installed(
|
async fn ensure_installed(&self, topology: &T) -> Result<(), String> {
|
||||||
&self,
|
|
||||||
topology: &T,
|
|
||||||
) -> Result<InstallationOutcome, InstallationError> {
|
|
||||||
let image = self.application.image_name();
|
let image = self.application.image_name();
|
||||||
let domain = topology
|
let domain = topology
|
||||||
.get_domain(&self.application.name())
|
.get_domain(&self.application.name())
|
||||||
@@ -208,11 +205,7 @@ impl<
|
|||||||
.unwrap();
|
.unwrap();
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
Ok(())
|
||||||
Ok(InstallationOutcome::success_with_details(vec![format!(
|
|
||||||
"{}: http://{domain}",
|
|
||||||
self.application.name()
|
|
||||||
)]))
|
|
||||||
}
|
}
|
||||||
fn name(&self) -> String {
|
fn name(&self) -> String {
|
||||||
"ContinuousDelivery".to_string()
|
"ContinuousDelivery".to_string()
|
||||||
@@ -2,7 +2,7 @@ use async_trait::async_trait;
|
|||||||
use log::info;
|
use log::info;
|
||||||
|
|
||||||
use crate::{
|
use crate::{
|
||||||
modules::application::{ApplicationFeature, InstallationError, InstallationOutcome},
|
modules::application::ApplicationFeature,
|
||||||
topology::{K8sclient, Topology},
|
topology::{K8sclient, Topology},
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -29,10 +29,7 @@ impl Default for PublicEndpoint {
|
|||||||
/// For now we only suport K8s ingress, but we will support more stuff at some point
|
/// For now we only suport K8s ingress, but we will support more stuff at some point
|
||||||
#[async_trait]
|
#[async_trait]
|
||||||
impl<T: Topology + K8sclient + 'static> ApplicationFeature<T> for PublicEndpoint {
|
impl<T: Topology + K8sclient + 'static> ApplicationFeature<T> for PublicEndpoint {
|
||||||
async fn ensure_installed(
|
async fn ensure_installed(&self, _topology: &T) -> Result<(), String> {
|
||||||
&self,
|
|
||||||
_topology: &T,
|
|
||||||
) -> Result<InstallationOutcome, InstallationError> {
|
|
||||||
info!(
|
info!(
|
||||||
"Making sure public endpoint is installed for port {}",
|
"Making sure public endpoint is installed for port {}",
|
||||||
self.application_port
|
self.application_port
|
||||||
|
|||||||
@@ -1,5 +1,4 @@
|
|||||||
use async_trait::async_trait;
|
use async_trait::async_trait;
|
||||||
use harmony_macros::hurl;
|
|
||||||
use kube::{Api, api::GroupVersionKind};
|
use kube::{Api, api::GroupVersionKind};
|
||||||
use log::{debug, warn};
|
use log::{debug, warn};
|
||||||
use non_blank_string_rs::NonBlankString;
|
use non_blank_string_rs::NonBlankString;
|
||||||
@@ -56,8 +55,7 @@ impl<T: Topology + K8sclient + HelmCommand + Ingress> Interpret<T> for ArgoInter
|
|||||||
topology: &T,
|
topology: &T,
|
||||||
) -> Result<Outcome, InterpretError> {
|
) -> Result<Outcome, InterpretError> {
|
||||||
let k8s_client = topology.k8s_client().await?;
|
let k8s_client = topology.k8s_client().await?;
|
||||||
let svc = format!("argo-{}", self.score.namespace.clone());
|
let domain = topology.get_domain("argo").await?;
|
||||||
let domain = topology.get_domain(&svc).await?;
|
|
||||||
let helm_score =
|
let helm_score =
|
||||||
argo_helm_chart_score(&self.score.namespace, self.score.openshift, &domain);
|
argo_helm_chart_score(&self.score.namespace, self.score.openshift, &domain);
|
||||||
|
|
||||||
@@ -68,17 +66,14 @@ impl<T: Topology + K8sclient + HelmCommand + Ingress> Interpret<T> for ArgoInter
|
|||||||
.await
|
.await
|
||||||
.unwrap();
|
.unwrap();
|
||||||
|
|
||||||
Ok(Outcome::success_with_details(
|
Ok(Outcome::success(format!(
|
||||||
format!(
|
"ArgoCD installed with {} {}",
|
||||||
"ArgoCD {} {}",
|
self.argo_apps.len(),
|
||||||
self.argo_apps.len(),
|
match self.argo_apps.len() {
|
||||||
match self.argo_apps.len() {
|
1 => "application",
|
||||||
1 => "application",
|
_ => "applications",
|
||||||
_ => "applications",
|
}
|
||||||
}
|
)))
|
||||||
),
|
|
||||||
vec![format!("argo application: http://{}", domain)],
|
|
||||||
))
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fn get_name(&self) -> InterpretName {
|
fn get_name(&self) -> InterpretName {
|
||||||
@@ -161,9 +156,6 @@ global:
|
|||||||
## Used for ingresses, certificates, SSO, notifications, etc.
|
## Used for ingresses, certificates, SSO, notifications, etc.
|
||||||
domain: {domain}
|
domain: {domain}
|
||||||
|
|
||||||
securityContext:
|
|
||||||
runAsUser: null
|
|
||||||
|
|
||||||
# -- Runtime class name for all components
|
# -- Runtime class name for all components
|
||||||
runtimeClassName: ""
|
runtimeClassName: ""
|
||||||
|
|
||||||
@@ -475,13 +467,6 @@ redis:
|
|||||||
# -- Redis name
|
# -- Redis name
|
||||||
name: redis
|
name: redis
|
||||||
|
|
||||||
serviceAccount:
|
|
||||||
create: true
|
|
||||||
|
|
||||||
securityContext:
|
|
||||||
runAsUser: null
|
|
||||||
|
|
||||||
|
|
||||||
## Redis image
|
## Redis image
|
||||||
image:
|
image:
|
||||||
# -- Redis repository
|
# -- Redis repository
|
||||||
@@ -1052,7 +1037,7 @@ commitServer:
|
|||||||
install_only: false,
|
install_only: false,
|
||||||
repository: Some(HelmRepository::new(
|
repository: Some(HelmRepository::new(
|
||||||
"argo".to_string(),
|
"argo".to_string(),
|
||||||
hurl!("https://argoproj.github.io/argo-helm"),
|
url::Url::parse("https://argoproj.github.io/argo-helm").unwrap(),
|
||||||
true,
|
true,
|
||||||
)),
|
)),
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,8 +5,8 @@ pub use endpoint::*;
|
|||||||
mod monitoring;
|
mod monitoring;
|
||||||
pub use monitoring::*;
|
pub use monitoring::*;
|
||||||
|
|
||||||
mod packaging_deployment;
|
mod continuous_delivery;
|
||||||
pub use packaging_deployment::*;
|
pub use continuous_delivery::*;
|
||||||
|
|
||||||
mod helm_argocd_score;
|
mod helm_argocd_score;
|
||||||
pub use helm_argocd_score::*;
|
pub use helm_argocd_score::*;
|
||||||
|
|||||||
@@ -1,12 +1,6 @@
|
|||||||
use crate::modules::application::{
|
use crate::modules::application::{Application, ApplicationFeature};
|
||||||
Application, ApplicationFeature, InstallationError, InstallationOutcome,
|
|
||||||
};
|
|
||||||
use crate::modules::monitoring::application_monitoring::application_monitoring_score::ApplicationMonitoringScore;
|
use crate::modules::monitoring::application_monitoring::application_monitoring_score::ApplicationMonitoringScore;
|
||||||
use crate::modules::monitoring::grafana::grafana::Grafana;
|
|
||||||
use crate::modules::monitoring::kube_prometheus::crd::crd_alertmanager_config::CRDPrometheus;
|
use crate::modules::monitoring::kube_prometheus::crd::crd_alertmanager_config::CRDPrometheus;
|
||||||
use crate::modules::monitoring::kube_prometheus::crd::service_monitor::{
|
|
||||||
ServiceMonitor, ServiceMonitorSpec,
|
|
||||||
};
|
|
||||||
use crate::topology::MultiTargetTopology;
|
use crate::topology::MultiTargetTopology;
|
||||||
use crate::topology::ingress::Ingress;
|
use crate::topology::ingress::Ingress;
|
||||||
use crate::{
|
use crate::{
|
||||||
@@ -18,7 +12,7 @@ use crate::{
|
|||||||
topology::{HelmCommand, K8sclient, Topology, tenant::TenantManager},
|
topology::{HelmCommand, K8sclient, Topology, tenant::TenantManager},
|
||||||
};
|
};
|
||||||
use crate::{
|
use crate::{
|
||||||
modules::prometheus::prometheus::PrometheusMonitoring,
|
modules::prometheus::prometheus::PrometheusApplicationMonitoring,
|
||||||
topology::oberservability::monitoring::AlertReceiver,
|
topology::oberservability::monitoring::AlertReceiver,
|
||||||
};
|
};
|
||||||
use async_trait::async_trait;
|
use async_trait::async_trait;
|
||||||
@@ -26,7 +20,6 @@ use base64::{Engine as _, engine::general_purpose};
|
|||||||
use harmony_secret::SecretManager;
|
use harmony_secret::SecretManager;
|
||||||
use harmony_secret_derive::Secret;
|
use harmony_secret_derive::Secret;
|
||||||
use harmony_types::net::Url;
|
use harmony_types::net::Url;
|
||||||
use kube::api::ObjectMeta;
|
|
||||||
use log::{debug, info};
|
use log::{debug, info};
|
||||||
use serde::{Deserialize, Serialize};
|
use serde::{Deserialize, Serialize};
|
||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
@@ -45,16 +38,12 @@ impl<
|
|||||||
+ TenantManager
|
+ TenantManager
|
||||||
+ K8sclient
|
+ K8sclient
|
||||||
+ MultiTargetTopology
|
+ MultiTargetTopology
|
||||||
+ PrometheusMonitoring<CRDPrometheus>
|
+ PrometheusApplicationMonitoring<CRDPrometheus>
|
||||||
+ Grafana
|
|
||||||
+ Ingress
|
+ Ingress
|
||||||
+ std::fmt::Debug,
|
+ std::fmt::Debug,
|
||||||
> ApplicationFeature<T> for Monitoring
|
> ApplicationFeature<T> for Monitoring
|
||||||
{
|
{
|
||||||
async fn ensure_installed(
|
async fn ensure_installed(&self, topology: &T) -> Result<(), String> {
|
||||||
&self,
|
|
||||||
topology: &T,
|
|
||||||
) -> Result<InstallationOutcome, InstallationError> {
|
|
||||||
info!("Ensuring monitoring is available for application");
|
info!("Ensuring monitoring is available for application");
|
||||||
let namespace = topology
|
let namespace = topology
|
||||||
.get_tenant_config()
|
.get_tenant_config()
|
||||||
@@ -63,20 +52,10 @@ impl<
|
|||||||
.unwrap_or_else(|| self.application.name());
|
.unwrap_or_else(|| self.application.name());
|
||||||
let domain = topology.get_domain("ntfy").await.unwrap();
|
let domain = topology.get_domain("ntfy").await.unwrap();
|
||||||
|
|
||||||
let app_service_monitor = ServiceMonitor {
|
|
||||||
metadata: ObjectMeta {
|
|
||||||
name: Some(self.application.name()),
|
|
||||||
namespace: Some(namespace.clone()),
|
|
||||||
..Default::default()
|
|
||||||
},
|
|
||||||
spec: ServiceMonitorSpec::default(),
|
|
||||||
};
|
|
||||||
|
|
||||||
let mut alerting_score = ApplicationMonitoringScore {
|
let mut alerting_score = ApplicationMonitoringScore {
|
||||||
sender: CRDPrometheus {
|
sender: CRDPrometheus {
|
||||||
namespace: namespace.clone(),
|
namespace: namespace.clone(),
|
||||||
client: topology.k8s_client().await.unwrap(),
|
client: topology.k8s_client().await.unwrap(),
|
||||||
service_monitor: vec![app_service_monitor],
|
|
||||||
},
|
},
|
||||||
application: self.application.clone(),
|
application: self.application.clone(),
|
||||||
receivers: self.alert_receiver.clone(),
|
receivers: self.alert_receiver.clone(),
|
||||||
@@ -124,7 +103,7 @@ impl<
|
|||||||
.await
|
.await
|
||||||
.map_err(|e| e.to_string())?;
|
.map_err(|e| e.to_string())?;
|
||||||
|
|
||||||
Ok(InstallationOutcome::success())
|
Ok(())
|
||||||
}
|
}
|
||||||
|
|
||||||
fn name(&self) -> String {
|
fn name(&self) -> String {
|
||||||
|
|||||||
@@ -1,8 +1,6 @@
|
|||||||
use std::sync::Arc;
|
use std::sync::Arc;
|
||||||
|
|
||||||
use crate::modules::application::{
|
use crate::modules::application::{Application, ApplicationFeature};
|
||||||
Application, ApplicationFeature, InstallationError, InstallationOutcome,
|
|
||||||
};
|
|
||||||
use crate::modules::monitoring::application_monitoring::application_monitoring_score::ApplicationMonitoringScore;
|
use crate::modules::monitoring::application_monitoring::application_monitoring_score::ApplicationMonitoringScore;
|
||||||
use crate::modules::monitoring::application_monitoring::rhobs_application_monitoring_score::ApplicationRHOBMonitoringScore;
|
use crate::modules::monitoring::application_monitoring::rhobs_application_monitoring_score::ApplicationRHOBMonitoringScore;
|
||||||
|
|
||||||
@@ -18,7 +16,7 @@ use crate::{
|
|||||||
topology::{HelmCommand, K8sclient, Topology, tenant::TenantManager},
|
topology::{HelmCommand, K8sclient, Topology, tenant::TenantManager},
|
||||||
};
|
};
|
||||||
use crate::{
|
use crate::{
|
||||||
modules::prometheus::prometheus::PrometheusMonitoring,
|
modules::prometheus::prometheus::PrometheusApplicationMonitoring,
|
||||||
topology::oberservability::monitoring::AlertReceiver,
|
topology::oberservability::monitoring::AlertReceiver,
|
||||||
};
|
};
|
||||||
use async_trait::async_trait;
|
use async_trait::async_trait;
|
||||||
@@ -27,7 +25,7 @@ use harmony_types::net::Url;
|
|||||||
use log::{debug, info};
|
use log::{debug, info};
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
#[derive(Debug, Clone)]
|
||||||
pub struct Monitoring {
|
pub struct RHOBMonitoring {
|
||||||
pub application: Arc<dyn Application>,
|
pub application: Arc<dyn Application>,
|
||||||
pub alert_receiver: Vec<Box<dyn AlertReceiver<RHOBObservability>>>,
|
pub alert_receiver: Vec<Box<dyn AlertReceiver<RHOBObservability>>>,
|
||||||
}
|
}
|
||||||
@@ -42,13 +40,10 @@ impl<
|
|||||||
+ MultiTargetTopology
|
+ MultiTargetTopology
|
||||||
+ Ingress
|
+ Ingress
|
||||||
+ std::fmt::Debug
|
+ std::fmt::Debug
|
||||||
+ PrometheusMonitoring<RHOBObservability>,
|
+ PrometheusApplicationMonitoring<RHOBObservability>,
|
||||||
> ApplicationFeature<T> for Monitoring
|
> ApplicationFeature<T> for RHOBMonitoring
|
||||||
{
|
{
|
||||||
async fn ensure_installed(
|
async fn ensure_installed(&self, topology: &T) -> Result<(), String> {
|
||||||
&self,
|
|
||||||
topology: &T,
|
|
||||||
) -> Result<InstallationOutcome, InstallationError> {
|
|
||||||
info!("Ensuring monitoring is available for application");
|
info!("Ensuring monitoring is available for application");
|
||||||
let namespace = topology
|
let namespace = topology
|
||||||
.get_tenant_config()
|
.get_tenant_config()
|
||||||
@@ -64,13 +59,12 @@ impl<
|
|||||||
application: self.application.clone(),
|
application: self.application.clone(),
|
||||||
receivers: self.alert_receiver.clone(),
|
receivers: self.alert_receiver.clone(),
|
||||||
};
|
};
|
||||||
let domain = topology
|
|
||||||
.get_domain("ntfy")
|
|
||||||
.await
|
|
||||||
.map_err(|e| format!("could not get domain {e}"))?;
|
|
||||||
let ntfy = NtfyScore {
|
let ntfy = NtfyScore {
|
||||||
namespace: namespace.clone(),
|
namespace: namespace.clone(),
|
||||||
host: domain.clone(),
|
host: topology
|
||||||
|
.get_domain("ntfy")
|
||||||
|
.await
|
||||||
|
.map_err(|e| format!("Could not get domain {e}"))?,
|
||||||
};
|
};
|
||||||
ntfy.interpret(&Inventory::empty(), topology)
|
ntfy.interpret(&Inventory::empty(), topology)
|
||||||
.await
|
.await
|
||||||
@@ -92,33 +86,27 @@ impl<
|
|||||||
.replace("=", "");
|
.replace("=", "");
|
||||||
|
|
||||||
debug!("ntfy_default_auth_param: {ntfy_default_auth_param}");
|
debug!("ntfy_default_auth_param: {ntfy_default_auth_param}");
|
||||||
|
|
||||||
let ntfy_receiver = WebhookReceiver {
|
let ntfy_receiver = WebhookReceiver {
|
||||||
name: "ntfy-webhook".to_string(),
|
name: "ntfy-webhook".to_string(),
|
||||||
url: Url::Url(
|
url: Url::Url(
|
||||||
url::Url::parse(
|
url::Url::parse(
|
||||||
format!(
|
format!(
|
||||||
"http://{domain}/{}?auth={ntfy_default_auth_param}",
|
"http://ntfy.{}.svc.cluster.local/rust-web-app?auth={ntfy_default_auth_param}",
|
||||||
self.application.name()
|
namespace.clone()
|
||||||
)
|
)
|
||||||
.as_str(),
|
.as_str(),
|
||||||
)
|
)
|
||||||
.unwrap(),
|
.unwrap(),
|
||||||
),
|
),
|
||||||
};
|
};
|
||||||
debug!(
|
|
||||||
"ntfy webhook receiver \n{:#?}\nntfy topic: {}",
|
|
||||||
ntfy_receiver.clone(),
|
|
||||||
self.application.name()
|
|
||||||
);
|
|
||||||
alerting_score.receivers.push(Box::new(ntfy_receiver));
|
alerting_score.receivers.push(Box::new(ntfy_receiver));
|
||||||
alerting_score
|
alerting_score
|
||||||
.interpret(&Inventory::empty(), topology)
|
.interpret(&Inventory::empty(), topology)
|
||||||
.await
|
.await
|
||||||
.map_err(|e| e.to_string())?;
|
.map_err(|e| e.to_string())?;
|
||||||
Ok(InstallationOutcome::success_with_details(vec![format!(
|
Ok(())
|
||||||
"ntfy topic: {}",
|
|
||||||
self.application.name()
|
|
||||||
)]))
|
|
||||||
}
|
}
|
||||||
fn name(&self) -> String {
|
fn name(&self) -> String {
|
||||||
"Monitoring".to_string()
|
"Monitoring".to_string()
|
||||||
|
|||||||
@@ -24,8 +24,8 @@ use harmony_types::id::Id;
|
|||||||
#[derive(Clone, Debug)]
|
#[derive(Clone, Debug)]
|
||||||
pub enum ApplicationFeatureStatus {
|
pub enum ApplicationFeatureStatus {
|
||||||
Installing,
|
Installing,
|
||||||
Installed { details: Vec<String> },
|
Installed,
|
||||||
Failed { message: String },
|
Failed { details: String },
|
||||||
}
|
}
|
||||||
|
|
||||||
pub trait Application: std::fmt::Debug + Send + Sync {
|
pub trait Application: std::fmt::Debug + Send + Sync {
|
||||||
@@ -65,32 +65,27 @@ impl<A: Application, T: Topology + std::fmt::Debug> Interpret<T> for Application
|
|||||||
.unwrap();
|
.unwrap();
|
||||||
|
|
||||||
let _ = match feature.ensure_installed(topology).await {
|
let _ = match feature.ensure_installed(topology).await {
|
||||||
Ok(outcome) => {
|
Ok(()) => {
|
||||||
instrumentation::instrument(HarmonyEvent::ApplicationFeatureStateChanged {
|
instrumentation::instrument(HarmonyEvent::ApplicationFeatureStateChanged {
|
||||||
topology: topology.name().into(),
|
topology: topology.name().into(),
|
||||||
application: self.application.name(),
|
application: self.application.name(),
|
||||||
feature: feature.name(),
|
feature: feature.name(),
|
||||||
status: ApplicationFeatureStatus::Installed {
|
status: ApplicationFeatureStatus::Installed,
|
||||||
details: match outcome {
|
|
||||||
InstallationOutcome::Success { details } => details,
|
|
||||||
InstallationOutcome::Noop => vec![],
|
|
||||||
},
|
|
||||||
},
|
|
||||||
})
|
})
|
||||||
.unwrap();
|
.unwrap();
|
||||||
}
|
}
|
||||||
Err(error) => {
|
Err(msg) => {
|
||||||
instrumentation::instrument(HarmonyEvent::ApplicationFeatureStateChanged {
|
instrumentation::instrument(HarmonyEvent::ApplicationFeatureStateChanged {
|
||||||
topology: topology.name().into(),
|
topology: topology.name().into(),
|
||||||
application: self.application.name(),
|
application: self.application.name(),
|
||||||
feature: feature.name(),
|
feature: feature.name(),
|
||||||
status: ApplicationFeatureStatus::Failed {
|
status: ApplicationFeatureStatus::Failed {
|
||||||
message: error.to_string(),
|
details: msg.clone(),
|
||||||
},
|
},
|
||||||
})
|
})
|
||||||
.unwrap();
|
.unwrap();
|
||||||
return Err(InterpretError::new(format!(
|
return Err(InterpretError::new(format!(
|
||||||
"Application Interpret failed to install feature : {error}"
|
"Application Interpret failed to install feature : {msg}"
|
||||||
)));
|
)));
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -10,7 +10,7 @@ use dockerfile_builder::Dockerfile;
|
|||||||
use dockerfile_builder::instruction::{CMD, COPY, ENV, EXPOSE, FROM, RUN, USER, WORKDIR};
|
use dockerfile_builder::instruction::{CMD, COPY, ENV, EXPOSE, FROM, RUN, USER, WORKDIR};
|
||||||
use dockerfile_builder::instruction_builder::CopyBuilder;
|
use dockerfile_builder::instruction_builder::CopyBuilder;
|
||||||
use futures_util::StreamExt;
|
use futures_util::StreamExt;
|
||||||
use log::{debug, error, info, log_enabled, trace, warn};
|
use log::{debug, info, log_enabled};
|
||||||
use serde::Serialize;
|
use serde::Serialize;
|
||||||
use tar::{Builder, Header};
|
use tar::{Builder, Header};
|
||||||
use walkdir::WalkDir;
|
use walkdir::WalkDir;
|
||||||
@@ -162,7 +162,7 @@ impl RustWebapp {
|
|||||||
&self,
|
&self,
|
||||||
image_name: &str,
|
image_name: &str,
|
||||||
) -> Result<String, Box<dyn std::error::Error>> {
|
) -> Result<String, Box<dyn std::error::Error>> {
|
||||||
info!("Generating Dockerfile for '{}'", self.name);
|
debug!("Generating Dockerfile for '{}'", self.name);
|
||||||
let dockerfile = self.get_or_build_dockerfile();
|
let dockerfile = self.get_or_build_dockerfile();
|
||||||
let quiet = !log_enabled!(log::Level::Debug);
|
let quiet = !log_enabled!(log::Level::Debug);
|
||||||
match dockerfile
|
match dockerfile
|
||||||
@@ -194,41 +194,8 @@ impl RustWebapp {
|
|||||||
Some(body_full(tar_data.into())),
|
Some(body_full(tar_data.into())),
|
||||||
);
|
);
|
||||||
|
|
||||||
while let Some(mut msg) = image_build_stream.next().await {
|
while let Some(msg) = image_build_stream.next().await {
|
||||||
trace!("Got bollard msg {msg:?}");
|
debug!("Message: {msg:?}");
|
||||||
match msg {
|
|
||||||
Ok(mut msg) => {
|
|
||||||
if let Some(progress) = msg.progress_detail {
|
|
||||||
info!(
|
|
||||||
"Build progress {}/{}",
|
|
||||||
progress.current.unwrap_or(0),
|
|
||||||
progress.total.unwrap_or(0)
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
if let Some(mut log) = msg.stream {
|
|
||||||
if log.ends_with('\n') {
|
|
||||||
log.pop();
|
|
||||||
if log.ends_with('\r') {
|
|
||||||
log.pop();
|
|
||||||
}
|
|
||||||
}
|
|
||||||
info!("{log}");
|
|
||||||
}
|
|
||||||
|
|
||||||
if let Some(error) = msg.error {
|
|
||||||
warn!("Build error : {error:?}");
|
|
||||||
}
|
|
||||||
|
|
||||||
if let Some(error) = msg.error_detail {
|
|
||||||
warn!("Build error : {error:?}");
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Err(e) => {
|
|
||||||
error!("Build failed : {e}");
|
|
||||||
return Err(format!("Build failed : {e}").into());
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(image_name.to_string())
|
Ok(image_name.to_string())
|
||||||
@@ -257,7 +224,6 @@ impl RustWebapp {
|
|||||||
".harmony_generated",
|
".harmony_generated",
|
||||||
"harmony",
|
"harmony",
|
||||||
"node_modules",
|
"node_modules",
|
||||||
"Dockerfile.harmony",
|
|
||||||
];
|
];
|
||||||
let mut entries: Vec<_> = WalkDir::new(project_root)
|
let mut entries: Vec<_> = WalkDir::new(project_root)
|
||||||
.into_iter()
|
.into_iter()
|
||||||
|
|||||||
@@ -1,209 +0,0 @@
|
|||||||
use std::sync::Arc;
|
|
||||||
|
|
||||||
use async_trait::async_trait;
|
|
||||||
use harmony_types::id::Id;
|
|
||||||
use kube::{CustomResource, api::ObjectMeta};
|
|
||||||
use schemars::JsonSchema;
|
|
||||||
use serde::{Deserialize, Serialize};
|
|
||||||
|
|
||||||
use crate::{
|
|
||||||
data::Version,
|
|
||||||
interpret::{Interpret, InterpretError, InterpretName, InterpretStatus, Outcome},
|
|
||||||
inventory::Inventory,
|
|
||||||
score::Score,
|
|
||||||
topology::{K8sclient, Topology, k8s::K8sClient},
|
|
||||||
};
|
|
||||||
|
|
||||||
#[derive(Clone, Debug, Serialize)]
|
|
||||||
pub struct ClusterIssuerScore {
|
|
||||||
email: String,
|
|
||||||
server: String,
|
|
||||||
issuer_name: String,
|
|
||||||
namespace: String,
|
|
||||||
}
|
|
||||||
|
|
||||||
impl<T: Topology + K8sclient> Score<T> for ClusterIssuerScore {
|
|
||||||
fn name(&self) -> String {
|
|
||||||
"ClusterIssuerScore".to_string()
|
|
||||||
}
|
|
||||||
|
|
||||||
#[doc(hidden)]
|
|
||||||
fn create_interpret(&self) -> Box<dyn Interpret<T>> {
|
|
||||||
Box::new(ClusterIssuerInterpret {
|
|
||||||
score: self.clone(),
|
|
||||||
})
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Debug, Clone)]
|
|
||||||
pub struct ClusterIssuerInterpret {
|
|
||||||
score: ClusterIssuerScore,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[async_trait]
|
|
||||||
impl<T: Topology + K8sclient> Interpret<T> for ClusterIssuerInterpret {
|
|
||||||
async fn execute(
|
|
||||||
&self,
|
|
||||||
_inventory: &Inventory,
|
|
||||||
topology: &T,
|
|
||||||
) -> Result<Outcome, InterpretError> {
|
|
||||||
self.apply_cluster_issuer(topology.k8s_client().await.unwrap())
|
|
||||||
.await
|
|
||||||
}
|
|
||||||
|
|
||||||
fn get_name(&self) -> InterpretName {
|
|
||||||
InterpretName::Custom("ClusterIssuer")
|
|
||||||
}
|
|
||||||
|
|
||||||
fn get_version(&self) -> Version {
|
|
||||||
todo!()
|
|
||||||
}
|
|
||||||
|
|
||||||
fn get_status(&self) -> InterpretStatus {
|
|
||||||
todo!()
|
|
||||||
}
|
|
||||||
|
|
||||||
fn get_children(&self) -> Vec<Id> {
|
|
||||||
todo!()
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
impl ClusterIssuerInterpret {
|
|
||||||
async fn validate_cert_manager(
|
|
||||||
&self,
|
|
||||||
client: &Arc<K8sClient>,
|
|
||||||
) -> Result<Outcome, InterpretError> {
|
|
||||||
let cert_manager = "cert-manager".to_string();
|
|
||||||
let operator_namespace = "openshift-operators".to_string();
|
|
||||||
match client
|
|
||||||
.get_deployment(&cert_manager, Some(&operator_namespace))
|
|
||||||
.await
|
|
||||||
{
|
|
||||||
Ok(Some(deployment)) => {
|
|
||||||
if let Some(status) = deployment.status {
|
|
||||||
let ready_count = status.ready_replicas.unwrap_or(0);
|
|
||||||
if ready_count >= 1 {
|
|
||||||
return Ok(Outcome::success(format!(
|
|
||||||
"'{}' is ready with {} replica(s).",
|
|
||||||
&cert_manager, ready_count
|
|
||||||
)));
|
|
||||||
} else {
|
|
||||||
return Err(InterpretError::new(
|
|
||||||
"cert-manager operator not ready in cluster".to_string(),
|
|
||||||
));
|
|
||||||
}
|
|
||||||
} else {
|
|
||||||
Err(InterpretError::new(format!(
|
|
||||||
"failed to get deployment status {} in ns {}",
|
|
||||||
&cert_manager, &operator_namespace
|
|
||||||
)))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
Ok(None) => Err(InterpretError::new(format!(
|
|
||||||
"Deployment '{}' not found in namespace '{}'.",
|
|
||||||
&cert_manager, &operator_namespace
|
|
||||||
))),
|
|
||||||
Err(e) => Err(InterpretError::new(format!(
|
|
||||||
"Failed to query for deployment '{}': {}",
|
|
||||||
&cert_manager, e
|
|
||||||
))),
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
fn build_cluster_issuer(&self) -> Result<ClusterIssuer, InterpretError> {
|
|
||||||
let issuer_name = &self.score.issuer_name;
|
|
||||||
let email = &self.score.email;
|
|
||||||
let server = &self.score.server;
|
|
||||||
let namespace = &self.score.namespace;
|
|
||||||
let cluster_issuer = ClusterIssuer {
|
|
||||||
metadata: ObjectMeta {
|
|
||||||
name: Some(issuer_name.to_string()),
|
|
||||||
namespace: Some(namespace.to_string()),
|
|
||||||
..Default::default()
|
|
||||||
},
|
|
||||||
spec: ClusterIssuerSpec {
|
|
||||||
acme: AcmeSpec {
|
|
||||||
email: email.to_string(),
|
|
||||||
private_key_secret_ref: PrivateKeySecretRef {
|
|
||||||
name: issuer_name.to_string(),
|
|
||||||
},
|
|
||||||
server: server.to_string(),
|
|
||||||
solvers: vec![SolverSpec {
|
|
||||||
http01: Some(Http01Solver {
|
|
||||||
ingress: Http01Ingress {
|
|
||||||
class: "nginx".to_string(),
|
|
||||||
},
|
|
||||||
}),
|
|
||||||
}],
|
|
||||||
},
|
|
||||||
},
|
|
||||||
};
|
|
||||||
|
|
||||||
Ok(cluster_issuer)
|
|
||||||
}
|
|
||||||
|
|
||||||
pub async fn apply_cluster_issuer(
|
|
||||||
&self,
|
|
||||||
client: Arc<K8sClient>,
|
|
||||||
) -> Result<Outcome, InterpretError> {
|
|
||||||
let namespace = self.score.namespace.clone();
|
|
||||||
self.validate_cert_manager(&client).await?;
|
|
||||||
let cluster_issuer = self.build_cluster_issuer().unwrap();
|
|
||||||
client
|
|
||||||
.apply_yaml(
|
|
||||||
&serde_yaml::to_value(cluster_issuer).unwrap(),
|
|
||||||
Some(&namespace),
|
|
||||||
)
|
|
||||||
.await?;
|
|
||||||
Ok(Outcome::success(format!(
|
|
||||||
"successfully deployed cluster operator: {} in namespace: {}",
|
|
||||||
self.score.issuer_name, self.score.namespace
|
|
||||||
)))
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(CustomResource, Deserialize, Serialize, Clone, Debug, JsonSchema)]
|
|
||||||
#[kube(
|
|
||||||
group = "cert-manager.io",
|
|
||||||
version = "v1",
|
|
||||||
kind = "ClusterIssuer",
|
|
||||||
plural = "clusterissuers"
|
|
||||||
)]
|
|
||||||
#[serde(rename_all = "camelCase")]
|
|
||||||
pub struct ClusterIssuerSpec {
|
|
||||||
pub acme: AcmeSpec,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Deserialize, Serialize, Clone, Debug, JsonSchema)]
|
|
||||||
#[serde(rename_all = "camelCase")]
|
|
||||||
pub struct AcmeSpec {
|
|
||||||
pub email: String,
|
|
||||||
pub private_key_secret_ref: PrivateKeySecretRef,
|
|
||||||
pub server: String,
|
|
||||||
pub solvers: Vec<SolverSpec>,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Deserialize, Serialize, Clone, Debug, JsonSchema)]
|
|
||||||
#[serde(rename_all = "camelCase")]
|
|
||||||
pub struct PrivateKeySecretRef {
|
|
||||||
pub name: String,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Deserialize, Serialize, Clone, Debug, JsonSchema)]
|
|
||||||
#[serde(rename_all = "camelCase")]
|
|
||||||
pub struct SolverSpec {
|
|
||||||
pub http01: Option<Http01Solver>,
|
|
||||||
// Other solver types (e.g., dns01) would go here as Options
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Deserialize, Serialize, Clone, Debug, JsonSchema)]
|
|
||||||
#[serde(rename_all = "camelCase")]
|
|
||||||
pub struct Http01Solver {
|
|
||||||
pub ingress: Http01Ingress,
|
|
||||||
}
|
|
||||||
|
|
||||||
#[derive(Deserialize, Serialize, Clone, Debug, JsonSchema)]
|
|
||||||
#[serde(rename_all = "camelCase")]
|
|
||||||
pub struct Http01Ingress {
|
|
||||||
pub class: String,
|
|
||||||
}
|
|
||||||
@@ -1,6 +1,5 @@
|
|||||||
use std::{collections::HashMap, str::FromStr};
|
use std::{collections::HashMap, str::FromStr};
|
||||||
|
|
||||||
use harmony_macros::hurl;
|
|
||||||
use non_blank_string_rs::NonBlankString;
|
use non_blank_string_rs::NonBlankString;
|
||||||
use serde::Serialize;
|
use serde::Serialize;
|
||||||
use url::Url;
|
use url::Url;
|
||||||
@@ -34,7 +33,7 @@ impl<T: Topology + HelmCommand> Score<T> for CertManagerHelmScore {
|
|||||||
install_only: true,
|
install_only: true,
|
||||||
repository: Some(HelmRepository::new(
|
repository: Some(HelmRepository::new(
|
||||||
"jetstack".to_string(),
|
"jetstack".to_string(),
|
||||||
hurl!("https://charts.jetstack.io"),
|
Url::parse("https://charts.jetstack.io").unwrap(),
|
||||||
true,
|
true,
|
||||||
)),
|
)),
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,3 +1,2 @@
|
|||||||
pub mod cluster_issuer;
|
|
||||||
mod helm;
|
mod helm;
|
||||||
pub use helm::*;
|
pub use helm::*;
|
||||||
|
|||||||
@@ -69,14 +69,17 @@ impl DhcpInterpret {
|
|||||||
|
|
||||||
dhcp_server.set_pxe_options(pxe_options).await?;
|
dhcp_server.set_pxe_options(pxe_options).await?;
|
||||||
|
|
||||||
Ok(Outcome::success(format!(
|
Ok(Outcome::new(
|
||||||
"Dhcp Interpret Set next boot to [{:?}], boot_filename to [{:?}], filename to [{:?}], filename64 to [{:?}], filenameipxe to [:{:?}]",
|
InterpretStatus::SUCCESS,
|
||||||
self.score.boot_filename,
|
format!(
|
||||||
self.score.boot_filename,
|
"Dhcp Interpret Set next boot to [{:?}], boot_filename to [{:?}], filename to [{:?}], filename64 to [{:?}], filenameipxe to [:{:?}]",
|
||||||
self.score.filename,
|
self.score.boot_filename,
|
||||||
self.score.filename64,
|
self.score.boot_filename,
|
||||||
self.score.filenameipxe
|
self.score.filename,
|
||||||
)))
|
self.score.filename64,
|
||||||
|
self.score.filenameipxe
|
||||||
|
),
|
||||||
|
))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -119,7 +122,8 @@ impl<T: Topology + DhcpServer> Interpret<T> for DhcpInterpret {
|
|||||||
|
|
||||||
topology.commit_config().await?;
|
topology.commit_config().await?;
|
||||||
|
|
||||||
Ok(Outcome::success(
|
Ok(Outcome::new(
|
||||||
|
InterpretStatus::SUCCESS,
|
||||||
"Dhcp Interpret execution successful".to_string(),
|
"Dhcp Interpret execution successful".to_string(),
|
||||||
))
|
))
|
||||||
}
|
}
|
||||||
@@ -193,10 +197,10 @@ impl DhcpHostBindingInterpret {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(Outcome::success(format!(
|
Ok(Outcome::new(
|
||||||
"Dhcp Interpret registered {} entries",
|
InterpretStatus::SUCCESS,
|
||||||
number_new_entries
|
format!("Dhcp Interpret registered {} entries", number_new_entries),
|
||||||
)))
|
))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -232,9 +236,12 @@ impl<T: DhcpServer> Interpret<T> for DhcpHostBindingInterpret {
|
|||||||
|
|
||||||
topology.commit_config().await?;
|
topology.commit_config().await?;
|
||||||
|
|
||||||
Ok(Outcome::success(format!(
|
Ok(Outcome::new(
|
||||||
"Dhcp Host Binding Interpret execution successful on {} hosts",
|
InterpretStatus::SUCCESS,
|
||||||
self.score.host_binding.len()
|
format!(
|
||||||
)))
|
"Dhcp Host Binding Interpret execution successful on {} hosts",
|
||||||
|
self.score.host_binding.len()
|
||||||
|
),
|
||||||
|
))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -55,7 +55,8 @@ impl DnsInterpret {
|
|||||||
dns.register_dhcp_leases(register).await?;
|
dns.register_dhcp_leases(register).await?;
|
||||||
}
|
}
|
||||||
|
|
||||||
Ok(Outcome::success(
|
Ok(Outcome::new(
|
||||||
|
InterpretStatus::SUCCESS,
|
||||||
"DNS Interpret execution successfull".to_string(),
|
"DNS Interpret execution successfull".to_string(),
|
||||||
))
|
))
|
||||||
}
|
}
|
||||||
@@ -67,10 +68,13 @@ impl DnsInterpret {
|
|||||||
let entries = &self.score.dns_entries;
|
let entries = &self.score.dns_entries;
|
||||||
dns_server.ensure_hosts_registered(entries.clone()).await?;
|
dns_server.ensure_hosts_registered(entries.clone()).await?;
|
||||||
|
|
||||||
Ok(Outcome::success(format!(
|
Ok(Outcome::new(
|
||||||
"DnsInterpret registered {} hosts successfully",
|
InterpretStatus::SUCCESS,
|
||||||
entries.len()
|
format!(
|
||||||
)))
|
"DnsInterpret registered {} hosts successfully",
|
||||||
|
entries.len()
|
||||||
|
),
|
||||||
|
))
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -107,7 +111,8 @@ impl<T: Topology + DnsServer> Interpret<T> for DnsInterpret {
|
|||||||
|
|
||||||
topology.commit_config().await?;
|
topology.commit_config().await?;
|
||||||
|
|
||||||
Ok(Outcome::success(
|
Ok(Outcome::new(
|
||||||
|
InterpretStatus::SUCCESS,
|
||||||
"Dns Interpret execution successful".to_string(),
|
"Dns Interpret execution successful".to_string(),
|
||||||
))
|
))
|
||||||
}
|
}
|
||||||
|
|||||||
Some files were not shown because too many files have changed in this diff Show More
Reference in New Issue
Block a user