opensource/podman
1
0
Fork 0
mirror of https://github.com/containers/podman.git synced 2025-08-06 19:44:14 +08:00
Code Issues Packages Projects Releases Wiki Activity

Handle annotations passed in via the client

Browse Source 
Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
This commit is contained in:
Daniel J Walsh
2020-04-20 17:28:45 -04:00
parent 64f774866a
commit 75fdb753dd
1 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
pkg/specgen/generate/container.go
View File

@ -64,6 +64,16 @@ func CompleteSpec(ctx context.Context, r *libpod.Runtime, s *specgen.SpecGenerat
} }
// annotations // annotations
// Add annotations from the image
annotations, err := newImage.Annotations(ctx)
if err != nil {
return err
}
for k, v := range annotations {
annotations[k] = v
}
// in the event this container is in a pod, and the pod has an infra container // in the event this container is in a pod, and the pod has an infra container
// we will want to configure it as a type "container" instead defaulting to // we will want to configure it as a type "container" instead defaulting to
// the behavior of a "sandbox" container // the behavior of a "sandbox" container
@ -72,20 +82,17 @@ func CompleteSpec(ctx context.Context, r *libpod.Runtime, s *specgen.SpecGenerat
// VM, which is the default behavior // VM, which is the default behavior
// - "container" denotes the container should join the VM of the SandboxID // - "container" denotes the container should join the VM of the SandboxID
// (the infra container) // (the infra container)
s.Annotations = make(map[string]string)
if len(s.Pod) > 0 { if len(s.Pod) > 0 {
s.Annotations[ann.SandboxID] = s.Pod annotations[ann.SandboxID] = s.Pod
s.Annotations[ann.ContainerType] = ann.ContainerTypeContainer annotations[ann.ContainerType] = ann.ContainerTypeContainer
} }
//
// Next, add annotations from the image // now pass in the values from client
annotations, err := newImage.Annotations(ctx) for k, v := range s.Annotations {
if err != nil {
return err
}
for k, v := range annotations {
annotations[k] = v annotations[k] = v
} }
s.Annotations = annotations
// entrypoint // entrypoint
entrypoint, err := newImage.Entrypoint(ctx) entrypoint, err := newImage.Entrypoint(ctx)