github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 13:37:30 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #19940 from yujuhong/fix_update

Browse Source 
Auto commit by PR queue bot
This commit is contained in:
k8s-merge-robot 2016-02-01 13:35:54 -08:00
commit 7e158006c0
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/kubelet/config/config.go
View File

@ -161,12 +161,18 @@ func (s *podStorage) Merge(source string, change interface{}) error {
if len(deletes.Pods) > 0 { if len(deletes.Pods) > 0 {
s.updates <- *deletes s.updates <- *deletes
} }
if len(adds.Pods) > 0 || firstSet { if len(adds.Pods) > 0 {
s.updates <- *adds s.updates <- *adds
} }
if len(updates.Pods) > 0 { if len(updates.Pods) > 0 {
s.updates <- *updates s.updates <- *updates
} }
if firstSet && len(adds.Pods) == 0 && len(updates.Pods) == 0 {
// Send an empty update when first seeing the source and there are
// no ADD or UPDATE pods from the source. This signals kubelet that
// the source is ready.
s.updates <- *adds
}
// Only add reconcile support here, because kubelet doesn't support Snapshot update now. // Only add reconcile support here, because kubelet doesn't support Snapshot update now.
if len(reconciles.Pods) > 0 { if len(reconciles.Pods) > 0 {
s.updates <- *reconciles s.updates <- *reconciles