diff options
| author |   Eric Multanen <eric.w.multanen@intel.com> | 2021-06-24 20:50:20 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2021-06-24 20:50:20 +0000 |
| commit | ffa56aaeb4f69490866d67f98209af01191257bd (patch) | |
| tree | 7caae3c93bcc42fb2ebac87918b2b8a7c07031f6 /kud/hosting_providers | |
| parent | 568eb0307b9743bfff941f05abd21bdded938f5a (diff) | |
| parent | 2cfc1f2d67103726140b32b5a5c555f7a66636be (diff) | |
Merge "Move topology-manager configuration to kubespray"
Diffstat (limited to 'kud/hosting_providers')
4 files changed, 15 insertions, 3 deletions
diff --git a/kud/hosting_providers/containerized/installer.sh b/kud/hosting_providers/containerized/installer.sh index 928ed425..844c154d 100755 --- a/kud/hosting_providers/containerized/installer.sh +++ b/kud/hosting_providers/containerized/installer.sh @@ -230,7 +230,7 @@ function install_host_artifacts { done mkdir -p ${host_addons_dir}/tests - for test in _common _common_test _functions multus ovn4nfv nfd sriov-network qat cmk; do + for test in _common _common_test _functions topology-manager-sriov multus ovn4nfv nfd sriov-network qat cmk; do cp ${kud_tests}/${test}.sh ${host_addons_dir}/tests done diff --git a/kud/hosting_providers/containerized/inventory/group_vars/k8s-cluster.yml b/kud/hosting_providers/containerized/inventory/group_vars/k8s-cluster.yml index 498d0fb4..bfbd57b3 100644 --- a/kud/hosting_providers/containerized/inventory/group_vars/k8s-cluster.yml +++ b/kud/hosting_providers/containerized/inventory/group_vars/k8s-cluster.yml @@ -122,3 +122,8 @@ podsecuritypolicy_restricted_spec: # This will fail if allowed-unsafe-sysctls is not set accordingly in kubelet flags allowedUnsafeSysctls: - '*' + +# Customize kubelet config of CPU and topology manager +kubelet_node_config_extra_args: + cpuManagerPolicy: "static" # Options: none (disabled), static (default) + topologyManagerPolicy: "best-effort" # Options: none (disabled), best-effort (default), restricted, single-numa-node diff --git a/kud/hosting_providers/vagrant/installer.sh b/kud/hosting_providers/vagrant/installer.sh index 463ac925..8c8ff7f3 100755 --- a/kud/hosting_providers/vagrant/installer.sh +++ b/kud/hosting_providers/vagrant/installer.sh @@ -149,7 +149,7 @@ function install_addons { # The order of KUD_ADDONS is important: some plugins (sriov, qat) # require nfd to be enabled. Some addons are not currently supported with containerd if [ "${container_runtime}" == "docker" ]; then - kud_addons=${KUD_ADDONS:-topology-manager virtlet ovn4nfv nfd sriov \ + kud_addons=${KUD_ADDONS:-virtlet ovn4nfv nfd sriov \ qat optane cmk} elif [ "${container_runtime}" == "containerd" ]; then kud_addons=${KUD_ADDONS:-ovn4nfv nfd} @@ -179,7 +179,9 @@ function install_addons { popd fi # Run other plugin tests - for addon in ${kud_addons}; do + # The topology-manager is added to the tests here as it is + # enabled via kubelet config, not an addon + for addon in topology-manager ${kud_addons}; do pushd $kud_tests bash ${addon}.sh || failed_kud_tests="${failed_kud_tests} ${addon}" popd diff --git a/kud/hosting_providers/vagrant/inventory/group_vars/k8s-cluster.yml b/kud/hosting_providers/vagrant/inventory/group_vars/k8s-cluster.yml index a9a7a933..53b5a141 100644 --- a/kud/hosting_providers/vagrant/inventory/group_vars/k8s-cluster.yml +++ b/kud/hosting_providers/vagrant/inventory/group_vars/k8s-cluster.yml @@ -119,3 +119,8 @@ podsecuritypolicy_restricted_spec: # This will fail if allowed-unsafe-sysctls is not set accordingly in kubelet flags allowedUnsafeSysctls: - '*' + +# Customize kubelet config of CPU and topology manager +kubelet_node_config_extra_args: + cpuManagerPolicy: "static" # Options: none (disabled), static (default) + topologyManagerPolicy: "best-effort" # Options: none (disabled), best-effort (default), restricted, single-numa-node |