Merge pull request #5372 from bergwolf/github/backport-3.0

backport fix for 3.0.0 release
This commit is contained in:
Peng Tao 2022-10-08 10:33:21 +08:00 committed by GitHub
commit 8b0231bec8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions

View File

@ -10,9 +10,9 @@ use kata_types::container::ContainerType;
#[derive(thiserror::Error, Debug)]
pub enum Error {
/// unknow container type
#[error("unknow container type {0}")]
UnknowContainerType(String),
/// unknown container type
#[error("unknown container type {0}")]
UnknownContainerType(String),
/// missing sandboxID
#[error("missing sandboxID")]
MissingSandboxID,
@ -56,7 +56,7 @@ pub fn get_contaier_type(spec: &oci::Spec) -> Result<ContainerType, Error> {
"sandbox" => return Ok(ContainerType::PodSandbox),
"podsandbox" => return Ok(ContainerType::PodSandbox),
"container" => return Ok(ContainerType::PodContainer),
_ => return Err(Error::UnknowContainerType(type_value.clone())),
_ => return Err(Error::UnknownContainerType(type_value.clone())),
}
}
}

View File

@ -209,7 +209,7 @@ externals:
gperf:
description: "GNU gperf is a perfect hash function generator"
url: "https://ftpmirror.gnu.org/gnu/gperf"
url: "http://ftp.gnu.org/pub/gnu/gperf/"
version: "3.1"
kubernetes: