Merge pull request #634 from l1b0k/feat/cni

daemon: validate cni request container id
AliyunContainerService · May 17, 2024 · 8f88b9a · 8f88b9a
2 parents 0531a1b + 36899a8
commit 8f88b9a
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/daemon/daemon.go b/daemon/daemon.go
@@ -461,7 +461,12 @@ func (n *networkService) GetIPInfo(ctx context.Context, r *rpc.GetInfoRequest) (
 			Msg:  "Unexpected network type, maybe daemon mode changed",
 		}
 	}
-
+	if oldRes.ContainerID != nil {
+		if r.K8SPodInfraContainerId != *oldRes.ContainerID {
+			log.Info("cni request not match stored resource, ignored", "old", *oldRes.ContainerID)
+			return reply, nil
+		}
+	}
 	netConf := make([]*rpc.NetConf, 0)
 
 	err = json.Unmarshal([]byte(oldRes.NetConf), &netConf)