MINOR: add 'standalone-backend' annotation on ingress/service to create a separate backend for this ingress

Author: ivanmatmati

pkg/controller/global.go

@@ -168,7 +168,7 @@ func (c *HAProxyController) handleDefaultService() (reload bool) {
 		SvcName:          name,
 		IsDefaultBackend: true,
 	}
-	if svc, err = service.New(c.store, ingressPath, nil, false, c.store.ConfigMaps.Main.Annotations); err == nil {
+	if svc, err = service.New(c.store, ingressPath, nil, false, "", "", c.store.ConfigMaps.Main.Annotations); err == nil {
 		reload, err = svc.SetDefaultBackend(c.store, c.haproxy, []string{c.haproxy.FrontHTTP, c.haproxy.FrontHTTPS}, c.annotations)
 	}
 	if err != nil {
@@ -237,7 +237,7 @@ func (c *HAProxyController) handleDefaultLocalService() (reload bool) {
 		IsDefaultBackend: true,
 	}
 
-	if svc, err = service.New(c.store, ingressPath, nil, false); err == nil {
+	if svc, err = service.New(c.store, ingressPath, nil, false, "", ""); err == nil {
 		reload, err = svc.SetDefaultBackend(c.store, c.haproxy, []string{c.haproxy.FrontHTTP, c.haproxy.FrontHTTPS}, c.annotations)
 	}
 	if err != nil {

pkg/handler/tcp-services.go

@@ -198,7 +198,7 @@ func (handler TCPServices) updateTCPFrontend(k store.K8s, h haproxy.HAProxy, fro
 		SvcPortInt:       p.port,
 		IsDefaultBackend: true,
 	}
-	if svc, err = service.New(k, path, nil, true); err == nil {
+	if svc, err = service.New(k, path, nil, true, "", ""); err == nil {
 		r, err = svc.SetDefaultBackend(k, h, []string{frontend.Name}, a)
 	}
 	return reload || r, err

pkg/ingress/ingress.go

@@ -94,7 +94,7 @@ func (i Ingress) supported(k8s store.K8s, a annotations.Annotations) (supported
 }
 
 func (i *Ingress) handlePath(k store.K8s, h haproxy.HAProxy, host string, path *store.IngressPath, a annotations.Annotations) (reload bool, err error) {
-	svc, err := service.New(k, path, h.Certificates, i.sslPassthrough, i.resource.Annotations, k.ConfigMaps.Main.Annotations)
+	svc, err := service.New(k, path, h.Certificates, i.sslPassthrough, i.resource.Namespace, i.resource.Name, i.resource.Annotations, k.ConfigMaps.Main.Annotations)
 	if err != nil {
 		return
 	}
@@ -203,7 +203,7 @@ func addRules(list rules.List, h haproxy.HAProxy, ingressRule bool) []rules.Rule
 func (i *Ingress) Update(k store.K8s, h haproxy.HAProxy, a annotations.Annotations) (reload bool) {
 	// Default Backend
 	if i.resource.DefaultBackend != nil {
-		svc, err := service.New(k, i.resource.DefaultBackend, h.Certificates, false, i.resource.Annotations, k.ConfigMaps.Main.Annotations)
+		svc, err := service.New(k, i.resource.DefaultBackend, h.Certificates, false, i.resource.Namespace, i.resource.Name, i.resource.Annotations, k.ConfigMaps.Main.Annotations)
 		if svc != nil {
 			reload, err = svc.SetDefaultBackend(k, h, []string{h.FrontHTTP, h.FrontHTTPS}, a)
 		}

pkg/service/service.go

@@ -35,31 +35,44 @@ var logger = utils.GetLogger()
 const cookieKey = "ohph7OoGhong"
 
 type Service struct {
-	path        *store.IngressPath
-	resource    *store.Service
-	backend     *models.Backend
-	certs       certs.Certificates
-	annotations []map[string]string
-	modeTCP     bool
-	newBackend  bool
+	path             *store.IngressPath
+	resource         *store.Service
+	backend          *models.Backend
+	certs            certs.Certificates
+	annotations      []map[string]string
+	modeTCP          bool
+	newBackend       bool
+	standalone       bool
+	ingressName      string
+	ingressNamespace string
 }
 
 // New returns a Service instance to handle the k8s IngressPath resource given in params.
 // An error will be returned if there is no k8s Service resource corresponding to the service description in IngressPath.
-func New(k store.K8s, path *store.IngressPath, certs certs.Certificates, tcpService bool, annList ...map[string]string) (*Service, error) {
+func New(k store.K8s, path *store.IngressPath, certs certs.Certificates, tcpService bool, ingressNamespace, ingressName string, annList ...map[string]string) (*Service, error) {
 	service, err := k.GetService(path.SvcNamespace, path.SvcName)
 	if err != nil {
 		return nil, err
 	}
 	a := make([]map[string]string, 1, 3)
 	a[0] = service.Annotations
 	a = append(a, annList...)
+	var standalone bool
+	for _, anns := range a {
+		standalone = len(anns) != 0 && anns["standalone-backend"] == "true"
+		if standalone {
+			break
+		}
+	}
 	return &Service{
-		path:        path,
-		resource:    service,
-		certs:       certs,
-		annotations: a,
-		modeTCP:     tcpService,
+		path:             path,
+		resource:         service,
+		certs:            certs,
+		annotations:      a,
+		modeTCP:          tcpService,
+		standalone:       standalone,
+		ingressName:      ingressName,
+		ingressNamespace: ingressNamespace,
 	}, nil
 }
 
@@ -104,11 +117,20 @@ func (s *Service) GetBackendName() (name string, err error) {
 		}
 		return
 	}
+	resourceNamespace := s.resource.Namespace
+	resourceName := s.resource.Name
+	prefix := ""
+	if s.standalone && s.ingressName != "" {
+		resourceName = s.ingressName
+		resourceNamespace = s.ingressNamespace
+		prefix = "ing_"
+	}
+
 	s.path.SvcPortResolved = &svcPort
 	if svcPort.Name != "" {
-		name = fmt.Sprintf("%s_%s_%s", s.resource.Namespace, s.resource.Name, svcPort.Name)
+		name = fmt.Sprintf("%s%s_%s_%s", prefix, resourceNamespace, resourceName, svcPort.Name)
 	} else {
-		name = fmt.Sprintf("%s_%s_%s", s.resource.Namespace, s.resource.Name, strconv.Itoa(int(svcPort.Port)))
+		name = fmt.Sprintf("%s%s_%s_%s", prefix, resourceNamespace, resourceName, strconv.Itoa(int(svcPort.Port)))
 	}
 	return
 }