Include created interface in CNI result

projectcalico · Sep 13, 2018 · 2707fe2 · 2707fe2
1 parent ce723b7
commit 2707fe2
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/calico.go b/calico.go
@@ -316,6 +316,11 @@ func cmdAdd(args *skel.CmdArgs) error {
 		}
 
 		logger.WithField("endpoint", endpoint).Info("Wrote endpoint to datastore")
+
+		// Add the interface created above to the CNI result.
+		result.Interfaces = append(result.Interfaces, &current.Interface{
+			Name: endpoint.Spec.InterfaceName, Sandbox: endpoint.Spec.Endpoint},
+		)
 	}
 
 	// Handle profile creation - this is only done if there isn't a specific policy handler.

diff --git a/k8s/k8s.go b/k8s/k8s.go
@@ -371,6 +371,11 @@ func CmdAddK8s(ctx context.Context, args *skel.CmdArgs, conf types.NetConf, epID
 	}
 	logger.Info("Wrote updated endpoint to datastore")
 
+	// Add the interface created above to the CNI result.
+	result.Interfaces = append(result.Interfaces, &current.Interface{
+		Name: endpoint.Spec.InterfaceName, Sandbox: endpoint.Spec.Endpoint},
+	)
+
 	return result, nil
 }