Merge pull request kata-containers#10426 from 3u13r/fix/genpolicy/han…

…dle-config-map-binary-data genpolicy: read binaryData value as String
ChengyuZhu6 · Oct 15, 2024 · c371b4e · c371b4e
2 parents f9b7a8a + c06bf2e
commit c371b4e
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/src/tools/genpolicy/src/config_map.rs b/src/tools/genpolicy/src/config_map.rs
@@ -28,8 +28,10 @@ pub struct ConfigMap {
     #[serde(skip_serializing_if = "Option::is_none")]
     pub data: Option<BTreeMap<String, String>>,
 
+    // When parsing a YAML file, binaryData is encoded as base64.
+    // Therefore, this is a BTreeMap<String, String> instead of BTreeMap<String, Vec<u8>>.
     #[serde(skip_serializing_if = "Option::is_none")]
-    pub binaryData: Option<BTreeMap<String, Vec<u8>>>,
+    pub binaryData: Option<BTreeMap<String, String>>,
 
     #[serde(skip_serializing_if = "Option::is_none")]
     immutable: Option<bool>,

diff --git a/tests/integration/kubernetes/runtimeclass_workloads/k8s-policy-configmap.yaml b/tests/integration/kubernetes/runtimeclass_workloads/k8s-policy-configmap.yaml
@@ -11,3 +11,7 @@ data:
   data-1: value-1
   data-2: value-2
   data-3: value-3
+binaryData:
+  bin-data-1: YmluLXZhbHVlLTE=
+  bin-data-2: YmluLXZhbHVlLTI=
+  bin-data-3: YmluLXZhbHVlLTM=