Merge pull request #4217 from AkihiroSuda/features-unsafe

features: implement returning potentiallyUnsafeConfigAnnotations list
opencontainers · Mar 25, 2024 · 3db0871 · 3db0871
2 parents 18c313b + eefc6ae
commit 3db0871
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/docs/spec-conformance.md b/docs/spec-conformance.md
@@ -9,7 +9,6 @@ Spec version | Feature                                        | PR
 -------------|------------------------------------------------|----------------------------------------------------------
 v1.1.0       | `SECCOMP_FILTER_FLAG_WAIT_KILLABLE_RECV`       | [#3862](/~https://github.com/opencontainers/runc/pull/3862)
 v1.1.0       | `.process.ioPriority`                          | [#3783](/~https://github.com/opencontainers/runc/pull/3783)
-v1.2.0       | Features: `potentiallyUnsafeConfigAnnotations` | TODO
 
 ## Architectures
 

diff --git a/features.go b/features.go
@@ -64,6 +64,11 @@ var featuresCommand = cli.Command{
 					},
 				},
 			},
+			PotentiallyUnsafeConfigAnnotations: []string{
+				"bundle",
+				"org.systemd.property.", // prefix form
+				"org.criu.config",
+			},
 		}
 
 		if seccomp.Enabled {