BUG/MINOR: configsnippets from different ingresses pointing to same service

Author: ivanmatmati

pkg/annotations/annotations.go

@@ -17,6 +17,8 @@ import (
 	"github.com/haproxytech/kubernetes-ingress/pkg/utils"
 )
 
+var logger = utils.GetLogger()
+
 type Annotation interface {
 	GetName() string
 	Process(k store.K8s, annotations ...map[string]string) error

pkg/annotations/cfgSnippet.go

@@ -1,13 +1,15 @@
 package annotations
 
 import (
+	"sort"
 	"strings"
 
 	"github.com/go-test/deep"
 
 	"github.com/haproxytech/kubernetes-ingress/pkg/annotations/common"
 	"github.com/haproxytech/kubernetes-ingress/pkg/haproxy/api"
 	"github.com/haproxytech/kubernetes-ingress/pkg/store"
+	"github.com/haproxytech/kubernetes-ingress/pkg/utils"
 )
 
 type CfgSnippet struct {
@@ -17,8 +19,9 @@ type CfgSnippet struct {
 }
 
 type cfgData struct {
-	value   []string
-	updated []string
+	value         []string
+	previousValue []string
+	updated       []string
 }
 
 // cfgSnippet is a particular type of config that is not
@@ -76,15 +79,12 @@ func (a *CfgSnippet) Process(k store.K8s, annotations ...map[string]string) erro
 			cfgSnippet.frontends[a.frontend].updated = updated
 		}
 	case a.backend != "":
-		_, ok := cfgSnippet.backends[a.backend]
+		cfg, ok := cfgSnippet.backends[a.backend]
 		if !ok {
-			cfgSnippet.backends[a.backend] = &cfgData{}
-		}
-		updated := deep.Equal(cfgSnippet.backends[a.backend].value, data)
-		if len(updated) != 0 {
-			cfgSnippet.backends[a.backend].value = data
-			cfgSnippet.backends[a.backend].updated = updated
+			cfg = &cfgData{}
 		}
+		cfg.value = append(cfg.value, data...)
+		cfgSnippet.backends[a.backend] = cfg
 	default:
 		updated := deep.Equal(cfgSnippet.global.value, data)
 		if len(updated) != 0 {
@@ -133,16 +133,25 @@ func UpdateBackendCfgSnippet(api api.HAProxyClient, backend string) (updated []s
 	if !ok {
 		return
 	}
-	if len(data.updated) == 0 {
+	defer func() {
+		data.value = nil
+	}()
+	valueCopy := make([]string, len(data.value))
+	copy(valueCopy, data.value)
+	prevValueCopy := make([]string, len(data.previousValue))
+	copy(prevValueCopy, data.previousValue)
+	sort.StringSlice(valueCopy).Sort()
+	sort.StringSlice(prevValueCopy).Sort()
+	updated = deep.Equal(valueCopy, prevValueCopy)
+	if len(updated) == 0 {
 		return
 	}
 	err = api.BackendCfgSnippetSet(backend, data.value)
 	if err != nil {
 		return
 	}
-	updated = data.updated
-	data.updated = nil
-	cfgSnippet.backends[backend] = data
+	data.previousValue = data.value
+	data.value = nil
 	return
 }
 
@@ -152,3 +161,17 @@ func RemoveBackendCfgSnippet(backend string) {
 	}
 	delete(cfgSnippet.backends, backend)
 }
+
+func HandleBackendCfgSnippet(api api.HAProxyClient) (reload bool, err error) {
+	var errs utils.Errors
+	for backend := range cfgSnippet.backends {
+		updated, errBackend := UpdateBackendCfgSnippet(api, backend)
+		if len(updated) != 0 {
+			logger.Debugf("backend configsnippet of '%s' has been updated, reload required", backend)
+		}
+		reload = reload || len(updated) != 0
+		errs.Add(errBackend)
+	}
+	err = errs.Result()
+	return
+}

pkg/controller/handler.go

@@ -50,6 +50,7 @@ func (c *HAProxyController) initHandlers() {
 			AddrIPv6: c.osArgs.IPV6BindAddr,
 		},
 		&handler.PatternFiles{},
+		&handler.BackendCfgSnippet{},
 	}
 	if c.osArgs.PprofEnabled {
 		c.updateHandlers = append(c.updateHandlers, handler.Pprof{})

pkg/handler/backendCfgSnippet.go

@@ -0,0 +1,27 @@
+// Copyright 2019 HAProxy Technologies LLC
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//    http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package handler
+
+import (
+	"github.com/haproxytech/kubernetes-ingress/pkg/annotations"
+	"github.com/haproxytech/kubernetes-ingress/pkg/haproxy"
+	"github.com/haproxytech/kubernetes-ingress/pkg/store"
+)
+
+type BackendCfgSnippet struct{}
+
+func (handler BackendCfgSnippet) Update(k store.K8s, h haproxy.HAProxy, a annotations.Annotations) (reload bool, err error) {
+	return annotations.HandleBackendCfgSnippet(h.HAProxyClient)
+}

pkg/service/service.go

@@ -143,12 +143,6 @@ func (s *Service) HandleBackend(store store.K8s, client api.HAProxyClient, a ann
 	}
 	// config-snippet
 	logger.Error(annotations.NewBackendCfgSnippet("backend-config-snippet", newBackend.Name).Process(store, s.annotations...))
-	change, errSnipp := annotations.UpdateBackendCfgSnippet(client, newBackend.Name)
-	logger.Error(errSnipp)
-	if len(change) != 0 {
-		reload = true
-		logger.Debugf("Service '%s/%s': backend '%s' config-snippet updated: %s\nReload required", s.resource.Namespace, s.resource.Name, newBackend.Name, change)
-	}
 	return
 }