github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-13 12:59:36 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #11728 from BbolroC/fix-sealed-secret-volume

Browse Source 
runtime-rs: Adjust path for sealed secret mount check
This commit is contained in:
Hyounggyu Choi
2025-09-02 16:57:33 +02:00
committed by GitHub
parent 9cc1c76ade 65fdb18c96
commit 150c90e32a
2 changed files with 4 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/runtime-rs/crates/resource/src/share_fs/mod.rs
View File

@@ -38,7 +38,7 @@ const INLINE_VIRTIO_FS: &str = "inline-virtio-fs";
const KATA_HOST_SHARED_DIR: &str = "/run/kata-containers/shared/sandboxes/"; const KATA_HOST_SHARED_DIR: &str = "/run/kata-containers/shared/sandboxes/";
/// share fs (for example virtio-fs) mount path in the guest /// share fs (for example virtio-fs) mount path in the guest
const KATA_GUEST_SHARE_DIR: &str = "/run/kata-containers/shared/containers/"; pub const KATA_GUEST_SHARE_DIR: &str = "/run/kata-containers/shared/containers/";
pub(crate) const DEFAULT_KATA_GUEST_SANDBOX_DIR: &str = "/run/kata-containers/sandbox/"; pub(crate) const DEFAULT_KATA_GUEST_SANDBOX_DIR: &str = "/run/kata-containers/sandbox/";

17
src/runtime-rs/crates/resource/src/volume/share_fs_volume.rs
View File

@@ -31,8 +31,7 @@ use tokio::{
use walkdir::WalkDir; use walkdir::WalkDir;
use super::Volume; use super::Volume;
use crate::share_fs::DEFAULT_KATA_GUEST_SANDBOX_DIR; use crate::share_fs::KATA_GUEST_SHARE_DIR;
use crate::share_fs::PASSTHROUGH_FS_DIR;
use crate::share_fs::{MountedInfo, ShareFs, ShareFsVolumeConfig}; use crate::share_fs::{MountedInfo, ShareFs, ShareFsVolumeConfig};
use kata_types::{ use kata_types::{
k8s::{is_configmap, is_downward_api, is_projected, is_secret}, k8s::{is_configmap, is_downward_api, is_projected, is_secret},
@@ -286,12 +285,7 @@ impl ShareFsVolume {
// If the mount source is a file, we can copy it to the sandbox // If the mount source is a file, we can copy it to the sandbox
if src.is_file() { if src.is_file() {
// This is where we set the value for the guest path // This is where we set the value for the guest path
let dest = [ let dest = [KATA_GUEST_SHARE_DIR, file_name.clone().as_str()].join("/");
DEFAULT_KATA_GUEST_SANDBOX_DIR,
PASSTHROUGH_FS_DIR,
file_name.clone().as_str(),
]
.join("/");
debug!( debug!(
sl!(), sl!(),
@@ -347,12 +341,7 @@ impl ShareFsVolume {
info!(sl!(), "copying directory {:?} to guest", &source_path); info!(sl!(), "copying directory {:?} to guest", &source_path);
// create target path in guest // create target path in guest
let dest_dir = [ let dest_dir = [KATA_GUEST_SHARE_DIR, file_name.clone().as_str()].join("/");
DEFAULT_KATA_GUEST_SANDBOX_DIR,
PASSTHROUGH_FS_DIR,
file_name.clone().as_str(),
]
.join("/");
// create directory // create directory
let dir_metadata = std::fs::metadata(src.clone()) let dir_metadata = std::fs::metadata(src.clone())