From c31e46fce79f32a6692358105e15d77c652a9c9a Mon Sep 17 00:00:00 2001 From: Bruce Ashfield Date: Tue, 10 Dec 2019 02:25:21 -0500 Subject: conf: add k8s distro feature Add support for a new distro feature to control kubernetes versions and related configuration. Signed-off-by: Bruce Ashfield --- README | 1 + classes/meta-virt-k8s-cfg.bbclass | 6 ++++++ conf/distro/include/k8s-versions.inc | 0 conf/layer.conf | 6 ++++-- 4 files changed, 11 insertions(+), 2 deletions(-) create mode 100644 classes/meta-virt-k8s-cfg.bbclass create mode 100644 conf/distro/include/k8s-versions.inc diff --git a/README b/README index 88df4ee4..f7e0811b 100644 --- a/README +++ b/README @@ -28,6 +28,7 @@ that may also be enabled: - xen: enables xen functionality in various packages (kernel, libvirt, etc) - kvm: enables KVM configurations in the kernel and autoloads modules + - k8s: enables kubernets configurations in the kernel, tools and configuration - aufs: enables aufs support in docker and linux-yocto - x11: enable xen and libvirt functionality related to x11 - selinux: enables functionality in libvirt and lxc diff --git a/classes/meta-virt-k8s-cfg.bbclass b/classes/meta-virt-k8s-cfg.bbclass new file mode 100644 index 00000000..1be0a5c8 --- /dev/null +++ b/classes/meta-virt-k8s-cfg.bbclass @@ -0,0 +1,6 @@ +# We need to load the meta-virt config components, only if "k8s" +# is in the distro features. Since we don't know the distro flags during +# layer.conf load time, we delay using a special bbclass that simply includes +# the K8S_CONFIG_PATH file. + +include ${K8S_CONFIG_PATH} diff --git a/conf/distro/include/k8s-versions.inc b/conf/distro/include/k8s-versions.inc new file mode 100644 index 00000000..e69de29b diff --git a/conf/layer.conf b/conf/layer.conf index 89e5ac2b..d0a7ead0 100644 --- a/conf/layer.conf +++ b/conf/layer.conf @@ -43,6 +43,8 @@ INHERIT += "sanity-meta-virt" # We need to load the meta-virt config components, only if "virtualization" # is in the distro features. Since we don't know the distro flags during # layer.conf load time, we delay using a special bbclass that simply includes -# the META_VIRT_CONFIG_PATH file. +# the META_VIRT_CONFIG_PATH file, and likewise for the k8s configs META_VIRT_CONFIG_PATH = "${LAYERDIR}/conf/distro/include/meta-virt-default-versions.inc" -USER_CLASSES_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', 'meta-virt-cfg', '', d)}" \ No newline at end of file +K8S_CONFIG_PATH = "${LAYERDIR}/conf/distro/include/k8s-versions.inc" +USER_CLASSES_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'virtualization', 'meta-virt-cfg', '', d)}" +USER_CLASSES_append = " ${@bb.utils.contains('DISTRO_FEATURES', 'k8s', 'meta-virt-k8s-cfg', '', d)}" -- cgit v1.2.3-54-g00ecf