add envelope type

Author: MikeZappa87

pkg/adaptation/adaptation.go

@@ -242,42 +242,45 @@ func (r *Adaptation) Stop() {
 }
 
 // RunPodSandbox relays the corresponding CRI request to plugins.
-// Plugins can return IP addresses for the pod sandbox in their response; the
-// IPs from every plugin are concatenated, in plugin invocation order, and
-// returned to the caller so they can be propagated through the runtime (e.g.
-// surfaced to the kubelet via CRI). Duplicate IP addresses (whether reported
-// by a single plugin or by multiple plugins) are collapsed; first occurrence
-// wins. Plugins that have nothing to contribute can return an empty response
-// or a nil response.
+// Plugins can return a PodSandboxAdjustment for the pod sandbox in their
+// response; the network IPs from every plugin are concatenated, in plugin
+// invocation order, into the response's PodSandboxAdjustment so they can be
+// propagated through the runtime (e.g. surfaced to the kubelet via CRI).
+// Duplicate IP addresses (whether reported by a single plugin or by multiple
+// plugins) are collapsed; first occurrence wins. Plugins that have nothing to
+// contribute can return an empty response or a nil response.
 func (r *Adaptation) RunPodSandbox(ctx context.Context, req *RunPodSandboxRequest) (*RunPodSandboxResponse, error) {
 	r.Lock()
 	defer r.Unlock()
 	defer r.removeClosedPlugins()
 
 	var (
-		rsp  = &RunPodSandboxResponse{}
+		ips  []string
 		seen = map[string]struct{}{}
 	)
 	for _, plugin := range r.plugins {
 		pluginRsp, err := plugin.runPodSandbox(ctx, req)
 		if err != nil {
 			return nil, err
 		}
-		if pluginRsp == nil {
-			continue
-		}
-		for _, ip := range pluginRsp.Ips {
+		for _, ip := range pluginRsp.GetAdjust().GetNetwork().GetIps() {
 			if ip == "" {
 				continue
 			}
 			if _, ok := seen[ip]; ok {
 				continue
 			}
 			seen[ip] = struct{}{}
-			rsp.Ips = append(rsp.Ips, ip)
+			ips = append(ips, ip)
 		}
 	}
 
+	rsp := &RunPodSandboxResponse{}
+	if len(ips) > 0 {
+		rsp.Adjust = &PodSandboxAdjustment{
+			Network: &PodSandboxNetwork{Ips: ips},
+		}
+	}
 	return rsp, nil
 }
 

pkg/adaptation/api.go

@@ -52,6 +52,8 @@ type (
 	StateChangeResponse          = api.StateChangeResponse
 	RunPodSandboxRequest         = api.RunPodSandboxRequest
 	RunPodSandboxResponse        = api.RunPodSandboxResponse
+	PodSandboxAdjustment         = api.PodSandboxAdjustment
+	PodSandboxNetwork            = api.PodSandboxNetwork
 	UpdatePodSandboxRequest      = api.UpdatePodSandboxRequest
 	UpdatePodSandboxResponse     = api.UpdatePodSandboxResponse
 	StopPodSandboxRequest        = api.StopPodSandboxRequest