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
caeb5842
Commit
caeb5842
authored
May 30, 2017
by
Di Xu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
remove redundant carriage return (cont'd)
parent
bc93e7bc
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
4 deletions
+2
-4
kubelet_volumes.go
pkg/kubelet/kubelet_volumes.go
+1
-2
host_path.go
pkg/volume/host_path/host_path.go
+1
-2
No files found.
pkg/kubelet/kubelet_volumes.go
View file @
caeb5842
...
...
@@ -79,8 +79,7 @@ func (kl *Kubelet) newVolumeMounterFromPlugins(spec *volume.Spec, pod *v1.Pod, o
// cleanupOrphanedPodDirs removes the volumes of pods that should not be
// running and that have no containers running. Note that we roll up logs here since it runs in the main loop.
func
(
kl
*
Kubelet
)
cleanupOrphanedPodDirs
(
pods
[]
*
v1
.
Pod
,
runningPods
[]
*
kubecontainer
.
Pod
)
error
{
func
(
kl
*
Kubelet
)
cleanupOrphanedPodDirs
(
pods
[]
*
v1
.
Pod
,
runningPods
[]
*
kubecontainer
.
Pod
)
error
{
allPods
:=
sets
.
NewString
()
for
_
,
pod
:=
range
pods
{
allPods
.
Insert
(
string
(
pod
.
UID
))
...
...
pkg/volume/host_path/host_path.go
View file @
caeb5842
...
...
@@ -298,8 +298,7 @@ func (r *hostPathDeleter) Delete() error {
return
os
.
RemoveAll
(
r
.
GetPath
())
}
func
getVolumeSource
(
spec
*
volume
.
Spec
)
(
*
v1
.
HostPathVolumeSource
,
bool
,
error
)
{
func
getVolumeSource
(
spec
*
volume
.
Spec
)
(
*
v1
.
HostPathVolumeSource
,
bool
,
error
)
{
if
spec
.
Volume
!=
nil
&&
spec
.
Volume
.
HostPath
!=
nil
{
return
spec
.
Volume
.
HostPath
,
spec
.
ReadOnly
,
nil
}
else
if
spec
.
PersistentVolume
!=
nil
&&
...
...
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