github/kata-containers
1
0
Fork 1
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-07-22 11:13:22 +00:00
Code Issues Projects Releases Wiki Activity

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

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/libs/kata-sys-util/src/spec.rs
View File

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

2
versions.yaml
View File

@ -209,7 +209,7 @@ externals:
gperf: gperf:
description: "GNU gperf is a perfect hash function generator" 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" version: "3.1"
kubernetes: kubernetes: