Skip to content

Commit e8df68e

Browse files
Merge pull request #62662 from wangzhen127/runtime-default
Automatic merge from submit-queue. If you want to cherry-pick this change to another branch, please follow the instructions <a href="https://github.com/kubernetes/community/blob/master/contributors/devel/cherry-picks.md">here</a>. Change seccomp annotation from "docker/default" to "runtime/default" **What this PR does / why we need it**: This PR changes seccomp annotation from "docker/default" to "runtime/default", so that it is can be applied to all kinds of container runtimes. This PR is a followup of [#1963](kubernetes/community#1963). **Which issue(s) this PR fixes** *(optional, in `fixes #<issue number>(, fixes #<issue_number>, ...)` format, will close the issue(s) when PR gets merged)*: Fixes #39845 **Special notes for your reviewer**: **Release note**: ```release-note NONE ``` Kubernetes-commit: a38a02792b55942177ee676a5e1993b18a8b4b0a
2 parents b39a8bd + a4ee189 commit e8df68e

File tree

2 files changed

+46
-39
lines changed

2 files changed

+46
-39
lines changed

Godeps/Godeps.json

Lines changed: 39 additions & 39 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

core/v1/annotation_key_constants.go

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,13 @@ const (
4545
// to one container of a pod.
4646
SeccompContainerAnnotationKeyPrefix string = "container.seccomp.security.alpha.kubernetes.io/"
4747

48+
// SeccompProfileRuntimeDefault represents the default seccomp profile used by container runtime.
49+
SeccompProfileRuntimeDefault string = "runtime/default"
50+
51+
// DeprecatedSeccompProfileDockerDefault represents the default seccomp profile used by docker.
52+
// This is now deprecated and should be replaced by SeccompProfileRuntimeDefault.
53+
DeprecatedSeccompProfileDockerDefault string = "docker/default"
54+
4855
// PreferAvoidPodsAnnotationKey represents the key of preferAvoidPods data (json serialized)
4956
// in the Annotations of a Node.
5057
PreferAvoidPodsAnnotationKey string = "scheduler.alpha.kubernetes.io/preferAvoidPods"

0 commit comments

Comments
 (0)