Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
K
k3s
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Jacklull
k3s
Commits
c5756d22
Commit
c5756d22
authored
Jul 29, 2016
by
k8s-merge-robot
Committed by
GitHub
Jul 29, 2016
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #29779 from 249043822/patch-1
Automatic merge from submit-queue make log description more readable
parents
50e3ee28
fe031d33
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
kubelet.go
pkg/kubelet/kubelet.go
+1
-1
No files found.
pkg/kubelet/kubelet.go
View file @
c5756d22
...
@@ -2066,7 +2066,7 @@ func (kl *Kubelet) canAdmitPod(pods []*api.Pod, pod *api.Pod) (bool, string, str
...
@@ -2066,7 +2066,7 @@ func (kl *Kubelet) canAdmitPod(pods []*api.Pod, pod *api.Pod) (bool, string, str
// TODO: When disk space scheduling is implemented (#11976), remove the out-of-disk check here and
// TODO: When disk space scheduling is implemented (#11976), remove the out-of-disk check here and
// add the disk space predicate to predicates.GeneralPredicates.
// add the disk space predicate to predicates.GeneralPredicates.
if
kl
.
isOutOfDisk
()
{
if
kl
.
isOutOfDisk
()
{
glog
.
Warningf
(
"Failed to admit pod %v - %s"
,
format
.
Pod
(
pod
),
"predicate fails due to
is
OutOfDisk"
)
glog
.
Warningf
(
"Failed to admit pod %v - %s"
,
format
.
Pod
(
pod
),
"predicate fails due to OutOfDisk"
)
return
false
,
"OutOfDisk"
,
"cannot be started due to lack of disk space."
return
false
,
"OutOfDisk"
,
"cannot be started due to lack of disk space."
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment