github
/
k3s
mirror of https://github.com/k3s-io/k3s
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #38316 from alejandroEsc/ae/fix2 

Automatic merge from submit-queue (batch tested with PRs 36736, 35956, 35655, 37713, 38316)

Ae/fix2

**What this PR does / why we need it**: Fixes some kubelet typos

**Release note**:
`None`
pull/6/head
Kubernetes Submit Queue 2016-12-08 19:52:00 -08:00 committed by GitHub
parent 362dc81d8e 1e84257691
commit 7a1e8133e8
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cluster/mesos/docker/util.sh
View File

@ -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

2
cluster/ubuntu/config-default.sh
View File

@ -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"}

2
pkg/api/v1/types.go
View File

@ -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"
)