From 05a9028969b9d21dd7d0ddc883f6490243017716 Mon Sep 17 00:00:00 2001 From: Ed Bartosh Date: Wed, 4 Sep 2019 14:31:49 +0300 Subject: [PATCH] Use container annotations when creating containers Signed-off-by: Ed Bartosh --- pkg/server/container_create_unix.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/pkg/server/container_create_unix.go b/pkg/server/container_create_unix.go index 81b23943a..718806c04 100644 --- a/pkg/server/container_create_unix.go +++ b/pkg/server/container_create_unix.go @@ -210,6 +210,11 @@ func (c *criService) containerSpec(id string, sandboxID string, sandboxPid uint3 specOpts = append(specOpts, customopts.WithAnnotation(pKey, pValue)) } + for pKey, pValue := range getPassthroughAnnotations(config.Annotations, + ociRuntime.ContainerAnnotations) { + specOpts = append(specOpts, customopts.WithAnnotation(pKey, pValue)) + } + specOpts = append(specOpts, customopts.WithOOMScoreAdj(config, c.config.RestrictOOMScoreAdj), customopts.WithPodNamespaces(securityContext, sandboxPid),