From 0bb2fb04d9658de01052f8b11788ceb426415f02 Mon Sep 17 00:00:00 2001
From: Haiyan Meng <hmeng@redhat.com>
Date: Mon, 1 Aug 2016 18:43:24 -0400
Subject: [PATCH] update generate functions

Signed-off-by: Haiyan Meng <hmeng@redhat.com>
---
 server/runtime.go | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/server/runtime.go b/server/runtime.go
index 538d45a1..35a34dde 100644
--- a/server/runtime.go
+++ b/server/runtime.go
@@ -83,9 +83,7 @@ func (s *Server) CreatePodSandbox(ctx context.Context, req *pb.CreatePodSandboxR
 		return nil, err
 	}
 
-	if err := g.AddBindMount(fmt.Sprintf("%s:/etc/resolv.conf", resolvPath)); err != nil {
-		return nil, err
-	}
+	g.AddBindMount(resolvPath, "/etc/resolv.conf", "ro")
 
 	labels := req.GetConfig().GetLabels()
 	s.sandboxes = append(s.sandboxes, &sandbox{
@@ -96,10 +94,7 @@ func (s *Server) CreatePodSandbox(ctx context.Context, req *pb.CreatePodSandboxR
 
 	annotations := req.GetConfig().GetAnnotations()
 	for k, v := range annotations {
-		err := g.AddAnnotation(fmt.Sprintf("%s=%s", k, v))
-		if err != nil {
-			return nil, err
-		}
+		g.AddAnnotation(k, v)
 	}
 
 	// TODO: double check cgroupParent.