Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Always sort upstream list to provide stable iteration order #2598

Merged
merged 2 commits into from
Jun 2, 2018
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions cmd/nginx/flags.go
Original file line number Diff line number Diff line change
@@ -101,8 +101,7 @@ func parseFlags() (bool, *controller.Configuration, error) {
ingress controller should update the Ingress status IP/hostname when the controller
is being stopped. Default is true`)

sortBackends = flags.Bool("sort-backends", false,
`Defines if backends and its endpoints should be sorted`)
sortBackends = flags.Bool("sort-backends", false, `Defines if servers inside NGINX upstream should be sorted`)

useNodeInternalIP = flags.Bool("report-node-internal-ip-address", false,
`Defines if the nodes IP address to be returned in the ingress status should be the internal instead of the external IP address`)
10 changes: 4 additions & 6 deletions internal/ingress/controller/controller.go
Original file line number Diff line number Diff line change
@@ -572,12 +572,6 @@ func (n *NGINXController) getBackendServers(ingresses []*extensions.Ingress) ([]
aUpstreams = append(aUpstreams, upstream)
}

if n.cfg.SortBackends {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Maybe make the corresponding flag dummy and print a deprecation message?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Scratch the deprecation part, I forgot that the flag also influenced the order of endpoints.

sort.SliceStable(aUpstreams, func(a, b int) bool {
return aUpstreams[a].Name < aUpstreams[b].Name
})
}

aServers := make([]*ingress.Server, 0, len(servers))
for _, value := range servers {
sort.SliceStable(value.Locations, func(i, j int) bool {
@@ -586,6 +580,10 @@ func (n *NGINXController) getBackendServers(ingresses []*extensions.Ingress) ([]
aServers = append(aServers, value)
}

sort.SliceStable(aUpstreams, func(a, b int) bool {
return aUpstreams[a].Name < aUpstreams[b].Name
})

sort.SliceStable(aServers, func(i, j int) bool {
return aServers[i].Hostname < aServers[j].Hostname
})
9 changes: 0 additions & 9 deletions internal/ingress/types_equals.go
Original file line number Diff line number Diff line change
@@ -129,9 +129,6 @@ func (b1 *Backend) Equal(b2 *Backend) bool {
if b1.Service.GetName() != b2.Service.GetName() {
return false
}
if b1.Service.GetResourceVersion() != b2.Service.GetResourceVersion() {
return false
}
}

if b1.Port != b2.Port {
@@ -326,9 +323,6 @@ func (l1 *Location) Equal(l2 *Location) bool {
if l1.Service.GetName() != l2.Service.GetName() {
return false
}
if l1.Service.GetResourceVersion() != l2.Service.GetResourceVersion() {
return false
}
}

if l1.Port.StrVal != l2.Port.StrVal {
@@ -424,9 +418,6 @@ func (ptb1 *SSLPassthroughBackend) Equal(ptb2 *SSLPassthroughBackend) bool {
if ptb1.Service.GetName() != ptb2.Service.GetName() {
return false
}
if ptb1.Service.GetResourceVersion() != ptb2.Service.GetResourceVersion() {
return false
}
}

return true