starlingx/stx-puppet
Code Issues Proposed changes

Merge "enable k8s huge page feature"

Browse Source
This commit is contained in:
Zuul 2019-04-29 15:30:13 +00:00 committed by Gerrit Code Review
commit 715805fb65
3 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
puppet-manifests/src/modules/platform/manifests/compute.pp
View File

@ -52,7 +52,7 @@ class platform::compute::grub::params (
$eptad = ''
}
if $::is_gb_page_supported {
if $::is_gb_page_supported and $::platform::params::vswitch_type != 'none' {
if $g_hugepages != undef {
$gb_hugepages = $g_hugepages
} else {

20
puppet-manifests/src/modules/platform/manifests/kubernetes.pp
View File

@ -91,8 +91,11 @@ class platform::kubernetes::cgroup
}
class platform::kubernetes::kubeadm {
include ::platform::docker::params
include ::platform::docker::params
include ::platform::kubernetes::params
$host_labels = $::platform::kubernetes::params::host_labels
$iptables_file = "net.bridge.bridge-nf-call-ip6tables = 1
net.bridge.bridge-nf-call-iptables = 1"
@ -102,6 +105,21 @@ class platform::kubernetes::kubeadm {
$k8s_registry = undef
}
#only set k8s_hugepage true when subfunction is worker and openstack-compute-node is not in host_labels
if str2bool($::is_worker_subfunction)
and !('openstack-compute-node'
in $host_labels) {
$k8s_hugepage = true
} else {
$k8s_hugepage = false
}
# enable extra parameters such as hugepage
file { '/etc/sysconfig/kubelet':
ensure => file,
content => template('platform/kubelet.conf.erb'),
}
# Update iptables config. This is required based on:
# https://kubernetes.io/docs/tasks/tools/install-kubeadm
# This probably belongs somewhere else - initscripts package?

3
puppet-manifests/src/modules/platform/templates/kubelet.conf.erb Normal file
View File

@ -0,0 +1,3 @@
# Overrides config file for kubelet
KUBELET_EXTRA_ARGS=--feature-gates=HugePages=<%= @k8s_hugepage %>