NationTech/harmony
5
0
Fork 2
Code Issues 37 Pull Requests 17 Actions Packages Projects Releases 1 Wiki Activity

fix(host_network): remove extra fields from bond config to prevent clashes #186

Merged
letian merged 14 commits from fix-bond-config into master 2025-11-11 14:12:57 +00:00
Conversation 0 Commits 14 Files Changed 3 +6 -190
6 changed files with 6 additions and 190 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit c166351d8b - Show all commits

2
harmony/src/infra/network_manager.rs
View File

@@ -179,7 +179,7 @@ impl OpenShiftNmStateNetworkManager {
}), }),
link_aggregation: Some(nmstate::BondSpec { link_aggregation: Some(nmstate::BondSpec {
mode: "802.3ad".to_string(), mode: "802.3ad".to_string(),
ports: bond_ports, port: bond_ports,
..Default::default() ..Default::default()
}), }),
..Default::default() ..Default::default()

6
harmony/src/modules/okd/crd/nmstate.rs
View File

@@ -417,7 +417,7 @@ pub struct EthernetSpec {
#[serde(rename_all = "kebab-case")] #[serde(rename_all = "kebab-case")]
pub struct BondSpec { pub struct BondSpec {
pub mode: String, pub mode: String,
pub ports: Vec<String>, pub port: Vec<String>,
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
pub options: Option<BTreeMap<String, Value>>, pub options: Option<BTreeMap<String, Value>>,
} }
@@ -477,7 +477,7 @@ pub struct LinuxBridgeSpec {
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
pub options: Option<LinuxBridgeOptions>, pub options: Option<LinuxBridgeOptions>,
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
pub ports: Option<Vec<LinuxBridgePort>>, pub port: Option<Vec<LinuxBridgePort>>,
} }
#[derive(Deserialize, Serialize, Clone, Debug, Default, JsonSchema)] #[derive(Deserialize, Serialize, Clone, Debug, Default, JsonSchema)]
@@ -548,7 +548,7 @@ pub struct OvsBridgeSpec {
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
pub options: Option<OvsBridgeOptions>, pub options: Option<OvsBridgeOptions>,
#[serde(skip_serializing_if = "Option::is_none")] #[serde(skip_serializing_if = "Option::is_none")]
pub ports: Option<Vec<OvsPortSpec>>, pub port: Option<Vec<OvsPortSpec>>,
} }
#[derive(Deserialize, Serialize, Clone, Debug, Default, JsonSchema)] #[derive(Deserialize, Serialize, Clone, Debug, Default, JsonSchema)]