1
0
Fork 0

Merge v1.5.4 into master

This commit is contained in:
Ludovic Fernandez 2018-03-15 22:22:03 +01:00 committed by Traefiker Bot
parent 8d468925d3
commit 526c19181e
10 changed files with 92 additions and 32 deletions

View file

@ -128,8 +128,7 @@ func (p *Provider) serviceFilter(service rancherData) bool {
log.Debugf("Filtering service %s with healthState of %s", service.Name, service.Health)
return false
}
if service.State != "" && service.State != active && service.State != updatingActive && service.State != upgraded {
if service.State != "" && service.State != active && service.State != updatingActive && service.State != upgraded && service.State != upgrading {
log.Debugf("Filtering service %s with state of %s", service.Name, service.State)
return false
}

View file

@ -18,6 +18,7 @@ const (
active = "active"
running = "running"
upgraded = "upgraded"
upgrading = "upgrading"
updatingActive = "updating-active"
updatingRunning = "updating-running"
)
@ -63,7 +64,7 @@ func containerFilter(name, healthState, state string) bool {
return false
}
if state != "" && state != running && state != updatingRunning {
if state != "" && state != running && state != updatingRunning && state != upgraded {
log.Debugf("Filtering container %s with state of %s", name, state)
return false
}