MINOR: CR: enable config-snippets even with CR usage

No need to make custom resources and config-snippet mutually exclusive

Author: Mo3m3n

controller/annotations/annotations.go

@@ -20,12 +20,17 @@ type Annotation interface {
 	Process(k store.K8s, annotations ...map[string]string) error
 }
 
-func Global(g *models.Global, l *models.LogTargets) []Annotation {
+func GlobalCfgSnipp() []Annotation {
 	return []Annotation{
 		NewGlobalCfgSnippet("global-config-snippet"),
 		NewFrontendCfgSnippet("frontend-config-snippet", "http"),
 		NewFrontendCfgSnippet("frontend-config-snippet", "https"),
 		NewFrontendCfgSnippet("stats-config-snippet", "stats"),
+	}
+}
+
+func Global(g *models.Global, l *models.LogTargets) []Annotation {
+	return []Annotation{
 		global.NewSyslogServers("syslog-server", l),
 		global.NewNbthread("nbthread", g),
 		global.NewMaxconn("maxconn", g),
@@ -92,7 +97,6 @@ func Frontend(i store.Ingress, r *haproxy.Rules, m haproxy.Maps) []Annotation {
 
 func Backend(b *models.Backend, s store.K8s, certs *haproxy.Certificates) []Annotation {
 	annotations := []Annotation{
-		NewBackendCfgSnippet("backend-config-snippet", b.Name),
 		service.NewAbortOnClose("abortonclose", b),
 		service.NewTimeoutCheck("timeout-check", b),
 		service.NewLoadBalance("load-balance", b),

controller/global.go

@@ -79,6 +79,19 @@ func (c *HAProxyController) globalCfg() (reload, restart bool) {
 		logger.Debugf("Global log targets updated: %s\nRestart required", updated)
 		restart = true
 	}
+	reload, res := c.globalCfgSnipp()
+	restart = restart || res
+	return
+}
+
+func (c *HAProxyController) globalCfgSnipp() (reload, restart bool) {
+	var err error
+	for _, a := range annotations.GlobalCfgSnipp() {
+		err = a.Process(c.Store, c.Store.ConfigMaps.Main.Annotations)
+		if err != nil {
+			logger.Errorf("annotation %s: %s", a.GetName(), err)
+		}
+	}
 	updatedSnipp, errSnipp := annotations.UpdateGlobalCfgSnippet(c.Client)
 	logger.Error(errSnipp)
 	if len(updatedSnipp) != 0 {

controller/service/service.go

@@ -134,6 +134,7 @@ func (s *SvcContext) HandleBackend(client api.HAProxyClient, store store.K8s) (r
 		logger.Debugf("Ingress '%s/%s': new backend '%s', reload required", s.ingress.Namespace, s.ingress.Name, newBackend.Name)
 	}
 	// config-snippet
+	logger.Error(annotations.NewBackendCfgSnippet("backend-config-snippet", newBackend.Name).Process(store, s.service.Annotations, s.ingress.Annotations, store.ConfigMaps.Main.Annotations))
 	change, errSnipp := annotations.UpdateBackendCfgSnippet(client, newBackend.Name)
 	logger.Error(errSnipp)
 	if len(change) != 0 {