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

fix(host_network): skip configuration for host with only 1 interface/port #185

Merged
letian merged 14 commits from fix-bond-for-one-interface into master 2025-11-06 00:07:21 +00:00
Conversation 1 Commits 14 Files Changed 1 +135 -250
5 changed files with 135 additions and 250 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 1d5ef24844 - Show all commits

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

@@ -179,7 +179,7 @@ impl OpenShiftNmStateNetworkManager {
}),
link_aggregation: Some(nmstate::BondSpec {
mode: "802.3ad".to_string(),
port: bond_ports,
ports: bond_ports,
..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")]
pub struct BondSpec {
pub mode: String,
pub port: Vec<String>,
pub ports: Vec<String>,
#[serde(skip_serializing_if = "Option::is_none")]
pub options: Option<BTreeMap<String, Value>>,
}
@@ -477,7 +477,7 @@ pub struct LinuxBridgeSpec {
#[serde(skip_serializing_if = "Option::is_none")]
pub options: Option<LinuxBridgeOptions>,
#[serde(skip_serializing_if = "Option::is_none")]
pub port: Option<Vec<LinuxBridgePort>>,
pub ports: Option<Vec<LinuxBridgePort>>,
}
#[derive(Deserialize, Serialize, Clone, Debug, Default, JsonSchema)]
@@ -548,7 +548,7 @@ pub struct OvsBridgeSpec {
#[serde(skip_serializing_if = "Option::is_none")]
pub options: Option<OvsBridgeOptions>,
#[serde(skip_serializing_if = "Option::is_none")]
pub port: Option<Vec<OvsPortSpec>>,
pub ports: Option<Vec<OvsPortSpec>>,
}
#[derive(Deserialize, Serialize, Clone, Debug, Default, JsonSchema)]