github/kata-containers
1
0
Fork 2
mirror of https://github.com/kata-containers/kata-containers.git synced 2025-09-20 08:18:24 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #8966 from microsoft/danmihai1/k8s-sandbox-vcpus-allocation

Browse Source 
genpolicy: ignore empty YAML as input
This commit is contained in:
Dan Mihai
2024-02-01 13:51:02 -08:00
committed by GitHub
parent 8f9c92c0ee 09ea0eed9d
commit 6f1062b5d6
1 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
src/tools/genpolicy/src/policy.rs
View File

@@ -374,28 +374,29 @@ impl AgentPolicy {
for document in serde_yaml::Deserializer::from_str(&yaml_contents) { for document in serde_yaml::Deserializer::from_str(&yaml_contents) {
let doc_mapping = Value::deserialize(document)?; let doc_mapping = Value::deserialize(document)?;
let yaml_string = serde_yaml::to_string(&doc_mapping)?; if doc_mapping != Value::Null {
let yaml_string = serde_yaml::to_string(&doc_mapping)?;
let silent = config.silent_unsupported_fields;
let (mut resource, kind) = yaml::new_k8s_resource(&yaml_string, silent)?;
resource.init(config.use_cache, &doc_mapping, silent).await;
let silent = config.silent_unsupported_fields; // ConfigMap and Secret documents contain additional input for policy generation.
let (mut resource, kind) = yaml::new_k8s_resource(&yaml_string, silent)?; if kind.eq("ConfigMap") {
resource.init(config.use_cache, &doc_mapping, silent).await; let config_map: config_map::ConfigMap = serde_yaml::from_str(&yaml_string)?;
debug!("{:#?}", &config_map);
config_maps.push(config_map);
} else if kind.eq("Secret") {
let secret: secret::Secret = serde_yaml::from_str(&yaml_string)?;
debug!("{:#?}", &secret);
secrets.push(secret);
}
// ConfigMap and Secret documents contain additional input for policy generation. // Although copies of ConfigMap and Secret resources get created above,
if kind.eq("ConfigMap") { // those resources still have to be present in the resources vector, because
let config_map: config_map::ConfigMap = serde_yaml::from_str(&yaml_string)?; // the elements of this vector will eventually be used to create the output
debug!("{:#?}", &config_map); // YAML file.
config_maps.push(config_map); resources.push(resource);
} else if kind.eq("Secret") {
let secret: secret::Secret = serde_yaml::from_str(&yaml_string)?;
debug!("{:#?}", &secret);
secrets.push(secret);
} }
// Although copies of ConfigMap and Secret resources get created above,
// those resources still have to be present in the resources vector, because
// the elements of this vector will eventually be used to create the output
// YAML file.
resources.push(resource);
} }
let settings = settings::Settings::new(&config.json_settings_path); let settings = settings::Settings::new(&config.json_settings_path);