Skip to content

Stop deleting chelsio addresses during uninstall #2953

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
smklein merged 1 commit into from
Apr 30, 2023
Merged

Stop deleting chelsio addresses during uninstall #2953

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 1 addition & 10 deletions sled-hardware/src/cleanup.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,11 @@

use anyhow::Error;
use futures::stream::{self, StreamExt, TryStreamExt};
use illumos_utils::dladm::Dladm;
use illumos_utils::dladm::BOOTSTRAP_ETHERSTUB_NAME;
use illumos_utils::dladm::BOOTSTRAP_ETHERSTUB_VNIC_NAME;
use illumos_utils::dladm::UNDERLAY_ETHERSTUB_NAME;
use illumos_utils::dladm::UNDERLAY_ETHERSTUB_VNIC_NAME;
use illumos_utils::dladm::{Dladm, VnicSource};
use illumos_utils::link::LinkKind;
use illumos_utils::opte;
use illumos_utils::zone::IPADM;
Expand All @@ -30,14 +30,6 @@ pub fn delete_bootstrap_addresses(log: &Logger) -> Result<(), Error> {
delete_addresses_matching_prefixes(log, &[bootstrap_prefix])
}

fn delete_chelsio_addresses(log: &Logger) -> Result<(), Error> {
let prefixes = crate::underlay::find_chelsio_links()?
.into_iter()
.map(|link| format!("{}/", link.name()))
.collect::<Vec<_>>();
delete_addresses_matching_prefixes(log, &prefixes)
}

fn delete_addresses_matching_prefixes(
log: &Logger,
prefixes: &[String],
Expand Down Expand Up @@ -112,7 +104,6 @@ pub async fn delete_omicron_vnics(log: &Logger) -> Result<(), Error> {
pub async fn cleanup_networking_resources(log: &Logger) -> Result<(), Error> {
delete_underlay_addresses(log)?;
delete_bootstrap_addresses(log)?;
delete_chelsio_addresses(log)?;
delete_omicron_vnics(log).await?;
delete_etherstub(log)?;
opte::delete_all_xde_devices(log)?;
Expand Down