Skip to content

K
k3s
Commit 97945b3f authored by Kubernetes Submit Queue's avatar Kubernetes Submit Queue Committed by GitHub
Browse files
Options

Merge pull request #36884 from feiskyer/fix-cgroup-root

Automatic merge from submit-queue Fix syntax error in local-up-cluster.sh when CGROUP_ROOT is set Fix syntax error when `CGROUP_ROOT` is set, or it will complain a following error: ``` hack/local-up-cluster.sh: line 39: CGROUP_ROOT: "": syntax error: operand expected (error token is """") ``` cc/ @derekwaynecarr
parents 3d64d919 41bb1c6a
Show whitespace changes
Inline Side-by-side
Showing with 1 addition and 1 deletion
hack/local-up-cluster.sh
View file @ 97945b3f
...@@ -36,7 +36,7 @@ SERVICE_CLUSTER_IP_RANGE=${SERVICE_CLUSTER_IP_RANGE:-10.0.0.0/24} ...@@ -36,7 +36,7 @@ SERVICE_CLUSTER_IP_RANGE=${SERVICE_CLUSTER_IP_RANGE:-10.0.0.0/24}
EXPERIMENTAL_CGROUPS_PER_QOS=${EXPERIMENTAL_CGROUPS_PER_QOS:-false} EXPERIMENTAL_CGROUPS_PER_QOS=${EXPERIMENTAL_CGROUPS_PER_QOS:-false}
# this is not defaulted to preserve backward compatibility. # this is not defaulted to preserve backward compatibility.
# if EXPERIMENTAL_CGROUPS_PER_QOS is enabled, recommend setting to / # if EXPERIMENTAL_CGROUPS_PER_QOS is enabled, recommend setting to /
CGROUP_ROOT=${CGROUP_ROOT:""} CGROUP_ROOT=${CGROUP_ROOT:-""}
# name of the cgroup driver, i.e. cgroupfs or systemd # name of the cgroup driver, i.e. cgroupfs or systemd
CGROUP_DRIVER=${CGROUP_DRIVER:-""} CGROUP_DRIVER=${CGROUP_DRIVER:-""}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment