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

Merge pull request #3437 from Shopify/ingress-annotations

Browse source 
Use struct to pack Ingress and its annotations
This commit is contained in:
k8s-ci-robot 2018-11-21 00:41:58 -08:00 committed by GitHub
commit c99716aadf
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
8 changed files with 171 additions and 158 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
internal/ingress/controller/controller.go
View file

@ -372,18 +372,14 @@ func (n *NGINXController) getDefaultUpstream() *ingress.Backend {
// getBackendServers returns a list of Upstream and Server to be used by the // getBackendServers returns a list of Upstream and Server to be used by the
// backend. An upstream can be used in multiple servers if the namespace, // backend. An upstream can be used in multiple servers if the namespace,
// service name and port are the same. // service name and port are the same.
func (n *NGINXController) getBackendServers(ingresses []*extensions.Ingress) ([]*ingress.Backend, []*ingress.Server) { func (n *NGINXController) getBackendServers(ingresses []*ingress.Ingress) ([]*ingress.Backend, []*ingress.Server) {
du := n.getDefaultUpstream() du := n.getDefaultUpstream()
upstreams := n.createUpstreams(ingresses, du) upstreams := n.createUpstreams(ingresses, du)
servers := n.createServers(ingresses, upstreams, du) servers := n.createServers(ingresses, upstreams, du)
for _, ing := range ingresses { for _, ing := range ingresses {
ingKey := k8s.MetaNamespaceKey(ing) ingKey := k8s.MetaNamespaceKey(ing)
anns := ing.ParsedAnnotations
anns, err := n.store.GetIngressAnnotations(ingKey)
if err != nil {
glog.Errorf("Error getting Ingress annotations %q: %v", ingKey, err)
}
for _, rule := range ing.Spec.Rules { for _, rule := range ing.Spec.Rules {
host := rule.Host host := rule.Host
@ -631,17 +627,12 @@ func (n *NGINXController) getBackendServers(ingresses []*extensions.Ingress) ([]
// createUpstreams creates the NGINX upstreams (Endpoints) for each Service // createUpstreams creates the NGINX upstreams (Endpoints) for each Service
// referenced in Ingress rules. // referenced in Ingress rules.
func (n *NGINXController) createUpstreams(data []*extensions.Ingress, du *ingress.Backend) map[string]*ingress.Backend { func (n *NGINXController) createUpstreams(data []*ingress.Ingress, du *ingress.Backend) map[string]*ingress.Backend {
upstreams := make(map[string]*ingress.Backend) upstreams := make(map[string]*ingress.Backend)
upstreams[defUpstreamName] = du upstreams[defUpstreamName] = du
for _, ing := range data { for _, ing := range data {
ingKey := k8s.MetaNamespaceKey(ing) anns := ing.ParsedAnnotations
anns, err := n.store.GetIngressAnnotations(ingKey)
if err != nil {
glog.Errorf("Error getting Ingress annotations %q: %v", ingKey, err)
}
var defBackend string var defBackend string
if ing.Spec.Backend != nil { if ing.Spec.Backend != nil {
@ -878,7 +869,7 @@ func (n *NGINXController) serviceEndpoints(svcKey, backendPort string) ([]ingres
// createServers builds a map of host name to Server structs from a map of // createServers builds a map of host name to Server structs from a map of
// already computed Upstream structs. Each Server is configured with at least // already computed Upstream structs. Each Server is configured with at least
// one root location, which uses a default backend if left unspecified. // one root location, which uses a default backend if left unspecified.
func (n *NGINXController) createServers(data []*extensions.Ingress, func (n *NGINXController) createServers(data []*ingress.Ingress,
upstreams map[string]*ingress.Backend, upstreams map[string]*ingress.Backend,
du *ingress.Backend) map[string]*ingress.Server { du *ingress.Backend) map[string]*ingress.Server {
@ -932,11 +923,7 @@ func (n *NGINXController) createServers(data []*extensions.Ingress,
// initialize all other servers // initialize all other servers
for _, ing := range data { for _, ing := range data {
ingKey := k8s.MetaNamespaceKey(ing) ingKey := k8s.MetaNamespaceKey(ing)
anns := ing.ParsedAnnotations
anns, err := n.store.GetIngressAnnotations(ingKey)
if err != nil {
glog.Errorf("Error getting Ingress annotations %q: %v", ingKey, err)
}
// default upstream name // default upstream name
un := du.Name un := du.Name
@ -1015,11 +1002,7 @@ func (n *NGINXController) createServers(data []*extensions.Ingress,
// configure default location, alias, and SSL // configure default location, alias, and SSL
for _, ing := range data { for _, ing := range data {
ingKey := k8s.MetaNamespaceKey(ing) ingKey := k8s.MetaNamespaceKey(ing)
anns := ing.ParsedAnnotations
anns, err := n.store.GetIngressAnnotations(ingKey)
if err != nil {
glog.Errorf("Error getting Ingress annotations %q: %v", ingKey, err)
}
for _, rule := range ing.Spec.Rules { for _, rule := range ing.Spec.Rules {
host := rule.Host host := rule.Host
@ -1126,7 +1109,7 @@ func (n *NGINXController) createServers(data []*extensions.Ingress,
// If a match is found, we know that this server should back the alternative backend and add the alternative backend // If a match is found, we know that this server should back the alternative backend and add the alternative backend
// to a backend's alternative list. // to a backend's alternative list.
// If no match is found, then the serverless backend is deleted. // If no match is found, then the serverless backend is deleted.
func mergeAlternativeBackends(ing *extensions.Ingress, upstreams map[string]*ingress.Backend, func mergeAlternativeBackends(ing *ingress.Ingress, upstreams map[string]*ingress.Backend,
servers map[string]*ingress.Server) { servers map[string]*ingress.Server) {
// merge catch-all alternative backends // merge catch-all alternative backends
@ -1183,7 +1166,7 @@ func mergeAlternativeBackends(ing *extensions.Ingress, upstreams map[string]*ing
// extractTLSSecretName returns the name of the Secret containing a SSL // extractTLSSecretName returns the name of the Secret containing a SSL
// certificate for the given host name, or an empty string. // certificate for the given host name, or an empty string.
func extractTLSSecretName(host string, ing *extensions.Ingress, func extractTLSSecretName(host string, ing *ingress.Ingress,
getLocalSSLCert func(string) (*ingress.SSLCert, error)) string { getLocalSSLCert func(string) (*ingress.SSLCert, error)) string {
if ing == nil { if ing == nil {

209
internal/ingress/controller/controller_test.go
View file

@ -20,9 +20,10 @@ import (
"crypto/x509" "crypto/x509"
"crypto/x509/pkix" "crypto/x509/pkix"
"encoding/asn1" "encoding/asn1"
"k8s.io/apimachinery/pkg/util/intstr"
"testing" "testing"
"k8s.io/apimachinery/pkg/util/intstr"
extensions "k8s.io/api/extensions/v1beta1" extensions "k8s.io/api/extensions/v1beta1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/ingress-nginx/internal/ingress" "k8s.io/ingress-nginx/internal/ingress"
@ -30,31 +31,33 @@ import (
func TestMergeAlternativeBackends(t *testing.T) { func TestMergeAlternativeBackends(t *testing.T) {
testCases := map[string]struct { testCases := map[string]struct {
ingress *extensions.Ingress ingress *ingress.Ingress
upstreams map[string]*ingress.Backend upstreams map[string]*ingress.Backend
servers map[string]*ingress.Server servers map[string]*ingress.Server
expNumAlternativeBackends int expNumAlternativeBackends int
expNumLocations int expNumLocations int
}{ }{
"alternative backend has no server and embeds into matching real backend": { "alternative backend has no server and embeds into matching real backend": {
&extensions.Ingress{ &ingress.Ingress{
ObjectMeta: metav1.ObjectMeta{ Ingress: extensions.Ingress{
Namespace: "example", ObjectMeta: metav1.ObjectMeta{
}, Namespace: "example",
Spec: extensions.IngressSpec{ },
Rules: []extensions.IngressRule{ Spec: extensions.IngressSpec{
{ Rules: []extensions.IngressRule{
Host: "example.com", {
IngressRuleValue: extensions.IngressRuleValue{ Host: "example.com",
HTTP: &extensions.HTTPIngressRuleValue{ IngressRuleValue: extensions.IngressRuleValue{
Paths: []extensions.HTTPIngressPath{ HTTP: &extensions.HTTPIngressRuleValue{
{ Paths: []extensions.HTTPIngressPath{
Path: "/", {
Backend: extensions.IngressBackend{ Path: "/",
ServiceName: "http-svc-canary", Backend: extensions.IngressBackend{
ServicePort: intstr.IntOrString{ ServiceName: "http-svc-canary",
Type: intstr.Int, ServicePort: intstr.IntOrString{
IntVal: 80, Type: intstr.Int,
IntVal: 80,
},
}, },
}, },
}, },
@ -93,43 +96,45 @@ func TestMergeAlternativeBackends(t *testing.T) {
1, 1,
}, },
"merging a alternative backend matches with the correct host": { "merging a alternative backend matches with the correct host": {
&extensions.Ingress{ &ingress.Ingress{
ObjectMeta: metav1.ObjectMeta{ Ingress: extensions.Ingress{
Namespace: "example", ObjectMeta: metav1.ObjectMeta{
}, Namespace: "example",
Spec: extensions.IngressSpec{ },
Rules: []extensions.IngressRule{ Spec: extensions.IngressSpec{
{ Rules: []extensions.IngressRule{
Host: "foo.bar", {
IngressRuleValue: extensions.IngressRuleValue{ Host: "foo.bar",
HTTP: &extensions.HTTPIngressRuleValue{ IngressRuleValue: extensions.IngressRuleValue{
Paths: []extensions.HTTPIngressPath{ HTTP: &extensions.HTTPIngressRuleValue{
{ Paths: []extensions.HTTPIngressPath{
Path: "/", {
Backend: extensions.IngressBackend{ Path: "/",
ServiceName: "foo-http-svc-canary", Backend: extensions.IngressBackend{
ServicePort: intstr.IntOrString{ ServiceName: "foo-http-svc-canary",
Type: intstr.Int, ServicePort: intstr.IntOrString{
IntVal: 80, Type: intstr.Int,
IntVal: 80,
},
}, },
}, },
}, },
}, },
}, },
}, },
}, {
{ Host: "example.com",
Host: "example.com", IngressRuleValue: extensions.IngressRuleValue{
IngressRuleValue: extensions.IngressRuleValue{ HTTP: &extensions.HTTPIngressRuleValue{
HTTP: &extensions.HTTPIngressRuleValue{ Paths: []extensions.HTTPIngressPath{
Paths: []extensions.HTTPIngressPath{ {
{ Path: "/",
Path: "/", Backend: extensions.IngressBackend{
Backend: extensions.IngressBackend{ ServiceName: "http-svc-canary",
ServiceName: "http-svc-canary", ServicePort: intstr.IntOrString{
ServicePort: intstr.IntOrString{ Type: intstr.Int,
Type: intstr.Int, IntVal: 80,
IntVal: 80, },
}, },
}, },
}, },
@ -209,7 +214,7 @@ func TestMergeAlternativeBackends(t *testing.T) {
func TestExtractTLSSecretName(t *testing.T) { func TestExtractTLSSecretName(t *testing.T) {
testCases := map[string]struct { testCases := map[string]struct {
host string host string
ingress *extensions.Ingress ingress *ingress.Ingress
fn func(string) (*ingress.SSLCert, error) fn func(string) (*ingress.SSLCert, error)
expName string expName string
}{ }{
@ -223,7 +228,7 @@ func TestExtractTLSSecretName(t *testing.T) {
}, },
"empty ingress": { "empty ingress": {
"foo.bar", "foo.bar",
&extensions.Ingress{}, &ingress.Ingress{},
func(string) (*ingress.SSLCert, error) { func(string) (*ingress.SSLCert, error) {
return nil, nil return nil, nil
}, },
@ -231,17 +236,19 @@ func TestExtractTLSSecretName(t *testing.T) {
}, },
"ingress tls, nil secret": { "ingress tls, nil secret": {
"foo.bar", "foo.bar",
&extensions.Ingress{ &ingress.Ingress{
ObjectMeta: metav1.ObjectMeta{ Ingress: extensions.Ingress{
Name: "test", ObjectMeta: metav1.ObjectMeta{
}, Name: "test",
Spec: extensions.IngressSpec{
TLS: []extensions.IngressTLS{
{SecretName: "demo"},
}, },
Rules: []extensions.IngressRule{ Spec: extensions.IngressSpec{
{ TLS: []extensions.IngressTLS{
Host: "foo.bar", {SecretName: "demo"},
},
Rules: []extensions.IngressRule{
{
Host: "foo.bar",
},
}, },
}, },
}, },
@ -253,17 +260,19 @@ func TestExtractTLSSecretName(t *testing.T) {
}, },
"ingress tls, no host, matching cert cn": { "ingress tls, no host, matching cert cn": {
"foo.bar", "foo.bar",
&extensions.Ingress{ &ingress.Ingress{
ObjectMeta: metav1.ObjectMeta{ Ingress: extensions.Ingress{
Name: "test", ObjectMeta: metav1.ObjectMeta{
}, Name: "test",
Spec: extensions.IngressSpec{
TLS: []extensions.IngressTLS{
{SecretName: "demo"},
}, },
Rules: []extensions.IngressRule{ Spec: extensions.IngressSpec{
{ TLS: []extensions.IngressTLS{
Host: "foo.bar", {SecretName: "demo"},
},
Rules: []extensions.IngressRule{
{
Host: "foo.bar",
},
}, },
}, },
}, },
@ -277,19 +286,21 @@ func TestExtractTLSSecretName(t *testing.T) {
}, },
"ingress tls, no host, wildcard cert with matching cn": { "ingress tls, no host, wildcard cert with matching cn": {
"foo.bar", "foo.bar",
&extensions.Ingress{ &ingress.Ingress{
ObjectMeta: metav1.ObjectMeta{ Ingress: extensions.Ingress{
Name: "test", ObjectMeta: metav1.ObjectMeta{
}, Name: "test",
Spec: extensions.IngressSpec{
TLS: []extensions.IngressTLS{
{
SecretName: "demo",
},
}, },
Rules: []extensions.IngressRule{ Spec: extensions.IngressSpec{
{ TLS: []extensions.IngressTLS{
Host: "test.foo.bar", {
SecretName: "demo",
},
},
Rules: []extensions.IngressRule{
{
Host: "test.foo.bar",
},
}, },
}, },
}, },
@ -303,20 +314,22 @@ func TestExtractTLSSecretName(t *testing.T) {
}, },
"ingress tls, hosts, matching cert cn": { "ingress tls, hosts, matching cert cn": {
"foo.bar", "foo.bar",
&extensions.Ingress{ &ingress.Ingress{
ObjectMeta: metav1.ObjectMeta{ Ingress: extensions.Ingress{
Name: "test", ObjectMeta: metav1.ObjectMeta{
}, Name: "test",
Spec: extensions.IngressSpec{
TLS: []extensions.IngressTLS{
{
Hosts: []string{"foo.bar", "example.com"},
SecretName: "demo",
},
}, },
Rules: []extensions.IngressRule{ Spec: extensions.IngressSpec{
{ TLS: []extensions.IngressTLS{
Host: "foo.bar", {
Hosts: []string{"foo.bar", "example.com"},
SecretName: "demo",
},
},
Rules: []extensions.IngressRule{
{
Host: "foo.bar",
},
}, },
}, },
}, },

25
internal/ingress/controller/store/store.go
View file

@ -74,10 +74,7 @@ type Storer interface {
GetIngress(key string) (*extensions.Ingress, error) GetIngress(key string) (*extensions.Ingress, error)
// ListIngresses returns a list of all Ingresses in the store. // ListIngresses returns a list of all Ingresses in the store.
ListIngresses() []*extensions.Ingress ListIngresses() []*ingress.Ingress
// GetIngressAnnotations returns the parsed annotations of an Ingress matching key.
GetIngressAnnotations(key string) (*annotations.Ingress, error)
// GetLocalSSLCert returns the local copy of a SSLCert // GetLocalSSLCert returns the local copy of a SSLCert
GetLocalSSLCert(name string) (*ingress.SSLCert, error) GetLocalSSLCert(name string) (*ingress.SSLCert, error)
@ -644,15 +641,22 @@ func (s k8sStore) GetIngress(key string) (*extensions.Ingress, error) {
} }
// ListIngresses returns the list of Ingresses // ListIngresses returns the list of Ingresses
func (s k8sStore) ListIngresses() []*extensions.Ingress { func (s k8sStore) ListIngresses() []*ingress.Ingress {
// filter ingress rules // filter ingress rules
var ingresses []*extensions.Ingress var ingresses []*ingress.Ingress
for _, item := range s.listers.Ingress.List() { for _, item := range s.listers.Ingress.List() {
ing := item.(*extensions.Ingress) ing := item.(*extensions.Ingress)
if !class.IsValid(ing) { if !class.IsValid(ing) {
continue continue
} }
ingKey := k8s.MetaNamespaceKey(ing)
anns, err := s.getIngressAnnotations(ingKey)
if err != nil {
glog.Errorf("Error getting Ingress annotations %q: %v", ingKey, err)
}
for ri, rule := range ing.Spec.Rules { for ri, rule := range ing.Spec.Rules {
if rule.HTTP == nil { if rule.HTTP == nil {
continue continue
@ -665,14 +669,17 @@ func (s k8sStore) ListIngresses() []*extensions.Ingress {
} }
} }
ingresses = append(ingresses, ing) ingresses = append(ingresses, &ingress.Ingress{
Ingress: *ing,
ParsedAnnotations: anns,
})
} }
return ingresses return ingresses
} }
// GetIngressAnnotations returns the parsed annotations of an Ingress matching key. // getIngressAnnotations returns the parsed annotations of an Ingress matching key.
func (s k8sStore) GetIngressAnnotations(key string) (*annotations.Ingress, error) { func (s k8sStore) getIngressAnnotations(key string) (*annotations.Ingress, error) {
ia, err := s.listers.IngressAnnotation.ByKey(key) ia, err := s.listers.IngressAnnotation.ByKey(key)
if err != nil { if err != nil {
return &annotations.Ingress{}, err return &annotations.Ingress{}, err

3
internal/ingress/controller/store/store_test.go
View file

@ -730,7 +730,8 @@ func newStore(t *testing.T) *k8sStore {
return &k8sStore{ return &k8sStore{
listers: &Lister{ listers: &Lister{
// add more listers if needed // add more listers if needed
Ingress: IngressLister{cache.NewStore(cache.MetaNamespaceKeyFunc)}, Ingress: IngressLister{cache.NewStore(cache.MetaNamespaceKeyFunc)},
IngressAnnotation: IngressAnnotationsLister{cache.NewStore(cache.DeletionHandlingMetaNamespaceKeyFunc)},
}, },
sslStore: NewSSLCertTracker(), sslStore: NewSSLCertTracker(),
filesystem: fs, filesystem: fs,

5
internal/ingress/controller/template/template.go
View file

@ -34,7 +34,6 @@ import (
"github.com/golang/glog" "github.com/golang/glog"
"github.com/pkg/errors" "github.com/pkg/errors"
extensions "k8s.io/api/extensions/v1beta1"
"k8s.io/apimachinery/pkg/util/sets" "k8s.io/apimachinery/pkg/util/sets"
"k8s.io/ingress-nginx/internal/file" "k8s.io/ingress-nginx/internal/file"
"k8s.io/ingress-nginx/internal/ingress" "k8s.io/ingress-nginx/internal/ingress"
@ -796,9 +795,9 @@ type ingressInformation struct {
} }
func getIngressInformation(i, p interface{}) *ingressInformation { func getIngressInformation(i, p interface{}) *ingressInformation {
ing, ok := i.(*extensions.Ingress) ing, ok := i.(*ingress.Ingress)
if !ok { if !ok {
glog.Errorf("expected an '*extensions.Ingress' type but %T was returned", i) glog.Errorf("expected an '*ingress.Ingress' type but %T was returned", i)
return &ingressInformation{} return &ingressInformation{}
} }

6
internal/ingress/status/status.go
View file

@ -30,7 +30,6 @@ import (
pool "gopkg.in/go-playground/pool.v3" pool "gopkg.in/go-playground/pool.v3"
apiv1 "k8s.io/api/core/v1" apiv1 "k8s.io/api/core/v1"
extensions "k8s.io/api/extensions/v1beta1"
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
"k8s.io/apimachinery/pkg/labels" "k8s.io/apimachinery/pkg/labels"
"k8s.io/apimachinery/pkg/util/wait" "k8s.io/apimachinery/pkg/util/wait"
@ -41,6 +40,7 @@ import (
"k8s.io/client-go/tools/record" "k8s.io/client-go/tools/record"
"k8s.io/kubernetes/pkg/kubelet/util/sliceutils" "k8s.io/kubernetes/pkg/kubelet/util/sliceutils"
"k8s.io/ingress-nginx/internal/ingress"
"k8s.io/ingress-nginx/internal/k8s" "k8s.io/ingress-nginx/internal/k8s"
"k8s.io/ingress-nginx/internal/task" "k8s.io/ingress-nginx/internal/task"
) )
@ -57,7 +57,7 @@ type Sync interface {
type ingressLister interface { type ingressLister interface {
// ListIngresses returns the list of Ingresses // ListIngresses returns the list of Ingresses
ListIngresses() []*extensions.Ingress ListIngresses() []*ingress.Ingress
} }
// Config ... // Config ...
@ -371,7 +371,7 @@ func (s *statusSync) updateStatus(newIngressPoint []apiv1.LoadBalancerIngress) {
batch.WaitAll() batch.WaitAll()
} }
func runUpdate(ing *extensions.Ingress, status []apiv1.LoadBalancerIngress, func runUpdate(ing *ingress.Ingress, status []apiv1.LoadBalancerIngress,
client clientset.Interface) pool.WorkFunc { client clientset.Interface) pool.WorkFunc {
return func(wu pool.WorkUnit) (interface{}, error) { return func(wu pool.WorkUnit) (interface{}, error) {
if wu.IsCancelled() { if wu.IsCancelled() {

37
internal/ingress/status/status_test.go
View file

@ -26,6 +26,7 @@ import (
metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
testclient "k8s.io/client-go/kubernetes/fake" testclient "k8s.io/client-go/kubernetes/fake"
"k8s.io/ingress-nginx/internal/ingress"
"k8s.io/ingress-nginx/internal/ingress/annotations/class" "k8s.io/ingress-nginx/internal/ingress/annotations/class"
"k8s.io/ingress-nginx/internal/k8s" "k8s.io/ingress-nginx/internal/k8s"
"k8s.io/ingress-nginx/internal/task" "k8s.io/ingress-nginx/internal/task"
@ -231,25 +232,27 @@ func buildExtensionsIngresses() []extensions.Ingress {
type testIngressLister struct { type testIngressLister struct {
} }
func (til *testIngressLister) ListIngresses() []*extensions.Ingress { func (til *testIngressLister) ListIngresses() []*ingress.Ingress {
var ingresses []*extensions.Ingress var ingresses []*ingress.Ingress
ingresses = append(ingresses, &extensions.Ingress{ ingresses = append(ingresses, &ingress.Ingress{
ObjectMeta: metav1.ObjectMeta{ Ingress: extensions.Ingress{
Name: "foo_ingress_non_01", ObjectMeta: metav1.ObjectMeta{
Namespace: apiv1.NamespaceDefault, Name: "foo_ingress_non_01",
}}) Namespace: apiv1.NamespaceDefault,
}}})
ingresses = append(ingresses, &extensions.Ingress{ ingresses = append(ingresses, &ingress.Ingress{
ObjectMeta: metav1.ObjectMeta{ Ingress: extensions.Ingress{
Name: "foo_ingress_1", ObjectMeta: metav1.ObjectMeta{
Namespace: apiv1.NamespaceDefault, Name: "foo_ingress_1",
}, Namespace: apiv1.NamespaceDefault,
Status: extensions.IngressStatus{
LoadBalancer: apiv1.LoadBalancerStatus{
Ingress: buildLoadBalancerIngressByIP(),
}, },
}, Status: extensions.IngressStatus{
}) LoadBalancer: apiv1.LoadBalancerStatus{
Ingress: buildLoadBalancerIngressByIP(),
},
},
}})
return ingresses return ingresses
} }

9
internal/ingress/types.go
View file

@ -20,6 +20,7 @@ import (
apiv1 "k8s.io/api/core/v1" apiv1 "k8s.io/api/core/v1"
extensions "k8s.io/api/extensions/v1beta1" extensions "k8s.io/api/extensions/v1beta1"
"k8s.io/apimachinery/pkg/util/intstr" "k8s.io/apimachinery/pkg/util/intstr"
"k8s.io/ingress-nginx/internal/ingress/annotations"
"k8s.io/ingress-nginx/internal/ingress/annotations/modsecurity" "k8s.io/ingress-nginx/internal/ingress/annotations/modsecurity"
"k8s.io/ingress-nginx/internal/ingress/annotations/auth" "k8s.io/ingress-nginx/internal/ingress/annotations/auth"
@ -209,7 +210,7 @@ type Location struct {
// uses the default backend. // uses the default backend.
IsDefBackend bool `json:"isDefBackend"` IsDefBackend bool `json:"isDefBackend"`
// Ingress returns the ingress from which this location was generated // Ingress returns the ingress from which this location was generated
Ingress *extensions.Ingress `json:"ingress"` Ingress *Ingress `json:"ingress"`
// Backend describes the name of the backend to use. // Backend describes the name of the backend to use.
Backend string `json:"backend"` Backend string `json:"backend"`
// Service describes the referenced services from the ingress // Service describes the referenced services from the ingress
@ -331,3 +332,9 @@ type ProxyProtocol struct {
Decode bool `json:"decode"` Decode bool `json:"decode"`
Encode bool `json:"encode"` Encode bool `json:"encode"`
} }
// Ingress holds the definition of an Ingress plus its annotations
type Ingress struct {
extensions.Ingress
ParsedAnnotations *annotations.Ingress
}