mirror of
https://github.com/k3s-io/kubernetes.git
synced 2025-09-25 12:17:52 +00:00
Merge pull request #27853 from dubstack/dubstack-inject-qos-creation2
Automatic merge from submit-queue [Kubelet] Improving QOS in kubelet by introducing QoS level Cgroups - `--cgroups-per-qos` This PR is tied to this upstream issue #27204 Please note that only the last commit is unique to this PR. The first two commits are from previous PR's. It introduces a new flag in the Kubelet which can be used to specify if the user wants to use the QoS cgroup hierarchy. cc @kubernetes/sig-node
This commit is contained in:
@@ -33,6 +33,7 @@ cleanup=${CLEANUP:-"true"}
|
||||
delete_instances=${DELETE_INSTANCES:-"false"}
|
||||
run_until_failure=${RUN_UNTIL_FAILURE:-"false"}
|
||||
list_images=${LIST_IMAGES:-"false"}
|
||||
test_args=${TEST_ARGS:-""}
|
||||
|
||||
if [[ $list_images == "true" ]]; then
|
||||
gcloud compute images list --project="${image_project}" | grep "e2e-node"
|
||||
@@ -117,7 +118,7 @@ if [ $remote = true ] ; then
|
||||
--hosts="$hosts" --images="$images" --cleanup="$cleanup" \
|
||||
--results-dir="$artifacts" --ginkgo-flags="$ginkgoflags" \
|
||||
--image-project="$image_project" --instance-name-prefix="$instance_prefix" --setup-node="true" \
|
||||
--delete-instances="$delete_instances"
|
||||
--delete-instances="$delete_instances" --test_args="$test_args"
|
||||
exit $?
|
||||
|
||||
else
|
||||
@@ -129,6 +130,7 @@ else
|
||||
# Test using the host the script was run on
|
||||
# Provided for backwards compatibility
|
||||
"${ginkgo}" --focus=$focus --skip=$skip "${KUBE_ROOT}/test/e2e_node/" --report-dir=${report} \
|
||||
-- --alsologtostderr --v 2 --node-name $(hostname) --disable-kubenet=true --build-services=true --start-services=true --stop-services=true
|
||||
-- --alsologtostderr --v 2 --node-name $(hostname) --disable-kubenet=true --build-services=true \
|
||||
--start-services=true --stop-services=true "$test_args"
|
||||
exit $?
|
||||
fi
|
||||
|
@@ -42,6 +42,7 @@ build-tag
|
||||
cadvisor-port
|
||||
cert-dir
|
||||
certificate-authority
|
||||
cgroups-per-qos
|
||||
cgroup-root
|
||||
chaos-chance
|
||||
clean-start
|
||||
|
Reference in New Issue
Block a user