!3 kata_integration: add kata-netmon back to rpm package

Merge pull request !3 from flyflyflypeng/master

Makefile

@@ -34,6 +34,7 @@ runtime: agent
 	sh ./scripts/build_kata_runtime.sh $(RUNTIME_PATH)
 	sh ./scripts/make_default_configuration.sh $(RUNTIME_PATH)
 	cp -f $(RUNTIME_PATH)/kata-runtime $(BUILD_PATH)/
+	cp -f $(RUNTIME_PATH)/kata-netmon $(BUILD_PATH)/
 
 proxy:
 	cd proxy; sh apply-patches

hack/kata-containers.spec

@@ -6,7 +6,7 @@
 %endif
 
 %if "%{!?RELEASE:1}"
-%define RELEASE 18
+%define RELEASE 20
 %endif
 
 %define __debug_install_post   \
@@ -89,7 +89,7 @@ install -p -m 755 -D %{_builddir}/kernel/linux/arch/arm64/boot/Image %{buildroot
 
 cd %{_builddir}/%{name}-%{version}
 mkdir -p -m 750  %{buildroot}/usr/bin
-install -p -m 750 ./build/kata-runtime ./build/kata-proxy ./build/kata-shim %{buildroot}/usr/bin/
+install -p -m 750 ./build/kata-runtime ./build/kata-proxy ./build/kata-shim ./build/kata-netmon %{buildroot}/usr/bin/
 install -p -m 640 ./build/kata-containers-initrd.img %{buildroot}/var/lib/kata/
 mkdir -p -m 750 %{buildroot}/usr/share/defaults/kata-containers/
 install -p -m 640 -D ./runtime/cli/config/configuration-qemu.toml %{buildroot}/usr/share/defaults/kata-containers/configuration.toml
@@ -100,6 +100,7 @@ install -p -m 640 -D ./runtime/cli/config/configuration-qemu.toml %{buildroot}/u
 /usr/bin/kata-runtime
 /usr/bin/kata-proxy
 /usr/bin/kata-shim
+/usr/bin/kata-netmon
 /var/lib/kata/kernel
 /var/lib/kata/kata-containers-initrd.img
 /usr/share/defaults/kata-containers/configuration.toml
@@ -108,6 +109,12 @@ install -p -m 640 -D ./runtime/cli/config/configuration-qemu.toml %{buildroot}/u
 
 
 %changelog
+* Thu Apr 2 2020 jiangpengf<jiangpengfei9@huawei.com> - 1.0.3.20
+- Type:enhancement
+- ID:NA
+- SUG:NA
+- DESC:add netmon back to rpm package and enable default hypervisor_params
+
 * Tue Dec 31 2019 yangfeiyu<yangfeiyu2@huawei.com> - 1.0.3.18
 - Type:enhancement
 - ID:NA

scripts/build_kata_proxy.sh

@@ -34,5 +34,5 @@ ln -s $KATA_PROXY_PATH $BASE/proxy
 export GOPATH=$(readlink -f $GOPATH)
 cd ${BASE}/proxy && \
         make clean && \
-        make INIT=${AGENT_INIT}
+        make
 rm -rfv $GOPATH > /dev/null

scripts/build_kata_runtime.sh

@@ -34,5 +34,5 @@ ln -s $KATA_RUNTIME_PATH $BASE/runtime
 export GOPATH=$(readlink -f $GOPATH)
 cd ${BASE}/runtime && \
         make clean && \
-        make INIT=${AGENT_INIT}
+        make
 rm -rfv $GOPATH > /dev/null

scripts/build_kata_shim.sh

@@ -34,5 +34,5 @@ ln -s $KATA_SHIM_PATH $BASE/shim
 export GOPATH=$(readlink -f $GOPATH)
 cd ${BASE}/shim && \
         make clean && \
-        make INIT=${AGENT_INIT}
+        make
 rm -rfv $GOPATH > /dev/null

scripts/make_default_configuration.sh

@@ -24,24 +24,25 @@ sed -i 's/^image/#image/' $KATA_CONFIG_PATH
 sed -i 's/^#default_memory = /default_memory = /' $KATA_CONFIG_PATH
 sed -i 's#block_device_driver = \"virtio-scsi\"#block_device_driver = \"virtio-blk\"#' $KATA_CONFIG_PATH
 sed -i 's/^#enable_blk_mount/enable_blk_mount/' $KATA_CONFIG_PATH
-sed -i 's/^#hotplug_vfio_on_root_bus/hotplug_vfio_on_root_bus/' $KATA_CONFIG_PATH
 sed -i 's#/usr/libexec/kata-containers/kata-proxy#/usr/bin/kata-proxy#' $KATA_CONFIG_PATH
 sed -i 's#/usr/libexec/kata-containers/kata-shim#/usr/bin/kata-shim#' $KATA_CONFIG_PATH
-sed -i 's#/usr/libexec/kata-containers/kata-netmon#/var/lib/kata/kata-netmon#' $KATA_CONFIG_PATH
+sed -i 's#/usr/libexec/kata-containers/kata-netmon#/usr/bin/kata-netmon#' $KATA_CONFIG_PATH
-sed -i 's/macvtap/none/' $KATA_CONFIG_PATH
+sed -i 's/^#enable_netmon/enable_netmon/' $KATA_CONFIG_PATH
 sed -i 's/^#disable_new_netns/disable_new_netns/' $KATA_CONFIG_PATH
 sed -i 's/^#disable_vhost_net/disable_vhost_net/' $KATA_CONFIG_PATH
 sed -i 's/^#block_device_cache_set/block_device_cache_set/' $KATA_CONFIG_PATH
 sed -i 's/^#block_device_cache_direct/block_device_cache_direct/' $KATA_CONFIG_PATH
 sed -i 's#path = \"/usr/bin/qemu-.*\"#path = \"/usr/bin/qemu-kvm\"#' $KATA_CONFIG_PATH
-sed -i 's/^internetworking_model.*$/internetworking_model=\"none\"/' $KATA_CONFIG_PATH
+sed -i 's/^internetworking_model.*$/internetworking_model=\"bridged\"/' $KATA_CONFIG_PATH
 
 if [ "$ARCH" == "aarch64" ];then
     sed -i 's/^machine_type.*$/machine_type = \"virt\"/' $KATA_CONFIG_PATH
     sed -i 's/^block_device_driver.*$/block_device_driver = \"virtio-scsi\"/' $KATA_CONFIG_PATH
     sed -i 's/^kernel_params.*$/kernel_params = \"agent.log=debug pcie_ports=native pci=pcie_bus_perf\"/' $KATA_CONFIG_PATH
+    sed -i 's/^hypervisor_params.*$/hypervisor_params = \"kvm-pit.lost_tick_policy=discard pcie-root-port.fast-plug=1 pcie-root-port.x-speed=16 pcie-root-port.x-width=32 pcie-root-port.fast-unplug=1\"/' $KATA_CONFIG_PATH
 else
     sed -i 's/^kernel_params.*$/kernel_params = \"agent.log=debug\"/' $KATA_CONFIG_PATH
+    sed -i 's/^#hotplug_vfio_on_root_bus/hotplug_vfio_on_root_bus/' $KATA_CONFIG_PATH
 fi
 
 # debug options