baalajimaestro/traefik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge pull request #1453 from martinbaillie/rancher-provider-pagination-fixes

Browse source 
Fix Rancher API pagination limits
This commit is contained in:
Vincent Demeester 2017-04-19 13:36:55 +02:00 • committed by GitHub
commit 4e0f131fcd
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
provider/rancher/rancher.go
View file

@ -26,6 +26,10 @@ const (
RancherDefaultWatchTime = 15 * time.Second RancherDefaultWatchTime = 15 * time.Second
) )
var (
withoutPagination *rancher.ListOpts
)
var _ provider.Provider = (*Provider)(nil) var _ provider.Provider = (*Provider)(nil)
// Provider holds configurations of the provider. // Provider holds configurations of the provider.
@ -45,6 +49,12 @@ type rancherData struct {
Health string Health string
} }
func init() {
withoutPagination = &rancher.ListOpts{
Filters: map[string]interface{}{"limit": 0},
}
}
func (r rancherData) String() string { func (r rancherData) String() string {
return fmt.Sprintf("{name:%s, labels:%v, containers: %v, health: %s}", r.Name, r.Labels, r.Containers, r.Health) return fmt.Sprintf("{name:%s, labels:%v, containers: %v, health: %s}", r.Name, r.Labels, r.Containers, r.Health)
} }
@ -291,7 +301,7 @@ func listRancherEnvironments(client *rancher.RancherClient) []*rancher.Environme
var environmentList = []*rancher.Environment{} var environmentList = []*rancher.Environment{}
environments, err := client.Environment.List(nil) environments, err := client.Environment.List(withoutPagination)
if err != nil { if err != nil {
log.Errorf("Cannot get Provider Environments %+v", err) log.Errorf("Cannot get Provider Environments %+v", err)
@ -308,7 +318,7 @@ func listRancherServices(client *rancher.RancherClient) []*rancher.Service {
var servicesList = []*rancher.Service{} var servicesList = []*rancher.Service{}
services, err := client.Service.List(nil) services, err := client.Service.List(withoutPagination)
if err != nil { if err != nil {
log.Errorf("Cannot get Provider Services %+v", err) log.Errorf("Cannot get Provider Services %+v", err)
@ -325,7 +335,7 @@ func listRancherContainer(client *rancher.RancherClient) []*rancher.Container {
containerList := []*rancher.Container{} containerList := []*rancher.Container{}
container, err := client.Container.List(nil) container, err := client.Container.List(withoutPagination)
log.Debugf("first container len: %i", len(container.Data)) log.Debugf("first container len: %i", len(container.Data))