Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Ae/fix2 #38316

Merged
merged 2 commits into from
Dec 9, 2016
Merged

Ae/fix2 #38316

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7595305
type found with controller comment.
alejandroEsc Dec 7, 2016
1e84257
fixed a few kublet typos.
alejandroEsc Dec 7, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions cluster/mesos/docker/util.sh
View file
Open in desktop
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion cluster/ubuntu/config-default.sh
View file
Open in desktop
Expand Up @@ -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"}
Expand Down
2 changes: 1 addition & 1 deletion pkg/api/v1/types.go
View file
Open in desktop
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion pkg/controller/volume/persistentvolume/framework_test.go
View file
Open in desktop
Expand Up @@ -888,7 +888,7 @@ func wrapTestWithInjectedOperation(toWrap testCall, injectBeforeOperation func(c
atomic.StoreInt32(&testFinished, 1)
}()

// Wait for the controler to finish the test function.
// Wait for the controller to finish the test function.
for atomic.LoadInt32(&testFinished) == 0 {
time.Sleep(time.Millisecond * 10)
}
Expand Down