Thanks to visit codestin.com
Credit goes to github.com

Skip to content

[1.25] annotations: add OCI runtime specific annotations to the AllowedAnnotions #8090

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-bot merged 3 commits into from
Apr 30, 2024
Merged

[1.25] annotations: add OCI runtime specific annotations to the AllowedAnnotions #8090

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
91af1dd
annotations: add OCI runtime specific annotations to the AllowedAnnot…
haircommander Mar 26, 2024
0586376
fix typo and lints of CVE-2024-3154 fix
haircommander Apr 29, 2024
db3030d
fix test for versions that set inactive-or-failed by default
haircommander Apr 29, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 13 additions & 0 deletions pkg/annotations/annotations.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,4 +60,17 @@ var AllAllowedAnnotations = []string{
TrySkipVolumeSELinuxLabelAnnotation,
CPUCStatesAnnotation,
CPUFreqGovernorAnnotation,
// Keep in sync with
// https://github.com/opencontainers/runc/blob/3db0871f1cf25c7025861ba0d51d25794cb21623/features.go#L67
// Once runc 1.2 is released, we can use the `runc features` command to get this programmatically,
// but we should hardcode these for now to prevent misuse.
"bundle",
"org.systemd.property.",
"org.criu.config",

// Simiarly, keep in sync with
// https://github.com/containers/crun/blob/475a3fd0be/src/libcrun/container.c#L362-L366
"module.wasm.image/variant",
"io.kubernetes.cri.container-type",
"run.oci.",
}
40 changes: 40 additions & 0 deletions test/workloads.bats
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -380,3 +380,43 @@ function check_conmon_fields() {
echo "Zombies: $zombies"
[[ $zombies == 0 ]]
}

@test "test special runtime annotations not allowed" {
if [[ "$TEST_USERNS" == "1" ]]; then
skip "test fails in a user namespace"
fi
if [[ "$CONTAINER_CGROUP_MANAGER" == "cgroupfs" ]]; then
skip "need systemd cgroup manager"
fi
start_crio

jq --arg val "'inactive'" ' .annotations["org.systemd.property.CollectMode"] = $val' \
"$TESTDATA"/sandbox_config.json > "$sboxconfig"

jq --arg val "'inactive'" ' .annotations["org.systemd.property.CollectMode"] = $val' \
"$TESTDATA"/container_sleep.json > "$ctrconfig"

ctr_id=$(crictl run "$ctrconfig" "$sboxconfig")
[[ $(systemctl show --property CollectMode crio-"$ctr_id".scope) != "CollectMode=inactive" ]]
}

@test "test special runtime annotations allowed" {
if [[ "$TEST_USERNS" == "1" ]]; then
skip "test fails in a user namespace"
fi
if [[ "$CONTAINER_CGROUP_MANAGER" == "cgroupfs" ]]; then
skip "need systemd cgroup manager"
fi
create_workload_with_allowed_annotation "org.systemd.property." "org.systemd.property.CollectMode"

start_crio

jq --arg val "'inactive'" ' .annotations["org.systemd.property.CollectMode"] = $val' \
"$TESTDATA"/sandbox_config.json > "$sboxconfig"

jq --arg val "'inactive'" ' .annotations["org.systemd.property.CollectMode"] = $val' \
"$TESTDATA"/container_sleep.json > "$ctrconfig"

ctr_id=$(crictl run "$ctrconfig" "$sboxconfig")
[[ $(systemctl show --property CollectMode crio-"$ctr_id".scope) == "CollectMode=inactive" ]]
}