From 75fdb753ddb47d51df1f9781d5db0748edd738da Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@redhat.com>
Date: Mon, 20 Apr 2020 17:28:45 -0400
Subject: Handle annotations passed in via the client

Signed-off-by: Daniel J Walsh <dwalsh@redhat.com>
---
 pkg/specgen/generate/container.go | 27 +++++++++++++++++----------
 1 file changed, 17 insertions(+), 10 deletions(-)

(limited to 'pkg/specgen')

diff --git a/pkg/specgen/generate/container.go b/pkg/specgen/generate/container.go
index 31465d8bf..d8d3bf11d 100644
--- a/pkg/specgen/generate/container.go
+++ b/pkg/specgen/generate/container.go
@@ -64,6 +64,16 @@ func CompleteSpec(ctx context.Context, r *libpod.Runtime, s *specgen.SpecGenerat
 	}
 
 	// 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
 	// we will want to configure it as a type "container" instead defaulting to
 	// 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
 	// - "container" denotes the container should join the VM of the SandboxID
 	//   (the infra container)
-	s.Annotations = make(map[string]string)
+
 	if len(s.Pod) > 0 {
-		s.Annotations[ann.SandboxID] = s.Pod
-		s.Annotations[ann.ContainerType] = ann.ContainerTypeContainer
-	}
-	//
-	// Next, add annotations from the image
-	annotations, err := newImage.Annotations(ctx)
-	if err != nil {
-		return err
+		annotations[ann.SandboxID] = s.Pod
+		annotations[ann.ContainerType] = ann.ContainerTypeContainer
 	}
-	for k, v := range annotations {
+
+	// now pass in the values from client
+	for k, v := range s.Annotations {
 		annotations[k] = v
 	}
+	s.Annotations = annotations
 
 	// entrypoint
 	entrypoint, err := newImage.Entrypoint(ctx)
-- 
cgit v1.2.3-54-g00ecf