From c93bfcc3d236c7995cd242da02511b5006b0a3e5 Mon Sep 17 00:00:00 2001
From: Jackie Huang <jackie.huang@windriver.com>
Date: Mon, 21 Oct 2019 15:28:50 +0800
Subject: [PATCH] kubernetes_1.15.2: add sysctl config and docker images

Issue-ID: INF-4
Signed-off-by: Jackie Huang <jackie.huang@windriver.com>
Change-Id: I2b2ae80755f53e05e0a055fc17b35125c2975173
---
 .../packagegroups/packagegroup-oran.bb             |  4 +++
 .../kubernetes/kubernetes/k8s.conf                 |  1 +
 .../kubernetes/kubernetes_1.15.2.bb                | 29 ++++++++++++++++++++++
 3 files changed, 34 insertions(+)
 create mode 100644 meta-oran/recipes-containers/kubernetes/kubernetes/k8s.conf

diff --git a/meta-oran/recipes-base/packagegroups/packagegroup-oran.bb b/meta-oran/recipes-base/packagegroups/packagegroup-oran.bb
index 4f92365..0f88bf3 100644
--- a/meta-oran/recipes-base/packagegroups/packagegroup-oran.bb
+++ b/meta-oran/recipes-base/packagegroups/packagegroup-oran.bb
@@ -52,6 +52,10 @@ RDEPENDS_${PN}-k8s = "\
     kubernetes \
 "
 
+RRECOMMENDS_${PN}-k8s = "\
+    kubernetes-img \
+"
+
 RDEPENDS_${PN}-vm = "\
     qemu \
     libvirt \
diff --git a/meta-oran/recipes-containers/kubernetes/kubernetes/k8s.conf b/meta-oran/recipes-containers/kubernetes/kubernetes/k8s.conf
new file mode 100644
index 0000000..e952d71
--- /dev/null
+++ b/meta-oran/recipes-containers/kubernetes/kubernetes/k8s.conf
@@ -0,0 +1 @@
+vm.swappiness=0
diff --git a/meta-oran/recipes-containers/kubernetes/kubernetes_1.15.2.bb b/meta-oran/recipes-containers/kubernetes/kubernetes_1.15.2.bb
index a3aef39..c2d8438 100644
--- a/meta-oran/recipes-containers/kubernetes/kubernetes_1.15.2.bb
+++ b/meta-oran/recipes-containers/kubernetes/kubernetes_1.15.2.bb
@@ -8,4 +8,33 @@ PV = "1.15.2+git${SRCREV_kubernetes}"
 SRCREV_kubernetes = "f6278300bebbb750328ac16ee6dd3aa7d3549568"
 SRC_BRANCH = "release-1.15"
 
+# The docker images included in docker-img-kubernetes-v1.15.2.tar.bz2:
+# k8s.gcr.io/kube-scheduler                             v1.15.2               88fa9cb27bd2        2 months ago        81.1MB
+# k8s.gcr.io/kube-proxy                                 v1.15.2               167bbf6c9338        2 months ago        82.4MB
+# k8s.gcr.io/kube-controller-manager                    v1.15.2               9f5df470155d        2 months ago        159MB
+# k8s.gcr.io/kube-apiserver                             v1.15.2               34a53be6c9a7        2 months ago        207MB
+# k8s.gcr.io/coredns                                    1.3.1                 eb516548c180        9 months ago        40.3MB
+# k8s.gcr.io/etcd                                       3.3.10                2c4adeb21b4f        10 months ago       258MB
+
+SRC_URI += "\
+    file://k8s.conf \
+    file://docker-img-kubernetes-v1.15.2.tar.bz2;unpack=0 \
+"
+
 inherit go112
+
+PACKAGES =+ "${PN}-img"
+
+DOCKER_IMG = "/opt/docker_images/${BPN}"
+
+do_install_append() {
+    # Install the saved docker image
+    install -d ${D}${DOCKER_IMG}
+    install -m 644 ${WORKDIR}/docker-img-*.tar.bz2 ${D}${DOCKER_IMG}
+
+    # Install the sysctl config for k8s
+    install -d ${D}${sysconfdir}/sysctl.d/
+    install -m 644 -D ${WORKDIR}/k8s.conf ${D}${sysconfdir}/sysctl.d/
+}
+
+FILES_${PN}-img = "${DOCKER_IMG}"
-- 
2.16.6