Make CNI DEL idempotent (#74)

* new Pod containerId attribute

* add container_id to status subresource

* add containerid handler

* add containerID to cmdAdd and cmdDel

* typo squashing

* log text clarification

* fix error message

Author: Cerebus

api/types/v1beta1/topology.go

@@ -24,9 +24,10 @@ type TopologySpec struct {
 }
 
 type TopologyStatus struct {
-	Skipped []string `json:"skipped"`
-	SrcIP   string   `json:"src_ip"`
-	NetNS   string   `json:"net_ns"`
+	Skipped     []string `json:"skipped"`
+	SrcIP       string   `json:"src_ip"`
+	NetNS       string   `json:"net_ns"`
+	ContainerID string   `json:"container_id"`
 }
 
 type Link struct {

daemon/meshnet/handler.go

@@ -63,6 +63,7 @@ func (m *Meshnet) Get(ctx context.Context, pod *mpb.PodQuery) (*mpb.Pod, error)
 
 	srcIP, _, _ := unstructured.NestedString(result.Object, "status", "src_ip")
 	netNs, _, _ := unstructured.NestedString(result.Object, "status", "net_ns")
+	containerId, _, _ := unstructured.NestedString(result.Object, "status", "container_id")
 	nodeIP := os.Getenv("HOST_IP")
 	nodeIntf := os.Getenv("HOST_INTF")
 
@@ -74,6 +75,7 @@ func (m *Meshnet) Get(ctx context.Context, pod *mpb.PodQuery) (*mpb.Pod, error)
 		Links:  links,
 		NodeIp: nodeIP,
 		NodeIntf: nodeIntf,
+		ContainerId: containerId,
 	}, nil
 }
 
@@ -95,6 +97,10 @@ func (m *Meshnet) SetAlive(ctx context.Context, pod *mpb.Pod) (*mpb.BoolResponse
 			mnetdLogger.Errorf("Failed to update pod's net_ns")
 		}
 
+		if err = unstructured.SetNestedField(result.Object, pod.ContainerId, "status", "container_id"); err != nil {
+			mnetdLogger.Errorf("Failed to update pod's container_id")
+		}
+
 		return m.updateStatus(ctx, result, pod.KubeNs)
 	})
 

daemon/proto/meshnet/v1beta1/meshnet.pb.go

@@ -13,6 +13,7 @@ message Pod {
   repeated Link links = 5;
   string node_ip = 6;
   string node_intf = 7;
+  string container_id = 8;
 }
 
 message Link {
@@ -54,8 +55,8 @@ message RemotePod {
 message WireDef {
   // The remote machine interface id, to which this wire is connected to.
   //  When local machine sends a packet to remote mahcine over grpc-wire,
-  //  then along with the packet data, local machine also sends the interface id 
-  //  to whihc this packet needs to delivered in remote machine. It avoids any 
+  //  then along with the packet data, local machine also sends the interface id
+  //  to whihc this packet needs to delivered in remote machine. It avoids any
   //  per packet interface lookup at the remote end. Packet delivery becomes
   //  an O(1) operation at remote end.
   int64 peer_intf_id = 1;
@@ -66,12 +67,12 @@ message WireDef {
   // Interface name, which comes from topology definition and to be put
   // inside container.
   // This filed is used when grpc-wire to be created.
-  string intf_name_in_pod = 3;    
+  string intf_name_in_pod = 3;
 
   // Network name space of the local pod which is connected to this
   // grpc-wire
-  string local_pod_net_ns = 4;  
-    
+  string local_pod_net_ns = 4;
+
   // Each meshnet link has a uid.
   int64 link_uid = 5;
 
@@ -87,7 +88,7 @@ message WireDef {
   string kube_ns = 8;
 
   string local_pod_ip = 9;
-  
+
 }
 
 message WireCreateResponse {
@@ -101,8 +102,8 @@ message WireDownResponse {
 }
 
 message Packet {
-  // the remote machine interface id, to which this packet should be delivered. 
-  int64 remot_intf_id = 1;   
+  // the remote machine interface id, to which this packet should be delivered.
+  int64 remot_intf_id = 1;
   bytes frame = 2;
 }
 
@@ -114,7 +115,7 @@ message GenerateNodeInterfaceNameRequest {
 
 message GenerateNodeInterfaceNameResponse {
   bool ok = 1;
-  string node_intf_name = 2;   
+  string node_intf_name = 2;
 }
 
 service Local {
@@ -124,12 +125,12 @@ service Local {
   rpc Skip (SkipQuery) returns (BoolResponse);
   rpc IsSkipped (SkipQuery) returns (BoolResponse);
 
-  rpc GRPCWireExists(WireDef) returns (WireCreateResponse); 
+  rpc GRPCWireExists(WireDef) returns (WireCreateResponse);
   rpc AddGRPCWireLocal(WireDef) returns (BoolResponse);
   rpc RemGRPCWire(WireDef) returns (BoolResponse);
 
-  // A node is going to hold multiple veth to connect to multiple containers. 
-  // Each veth name must be unique with in a node. Daemon generates an ID that 
+  // A node is going to hold multiple veth to connect to multiple containers.
+  // Each veth name must be unique with in a node. Daemon generates an ID that
   // is unique in this node.
   rpc GenerateNodeInterfaceName(GenerateNodeInterfaceNameRequest) returns (GenerateNodeInterfaceNameResponse);
 }