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
fa86f074
Commit
fa86f074
authored
Sep 18, 2015
by
k8s-merge-robot
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #14195 from mikedanese/daemon-log
Auto commit by PR queue bot
parents
7425cd5a
144d72ca
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
5 deletions
+7
-5
controller.go
pkg/controller/daemon/controller.go
+7
-5
No files found.
pkg/controller/daemon/controller.go
View file @
fa86f074
...
@@ -214,11 +214,13 @@ func (dsc *DaemonSetsController) getPodDaemonSet(pod *api.Pod) *experimental.Dae
...
@@ -214,11 +214,13 @@ func (dsc *DaemonSetsController) getPodDaemonSet(pod *api.Pod) *experimental.Dae
glog
.
V
(
4
)
.
Infof
(
"No daemon sets found for pod %v, daemon set controller will avoid syncing"
,
pod
.
Name
)
glog
.
V
(
4
)
.
Infof
(
"No daemon sets found for pod %v, daemon set controller will avoid syncing"
,
pod
.
Name
)
return
nil
return
nil
}
}
// More than two items in this list indicates user error. If two daemon
if
len
(
sets
)
>
1
{
// sets overlap, sort by creation timestamp, subsort by name, then pick
// More than two items in this list indicates user error. If two daemon
// the first.
// sets overlap, sort by creation timestamp, subsort by name, then pick
glog
.
Errorf
(
"user error! more than one daemon is selecting pods with labels: %+v"
,
pod
.
Labels
)
// the first.
sort
.
Sort
(
byCreationTimestamp
(
sets
))
glog
.
Errorf
(
"user error! more than one daemon is selecting pods with labels: %+v"
,
pod
.
Labels
)
sort
.
Sort
(
byCreationTimestamp
(
sets
))
}
return
&
sets
[
0
]
return
&
sets
[
0
]
}
}
...
...
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