diff options
| author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2019-11-15 19:41:39 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-11-15 19:41:39 +0100 |
| commit | 51c08f3be6176d66097a2289f7b4174b79339427 (patch) | |
| tree | fa4762fc163ff26be1774b987e707fb5f3bcecee /pkg/adapter/pods.go | |
| parent | d7ed9fa188b502e155ddbf6b626cf8fbfc92bbb8 (diff) | |
| parent | f920f932324b87ec34a2af5cdbed65d5b08df9eb (diff) | |
| download | podman-51c08f3be6176d66097a2289f7b4174b79339427.tar.gz podman-51c08f3be6176d66097a2289f7b4174b79339427.tar.bz2 podman-51c08f3be6176d66097a2289f7b4174b79339427.zip | |
Merge pull request #4368 from haircommander/pod-annotations
Add pod annotations to container
Diffstat (limited to 'pkg/adapter/pods.go')
| -rw-r--r-- | pkg/adapter/pods.go | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/pkg/adapter/pods.go b/pkg/adapter/pods.go index eafcc5e9b..2003b55ad 100644 --- a/pkg/adapter/pods.go +++ b/pkg/adapter/pods.go @@ -17,6 +17,7 @@ import ( "github.com/containers/libpod/libpod" "github.com/containers/libpod/libpod/image" "github.com/containers/libpod/pkg/adapter/shortcuts" + ann "github.com/containers/libpod/pkg/annotations" ns "github.com/containers/libpod/pkg/namespaces" createconfig "github.com/containers/libpod/pkg/spec" "github.com/containers/libpod/pkg/util" @@ -600,7 +601,7 @@ func (r *LocalRuntime) PlayKubeYAML(ctx context.Context, c *cliconfig.KubePlayVa if err != nil { return nil, err } - createConfig, err := kubeContainerToCreateConfig(ctx, container, r.Runtime, newImage, namespaces, volumes, pod.ID()) + createConfig, err := kubeContainerToCreateConfig(ctx, container, r.Runtime, newImage, namespaces, volumes, pod.ID(), podInfraID) if err != nil { return nil, err } @@ -719,7 +720,7 @@ func setupSecurityContext(securityConfig *createconfig.SecurityConfig, userConfi } // kubeContainerToCreateConfig takes a v1.Container and returns a createconfig describing a container -func kubeContainerToCreateConfig(ctx context.Context, containerYAML v1.Container, runtime *libpod.Runtime, newImage *image.Image, namespaces map[string]string, volumes map[string]string, podID string) (*createconfig.CreateConfig, error) { +func kubeContainerToCreateConfig(ctx context.Context, containerYAML v1.Container, runtime *libpod.Runtime, newImage *image.Image, namespaces map[string]string, volumes map[string]string, podID, infraID string) (*createconfig.CreateConfig, error) { var ( containerConfig createconfig.CreateConfig pidConfig createconfig.PidConfig @@ -800,6 +801,13 @@ func kubeContainerToCreateConfig(ctx context.Context, containerYAML v1.Container // Set default environment variables and incorporate data from image, if necessary envs := shared.EnvVariablesFromData(imageData) + annotations := make(map[string]string) + if infraID != "" { + annotations[ann.SandboxID] = infraID + annotations[ann.ContainerType] = ann.ContainerTypeContainer + } + containerConfig.Annotations = annotations + // Environment Variables for _, e := range containerYAML.Env { envs[e.Name] = e.Value |