From 9cbf66603c5459be84467ba9de1f9248d082cbdf Mon Sep 17 00:00:00 2001 From: Yuhang Wei Date: Wed, 27 Nov 2024 21:30:17 +0000 Subject: [PATCH 04/11] style: format code Signed-off-by: Yuhang Wei --- KubeOS-Rust/manager/src/sys_mgmt/config.rs | 2 +- KubeOS-Rust/manager/src/sys_mgmt/values.rs | 12 ++++++------ KubeOS-Rust/proxy/src/controller/apiserver_mock.rs | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/KubeOS-Rust/manager/src/sys_mgmt/config.rs b/KubeOS-Rust/manager/src/sys_mgmt/config.rs index a491a429..787d5bbd 100644 --- a/KubeOS-Rust/manager/src/sys_mgmt/config.rs +++ b/KubeOS-Rust/manager/src/sys_mgmt/config.rs @@ -59,7 +59,7 @@ lazy_static! { ); config_map.insert( values::PAM_LIMTS.to_string(), - Box::new(PamLimits{config_path: values::DEFAULT_PAM_LIMITS_PATH.to_string()}) + Box::new(PamLimits { config_path: values::DEFAULT_PAM_LIMITS_PATH.to_string() }) as Box, ); config_map diff --git a/KubeOS-Rust/manager/src/sys_mgmt/values.rs b/KubeOS-Rust/manager/src/sys_mgmt/values.rs index 3236caf3..e1addfa4 100644 --- a/KubeOS-Rust/manager/src/sys_mgmt/values.rs +++ b/KubeOS-Rust/manager/src/sys_mgmt/values.rs @@ -14,17 +14,17 @@ pub const KERNEL_SYSCTL: &str = "kernel.sysctl"; pub const KERNEL_SYSCTL_PERSIST: &str = "kernel.sysctl.persist"; pub const GRUB_CMDLINE_CURRENT: &str = "grub.cmdline.current"; pub const GRUB_CMDLINE_NEXT: &str = "grub.cmdline.next"; -pub const KUBERNETES_KUBELET:&str = "kubernetes.kubelet"; -pub const CONTAINER_CONTAINERD:&str = "container.containerd"; -pub const PAM_LIMTS:&str = "pam.limits"; +pub const KUBERNETES_KUBELET: &str = "kubernetes.kubelet"; +pub const CONTAINER_CONTAINERD: &str = "container.containerd"; +pub const PAM_LIMTS: &str = "pam.limits"; pub const DEFAULT_PROC_PATH: &str = "/proc/sys/"; pub const DEFAULT_KERNEL_CONFIG_PATH: &str = "/etc/sysctl.conf"; pub const DEFAULT_GRUB_CFG_PATH: &str = "/boot/efi/EFI/openEuler/grub.cfg"; pub const DEFAULT_GRUBENV_PATH: &str = "/boot/efi/EFI/openEuler/grubenv"; -pub const DEFAULT_KUBELET_CONFIG_PATH: &str = "/var/lib/kubelet/config.yaml"; -pub const DEFAULT_CONTAINERD_CONFIG_PATH: &str = "/etc/containerd/config.toml"; -pub const DEFAULT_PAM_LIMITS_PATH:&str = "/etc/security/limits.conf"; +pub const DEFAULT_KUBELET_CONFIG_PATH: &str = "/var/lib/kubelet/config.yaml"; +pub const DEFAULT_CONTAINERD_CONFIG_PATH: &str = "/etc/containerd/config.toml"; +pub const DEFAULT_PAM_LIMITS_PATH: &str = "/etc/security/limits.conf"; pub const PERSIST_DIR: &str = "/persist"; pub const ROOTFS_ARCHIVE: &str = "os.tar"; diff --git a/KubeOS-Rust/proxy/src/controller/apiserver_mock.rs b/KubeOS-Rust/proxy/src/controller/apiserver_mock.rs index a96043b6..45949600 100644 --- a/KubeOS-Rust/proxy/src/controller/apiserver_mock.rs +++ b/KubeOS-Rust/proxy/src/controller/apiserver_mock.rs @@ -28,8 +28,8 @@ use kube::{ core::{ListMeta, ObjectList}, Client as KubeClient, Resource, ResourceExt, }; -use serde_json::json; use mockall::mock; +use serde_json::json; use self::mock_error::Error; use super::{ -- 2.39.5 (Apple Git-154)