Fix Rancher API pagination limits #1453
Conversation
martinbaillie
changed the title
provider/rancher.go
Outdated
| @@ -290,7 +290,10 @@ func listRancherEnvironments(client *rancher.RancherClient) []*rancher.Environme | |||
|
|
|||
| var environmentList = []*rancher.Environment{} | |||
|
|
|||
| environments, err := client.Environment.List(nil) | |||
| withoutPagination := &rancher.ListOpts{ | |||
There was a problem hiding this comment.
How about setting up a "const" ListOpts and reuse it?
(where "const" could possibly mean: declare a var and initialize it in an init() function.)
There was a problem hiding this comment.
Sure @timoreimann. Like this?
|
Could we cover the disabled pagination in one of our integration tests somehow? Not a must if it turns out to be tricky, but would be nice. |
provider/rancher.go
Outdated
| @@ -44,6 +48,10 @@ type rancherData struct { | |||
| Health string | |||
| } | |||
|
|
|||
| func init() { | |||
| withoutPagination.Filters["limit"] = 0 | |||
There was a problem hiding this comment.
You're accessing the fields of a pointer to a struct. Wouldn't that cause a nil dereference error unless you initialized the variable?
|
It may be tricky as it's a struct passed straight into the Rancher client but happy to take a look @timoreimann. Could you point me towards the integration tests for Rancher though? I couldn't find them 😕 |
|
@martinbaillie: apologies -- I thought we had integration tests for Ranger but apparently we don't. IIRC, it's on the todo list. Let's leave that for another PR then. |
This fix allows the Traefik Rancher provider to obtain a complete view of the environments, services and containers being managed by the Rancher deployment.
martinbaillie
force-pushed
the
rancher-provider-pagination-fixes
branch
from
bf331f7
to
73f09f3
Compare
|
@timoreimann no problem re. integration tests. I've tidied up the branch commits and fixed that init mistake 🤒 |
There was a problem hiding this comment.
LGTM 👼 Thanks! Could you fix the conflict so we can merge? @martinbaillie
SantoDE
added
contributor/waiting-for-corrections
kind/enhancement
|
@SantoDE merged in master again. cheers 👍 |
This fix allows the Traefik Rancher provider to obtain a complete view
of the environments, services and containers being managed by the
Rancher deployment.
Resolves #1452