From: Jackie Huang <jackie.huang@windriver.com>
Date: Thu, 10 Oct 2019 08:08:29 +0000 (+0800)
Subject: feature/kubernetes: add missing kernel configs for docker and k8s
X-Git-Tag: bronze-rc0~137
X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=commitdiff_plain;h=6b2b07630f47e00e69a4c7f76906a49d41c6c8ca;p=pti%2Frtp.git

feature/kubernetes: add missing kernel configs for docker and k8s

Issue-ID: INF-4
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Change-Id: If59b1f9ee97f66eba6e8f0d3dab0a215e5d93fff
---

diff --git a/meta-oran/templates/feature/kubernetes/files/docker_kube.cfg b/meta-oran/templates/feature/kubernetes/files/docker_kube.cfg
index b7e822a..026a9b2 100644
--- a/meta-oran/templates/feature/kubernetes/files/docker_kube.cfg
+++ b/meta-oran/templates/feature/kubernetes/files/docker_kube.cfg
@@ -1,3 +1,81 @@
+##################
+# From lxc.cfg
+##################
+
+CONFIG_CGROUP_DEVICE=y
+CONFIG_CPUSETS=y
+CONFIG_PROC_PID_CPUSET=y
+CONFIG_MEMCG=y
+CONFIG_CGROUP_SCHED=y
+CONFIG_FAIR_GROUP_SCHED=y
+CONFIG_RT_GROUP_SCHED=y
+CONFIG_CHECKPOINT_RESTORE=y
+CONFIG_NAMESPACES=y
+CONFIG_UTS_NS=y
+CONFIG_IPC_NS=y
+CONFIG_USER_NS=y
+CONFIG_PID_NS=y
+CONFIG_NET_NS=y
+
+CONFIG_NET_CLS_CGROUP=m
+CONFIG_BLK_CGROUP=y
+CONFIG_CGROUP_NET_PRIO=m
+
+# Virtual drivers
+CONFIG_VIRTIO_BLK=y
+CONFIG_SCSI_VIRTIO=y
+CONFIG_VIRTIO_NET=m
+CONFIG_HVC_DRIVER=y
+CONFIG_VIRTIO_CONSOLE=y
+CONFIG_HW_RANDOM_VIRTIO=m
+CONFIG_VIRTIO=y
+CONFIG_VIRTIO_PCI=y
+CONFIG_VIRTIO_BALLOON=y
+CONFIG_VIRTIO_MMIO=y
+
+# Base support for live boot
+CONFIG_BLK_DEV_LOOP=y
+CONFIG_NLS_CODEPAGE_437=y
+CONFIG_NLS_ISO8859_1=y
+CONFIG_VFAT_FS=y
+CONFIG_RD_GZIP=y
+
+# Support for virtual ethernet and LXC
+CONFIG_VETH=y
+CONFIG_MACVLAN=y
+
+
+#####################
+# From docker.cfg
+#####################
+CONFIG_NETFILTER_XT_MATCH_ADDRTYPE=m
+CONFIG_IP_NF_FILTER=m
+CONFIG_NF_NAT=m
+CONFIG_NF_CONNTRACK_IPV4=y
+
+CONFIG_DM_THIN_PROVISIONING=m
+
+CONFIG_IP_NF_NAT=m
+CONFIG_IP_NF_TARGET_MASQUERADE=m
+
+CONFIG_OVERLAY_FS=y
+
+#####################
+# From vswitch.cfg
+####################
+
+CONFIG_OPENVSWITCH=m
+CONFIG_NET_SCH_INGRESS=m
+CONFIG_NET_ACT_POLICE=m
+
+######################
+# From ebtables.cfg
+#####################
+
+CONFIG_BRIDGE_NF_EBTABLES=m
+CONFIG_BRIDGE_EBT_T_NAT=m
+
+
 # for kubernetes
 CONFIG_NETFILTER_XT_MATCH_IPVS=m
 CONFIG_BLK_DEV_THROTTLING=y
diff --git a/meta-oran/templates/feature/oran-host-rt-tune/files/oran-host-rt-tune.cfg b/meta-oran/templates/feature/oran-host-rt-tune/files/oran-host-rt-tune.cfg
index 27e66e9..1bc7c6d 100644
--- a/meta-oran/templates/feature/oran-host-rt-tune/files/oran-host-rt-tune.cfg
+++ b/meta-oran/templates/feature/oran-host-rt-tune/files/oran-host-rt-tune.cfg
@@ -51,8 +51,6 @@ CONFIG_USB=y
 # CONFIG_AUDIT is not set
 
 # CONFIG_SCSI_DEBUG is not set
-# CONFIG_BLK_DEV_THROTTLING is not set
-# CONFIG_CFS_BANDWIDTH is not set
 
 # CONFIG_HIBERNATION is not set