diff --git a/cluster/mesos/docker/util.sh b/cluster/mesos/docker/util.sh index a5c9e5701a3..c2f85f82206 100644 --- a/cluster/mesos/docker/util.sh +++ b/cluster/mesos/docker/util.sh @@ -192,8 +192,8 @@ function detect-master { } # Get minion IP addresses and store in KUBE_NODE_IP_ADDRESSES[] -# These Mesos slaves MAY host Kublets, -# but might not have a Kublet running unless a kubernetes task has been scheduled on them. +# These Mesos slaves MAY host Kubelets, +# but might not have a Kubelet running unless a kubernetes task has been scheduled on them. function detect-nodes { local docker_ids=$(docker ps --filter="name=docker_mesosslave" --quiet) if [ -z "${docker_ids}" ]; then diff --git a/cluster/ubuntu/config-default.sh b/cluster/ubuntu/config-default.sh index c83b0b72dcc..0c4473cb70b 100755 --- a/cluster/ubuntu/config-default.sh +++ b/cluster/ubuntu/config-default.sh @@ -130,7 +130,7 @@ ENABLE_CLUSTER_UI="${KUBE_ENABLE_CLUSTER_UI:-true}" # Add environment variable separated with blank space like "http_proxy=http://10.x.x.x:8080 https_proxy=https://10.x.x.x:8443" PROXY_SETTING=${PROXY_SETTING:-""} -# Optional: Allows kublet/kube-api to be run in privileged mode +# Optional: Allows kubelet/kube-api to be run in privileged mode ALLOW_PRIVILEGED=${ALLOW_PRIVILEGED:-"false"} DEBUG=${DEBUG:-"false"} diff --git a/pkg/api/v1/types.go b/pkg/api/v1/types.go index 8cc346ab79a..10e71955c74 100644 --- a/pkg/api/v1/types.go +++ b/pkg/api/v1/types.go @@ -2995,7 +2995,7 @@ const ( NodeDiskPressure NodeConditionType = "DiskPressure" // NodeNetworkUnavailable means that network for the node is not correctly configured. NodeNetworkUnavailable NodeConditionType = "NetworkUnavailable" - // NodeInodePressure means the kublet is under pressure due to insufficient available inodes. + // NodeInodePressure means the kubelet is under pressure due to insufficient available inodes. NodeInodePressure NodeConditionType = "InodePressure" )