DevFW-CICD/ingress-nginx-helm
14
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1043 from antoineco/ep-targetref

Browse source 
Return reference to object providing Endpoint
This commit is contained in:
Manuel Alejandro de Brito Fontes 2017-08-02 19:56:22 -04:00 committed by GitHub
commit 1045e432c7
3 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
core/pkg/ingress/controller/controller.go
View file

@ -1180,6 +1180,7 @@ func (ic *GenericController) getEndpoints(
Port: fmt.Sprintf("%v", targetPort), Port: fmt.Sprintf("%v", targetPort),
MaxFails: hz.MaxFails, MaxFails: hz.MaxFails,
FailTimeout: hz.FailTimeout, FailTimeout: hz.FailTimeout,
Target: epAddress.TargetRef,
} }
upsServers = append(upsServers, ups) upsServers = append(upsServers, ups)
adus[ep] = true adus[ep] = true

2
core/pkg/ingress/types.go
View file

@ -198,6 +198,8 @@ type Endpoint struct {
// of unsuccessful attempts to communicate with the server should happen // of unsuccessful attempts to communicate with the server should happen
// to consider the endpoint unavailable // to consider the endpoint unavailable
FailTimeout int `json:"failTimeout"` FailTimeout int `json:"failTimeout"`
// Target returns a reference to the object providing the endpoint
Target *api.ObjectReference `json:"target"`
} }
// Server describes a website // Server describes a website

3
core/pkg/ingress/types_equals.go
View file

@ -258,6 +258,9 @@ func (e1 *Endpoint) Equal(e2 *Endpoint) bool {
if e1.FailTimeout != e2.FailTimeout { if e1.FailTimeout != e2.FailTimeout {
return false return false
} }
if e1.Target != e2.Target {
return false
}
return true return true
} }