Merge pull request cri-o#1748 from amshinde/cni-results

Mrunal Patel · web-flow · commit 6e39d0c54ffc · 2018-09-20T19:34:41.000-07:00
cni: Add CNI result JSON as an annotation
diff --git a/pkg/annotations/annotations.go b/pkg/annotations/annotations.go
@@ -99,6 +99,9 @@ const (
 
 	// HostNetwork indicates whether the host network namespace is used or not
 	HostNetwork = "io.kubernetes.cri-o.HostNetwork"
+
+	// CNIResult is the JSON string representation of the Result from CNI
+	CNIResult = "io.kubernetes.cri-o.CNIResult"
 )
 
 // ContainerType values
diff --git a/server/sandbox_network.go b/server/sandbox_network.go
@@ -4,16 +4,17 @@ import (
 	"fmt"
 	"net"
 
+	cnitypes "github.com/containernetworking/cni/pkg/types"
 	"github.com/kubernetes-sigs/cri-o/lib/sandbox"
 	"github.com/sirupsen/logrus"
 	"k8s.io/kubernetes/pkg/kubelet/dockershim/network/hostport"
 )
 
 // networkStart sets up the sandbox's network and returns the pod IP on success
 // or an error
-func (s *Server) networkStart(sb *sandbox.Sandbox) (podIP string, err error) {
+func (s *Server) networkStart(sb *sandbox.Sandbox) (podIP string, result cnitypes.Result, err error) {
 	if sb.HostNetwork() {
-		return s.bindAddress, nil
+		return s.bindAddress, nil, nil
 	}
 
 	// Ensure network resources are cleaned up if the plugin succeeded
@@ -25,7 +26,7 @@ func (s *Server) networkStart(sb *sandbox.Sandbox) (podIP string, err error) {
 	}()
 
 	podNetwork := newPodNetwork(sb)
-	result, err := s.netPlugin.SetUpPod(podNetwork)
+	result, err = s.netPlugin.SetUpPod(podNetwork)
 	if err != nil {
 		err = fmt.Errorf("failed to create pod network sandbox %s(%s): %v", sb.Name(), sb.ID(), err)
 		return
diff --git a/server/sandbox_run_linux.go b/server/sandbox_run_linux.go
@@ -13,6 +13,7 @@ import (
 	"strings"
 	"time"
 
+	cnitypes "github.com/containernetworking/cni/pkg/types"
 	"github.com/containers/storage"
 	"github.com/kubernetes-sigs/cri-o/lib/sandbox"
 	"github.com/kubernetes-sigs/cri-o/oci"
@@ -570,11 +571,16 @@ func (s *Server) runPodSandbox(ctx context.Context, req *pb.RunPodSandboxRequest
 	sb.SetInfraContainer(container)
 
 	var ip string
+	var result cnitypes.Result
+
 	if s.config.Config.ManageNetworkNSLifecycle {
-		ip, err = s.networkStart(sb)
+		ip, result, err = s.networkStart(sb)
 		if err != nil {
 			return nil, err
 		}
+		if result != nil {
+			g.AddAnnotation(annotations.CNIResult, result.String())
+		}
 		defer func() {
 			if err != nil {
 				s.networkStop(sb)
@@ -621,7 +627,7 @@ func (s *Server) runPodSandbox(ctx context.Context, req *pb.RunPodSandboxRequest
 	s.ContainerStateToDisk(container)
 
 	if !s.config.Config.ManageNetworkNSLifecycle {
-		ip, err = s.networkStart(sb)
+		ip, _, err = s.networkStart(sb)
 		if err != nil {
 			return nil, err
 		}

Original file line number	Diff line number	Diff line change
`@@ -99,6 +99,9 @@ const (`
`99`	`99`
`100`	`100`	`// HostNetwork indicates whether the host network namespace is used or not`
`101`	`101`	`HostNetwork = "io.kubernetes.cri-o.HostNetwork"`
	`102`	`+`
	`103`	`+ // CNIResult is the JSON string representation of the Result from CNI`
	`104`	`+ CNIResult = "io.kubernetes.cri-o.CNIResult"`
`102`	`105`	`)`
`103`	`106`
`104`	`107`	`// ContainerType values`