From 21fa8389e3a651924056a74f312ac8734ad95ddf Mon Sep 17 00:00:00 2001
From: chengzrz <czrzrichard@gmail.com>
Date: Sat, 17 Sep 2022 15:10:47 +0800
Subject: [PATCH] drop unused fields from agent network

Signed-off-by: chengzrz <czrzrichard@gmail.com>
---
 kata-containers.spec                          |  8 ++-
 ...gent-drop-unused-fields-from-network.patch | 49 +++++++++++++++++++
 series.conf                                   |  1 +
 3 files changed, 57 insertions(+), 1 deletion(-)
 create mode 100644 patches/0034-agent-drop-unused-fields-from-network.patch

diff --git a/kata-containers.spec b/kata-containers.spec
index 9725900..8cea6ab 100644
--- a/kata-containers.spec
+++ b/kata-containers.spec
@@ -2,7 +2,7 @@
 %global debug_package %{nil}
 
 %define VERSION 2.1.0
-%define RELEASE 30
+%define RELEASE 31
 
 Name:           kata-containers
 Version:        %{VERSION}
@@ -108,6 +108,12 @@ strip %{buildroot}/usr/bin/containerd-shim-kata-v2
 %doc
 
 %changelog
+* Sat Sep 17 2022 chengzeruizhi <chengzeruizhi@huawei.com> - 2.1.0-31
+- Type:bugfix
+- ID:NA
+- SUG:NA
+- DESC:drop unused fields from agent network
+
 * Thu Sep 8 2022 xiadanni <xiadanni1@huawei.com> - 2.1.0-30
 - Type:enhancement
 - ID:NA
diff --git a/patches/0034-agent-drop-unused-fields-from-network.patch b/patches/0034-agent-drop-unused-fields-from-network.patch
new file mode 100644
index 0000000..944be2a
--- /dev/null
+++ b/patches/0034-agent-drop-unused-fields-from-network.patch
@@ -0,0 +1,49 @@
+From f6ae15826e2a334c9a6a7f003609c6a4244a28b2 Mon Sep 17 00:00:00 2001
+From: Eric Ernst <eric_ernst@apple.com>
+Date: Thu, 2 Dec 2021 16:22:51 -0800
+Subject: [PATCH] agent: drop unused fields from network
+
+We don't utilize routes or inteface vectors. Let's drop them.
+
+Signed-off-by: Eric Ernst <eric_ernst@apple.com>
+---
+ src/agent/src/network.rs | 8 +-------
+ 1 file changed, 1 insertion(+), 7 deletions(-)
+
+diff --git a/src/agent/src/network.rs b/src/agent/src/network.rs
+index 4b72d4093..80ff00d6d 100644
+--- a/src/agent/src/network.rs
++++ b/src/agent/src/network.rs
+@@ -5,28 +5,22 @@
+ 
+ use anyhow::{anyhow, Result};
+ use nix::mount::{self, MsFlags};
+-use protocols::types::{Interface, Route};
+ use slog::Logger;
+-use std::collections::HashMap;
+ use std::fs;
+ 
+ const KATA_GUEST_SANDBOX_DNS_FILE: &str = "/run/kata-containers/sandbox/resolv.conf";
+ const GUEST_DNS_FILE: &str = "/etc/resolv.conf";
+ 
+-// Network fully describes a sandbox network with its interfaces, routes and dns
++// Network describes a sandbox network, includings its dns
+ // related information.
+ #[derive(Debug, Default)]
+ pub struct Network {
+-    ifaces: HashMap<String, Interface>,
+-    routes: Vec<Route>,
+     dns: Vec<String>,
+ }
+ 
+ impl Network {
+     pub fn new() -> Network {
+         Network {
+-            ifaces: HashMap::new(),
+-            routes: Vec::new(),
+             dns: Vec::new(),
+         }
+     }
+-- 
+2.25.1
+
diff --git a/series.conf b/series.conf
index 45bf63e..356e17e 100644
--- a/series.conf
+++ b/series.conf
@@ -31,3 +31,4 @@
 0031-add-explicit-on-after-kernel_irqchip.patch
 0032-qmp-Don-t-use-deprecated-props-field-for-object-add.patch
 0033-optimize-compile-options.patch
+0034-agent-drop-unused-fields-from-network.patch
-- 
Gitee