pkg/deviceplugin: do not reset Envs/Annotations from previous loops

When more than one device ID is Allocate()'d to a container,
Envs/Annotations for all but the last device ID get lost because
their cresp.* maps are (re-)instantiated on each loop.

Fix it by doing that only once.

Fixes: 55f3e17

Signed-off-by: Mikko Ylinen <[email protected]>

Author: mythi

pkg/deviceplugin/server.go

@@ -161,13 +161,17 @@ func (srv *server) Allocate(ctx context.Context, rqt *pluginapi.AllocateRequest)
 				cresp.Mounts = append(cresp.Mounts, &dev.mounts[i])
 			}
 
-			cresp.Envs = map[string]string{}
+			if cresp.Envs == nil {
+				cresp.Envs = map[string]string{}
+			}
 
 			for key, value := range dev.envs {
 				cresp.Envs[key] = value
 			}
 
-			cresp.Annotations = map[string]string{}
+			if cresp.Annotations == nil {
+				cresp.Annotations = map[string]string{}
+			}
 
 			for key, value := range dev.annotations {
 				cresp.Annotations[key] = value