MEDIUM: CR: Add LogTargets to Global CR

Author: Mo3m3n

controller/annotations/annotations.go

@@ -26,7 +26,7 @@ func Global(g *models.Global, l *models.LogTargets) []Annotation {
 		NewFrontendCfgSnippet("frontend-config-snippet", "http"),
 		NewFrontendCfgSnippet("frontend-config-snippet", "https"),
 		NewFrontendCfgSnippet("stats-config-snippet", "stats"),
-		global.NewSyslogServers("syslog-server", g, l),
+		global.NewSyslogServers("syslog-server", l),
 		global.NewNbthread("nbthread", g),
 		global.NewMaxconn("maxconn", g),
 		global.NewHardStopAfter("hard-stop-after", g),

controller/annotations/global/syslogServer.go

@@ -14,13 +14,12 @@ import (
 
 type SyslogServers struct {
 	name       string
-	global     *models.Global
 	logTargets *models.LogTargets
 	stdout     bool
 }
 
-func NewSyslogServers(n string, g *models.Global, l *models.LogTargets) *SyslogServers {
-	return &SyslogServers{name: n, global: g, logTargets: l}
+func NewSyslogServers(n string, l *models.LogTargets) *SyslogServers {
+	return &SyslogServers{name: n, logTargets: l}
 }
 
 func (a *SyslogServers) GetName() string {
@@ -91,18 +90,5 @@ func (a *SyslogServers) Process(k store.K8s, annotations ...map[string]string) e
 		}
 		*(a.logTargets) = append(*(a.logTargets), &logTarget)
 	}
-
-	// stdout logging won't work with daemon mode
-	var daemonMode bool
-	if a.global.Daemon == "enabled" {
-		daemonMode = true
-	}
-	if a.stdout {
-		if daemonMode {
-			a.global.Daemon = "disabled"
-		}
-	} else if !daemonMode {
-		a.global.Daemon = "enabled"
-	}
 	return nil
 }

controller/configuration/defaults.go

@@ -7,7 +7,7 @@ import (
 )
 
 // SetGlobal will set default values for Global section config.
-func SetGlobal(global *models.Global, env Env) {
+func SetGlobal(global *models.Global, logTargets *models.LogTargets, env Env) {
 	// Enforced values
 	global.MasterWorker = true
 	global.Pidfile = env.PIDFile
@@ -40,6 +40,22 @@ func SetGlobal(global *models.Global, env Env) {
 	if global.SslDefaultBindOptions == "" {
 		global.SslDefaultBindOptions = "no-sslv3 no-tls-tickets no-tlsv10"
 	}
+	if len(*logTargets) == 0 {
+		*logTargets = []*models.LogTarget{{
+			Index:    utils.PtrInt64(0),
+			Address:  "127.0.0.1",
+			Facility: "local0",
+			Level:    "notice",
+		}}
+	} else {
+		for i, v := range *logTargets {
+			v.Index = utils.PtrInt64(int64(i))
+			if v.Address == "stdout" {
+				global.Daemon = ""
+				break
+			}
+		}
+	}
 }
 
 // SetDefaults will set default values for Defaults section config.

controller/crs.go

@@ -70,6 +70,7 @@ func (c GlobalCR) GetInformer(eventChan chan SyncDataEvent, factory informers.Sh
 func (c GlobalCR) ProcessEvent(s *store.K8s, job SyncDataEvent) bool {
 	if job.Data == nil {
 		s.CR.Global = nil
+		s.CR.LogTargets = nil
 		return true
 	}
 	data, ok := job.Data.(*corev1alpha1.Global)
@@ -78,6 +79,7 @@ func (c GlobalCR) ProcessEvent(s *store.K8s, job SyncDataEvent) bool {
 		return false
 	}
 	s.CR.Global = data.Spec.Config
+	s.CR.LogTargets = data.Spec.LogTargets
 	return true
 }
 

controller/global.go

@@ -52,6 +52,7 @@ func (c *HAProxyController) globalCfg() (reload, restart bool) {
 	newGlobal = &models.Global{}
 	if c.Store.CR.Global != nil {
 		newGlobal = c.Store.CR.Global
+		newLg = c.Store.CR.LogTargets
 	} else {
 		for _, a := range annotations.Global(newGlobal, &newLg) {
 			err = a.Process(c.Store, c.Store.ConfigMaps.Main.Annotations)
@@ -60,7 +61,7 @@ func (c *HAProxyController) globalCfg() (reload, restart bool) {
 			}
 		}
 	}
-	configuration.SetGlobal(newGlobal, c.Cfg.Env)
+	configuration.SetGlobal(newGlobal, &newLg, c.Cfg.Env)
 	updated = deep.Equal(newGlobal, global)
 	if len(updated) != 0 {
 		logger.Error(c.Client.GlobalPushConfiguration(*newGlobal))
@@ -69,9 +70,8 @@ func (c *HAProxyController) globalCfg() (reload, restart bool) {
 	}
 	updated = deep.Equal(newLg, lg)
 	if len(updated) != 0 {
-		c.Client.GlobalDeleteLogTargets()
-		logger.Error(c.Client.GlobalCreateLogTargets(newLg))
-		logger.Debugf("Syslog servers updated: %s\nRestart required", updated)
+		logger.Error(c.Client.GlobalPushLogTargets(newLg))
+		logger.Debugf("Global log targets updated: %s\nRestart required", updated)
 		restart = true
 	}
 	updatedSnipp, errSnipp := annotations.UpdateGlobalCfgSnippet(c.Client)

controller/handler/globalcfg.go

@@ -27,12 +27,17 @@ type GlobalCfg struct {
 
 func (h GlobalCfg) Update(k store.K8s, cfg *config.ControllerCfg, api api.HAProxyClient) (reload bool, err error) {
 	global := &models.Global{}
-	defaults := &models.Defaults{}
-	config.SetGlobal(global, cfg.Env)
+	logTargets := &models.LogTargets{}
+	config.SetGlobal(global, logTargets, cfg.Env)
 	err = api.GlobalPushConfiguration(*global)
 	if err != nil {
 		return
 	}
+	err = api.GlobalPushLogTargets(*logTargets)
+	if err != nil {
+		return
+	}
+	defaults := &models.Defaults{}
 	config.SetDefaults(defaults)
 	err = api.DefaultsPushConfiguration(*defaults)
 	if err != nil {

controller/haproxy/api/api.go

@@ -46,8 +46,7 @@ type HAProxyClient interface {
 	FrontendTCPRequestRuleCreate(frontend string, rule models.TCPRequestRule, ingressACL string) error
 	FrontendRuleDeleteAll(frontend string)
 	GlobalGetLogTargets() (models.LogTargets, error)
-	GlobalCreateLogTargets(models.LogTargets) error
-	GlobalDeleteLogTargets()
+	GlobalPushLogTargets(models.LogTargets) error
 	GlobalGetConfiguration() (*models.Global, error)
 	GlobalPushConfiguration(models.Global) error
 	GlobalCfgSnippet(snippet []string) error

controller/haproxy/api/global.go

@@ -6,6 +6,8 @@ import (
 	"github.com/haproxytech/client-native/v2/models"
 	parser "github.com/haproxytech/config-parser/v4"
 	"github.com/haproxytech/config-parser/v4/types"
+
+	"github.com/haproxytech/kubernetes-ingress/controller/utils"
 )
 
 func (c *clientNative) DefaultsGetConfiguration() (defaults *models.Defaults, err error) {
@@ -50,9 +52,15 @@ func (c *clientNative) GlobalGetLogTargets() (lg models.LogTargets, err error) {
 	return
 }
 
-func (c *clientNative) GlobalCreateLogTargets(logTargets models.LogTargets) error {
+func (c *clientNative) GlobalPushLogTargets(logTargets models.LogTargets) error {
 	var err error
 	c.activeTransactionHasChanges = true
+	for {
+		err = c.nativeAPI.Configuration.DeleteLogTarget(0, "global", parser.GlobalSectionName, c.activeTransaction, 0)
+		if err != nil {
+			break
+		}
+	}
 	for _, log := range logTargets {
 		err = c.nativeAPI.Configuration.CreateLogTarget(string(parser.Global), parser.GlobalSectionName, log, c.activeTransaction, 0)
 		if err != nil {
@@ -62,16 +70,6 @@ func (c *clientNative) GlobalCreateLogTargets(logTargets models.LogTargets) erro
 	return nil
 }
 
-func (c *clientNative) GlobalDeleteLogTargets() {
-	c.activeTransactionHasChanges = true
-	for {
-		err := c.nativeAPI.Configuration.DeleteLogTarget(0, "global", parser.GlobalSectionName, c.activeTransaction, 0)
-		if err != nil {
-			break
-		}
-	}
-}
-
 func (c *clientNative) GlobalGetConfiguration() (*models.Global, error) {
 	_, global, err := c.nativeAPI.Configuration.GetGlobalConfiguration(c.activeTransaction)
 	if err != nil {

controller/store/store.go

@@ -32,8 +32,9 @@ type K8s struct {
 }
 
 type CustomResources struct {
-	Global   *models.Global
-	Defaults *models.Defaults
+	Global     *models.Global
+	Defaults   *models.Defaults
+	LogTargets models.LogTargets
 }
 
 type NamespacesWatch struct {

crs/api/core/v1alpha1/global.go

@@ -33,16 +33,23 @@ type Global struct {
 
 // GlobalSpec defines the desired state of Global
 type GlobalSpec struct {
-	Config *models.Global `json:"config"`
+	Config     *models.Global    `json:"config"`
+	LogTargets models.LogTargets `json:"log_targets"`
 }
 
 // DeepCopyInto deepcopying  the receiver into out. in must be non-nil.
 func (in *GlobalSpec) DeepCopyInto(out *GlobalSpec) {
-	*out = *in
 	if in.Config != nil {
 		b, _ := in.Config.MarshalBinary()
 		_ = out.Config.UnmarshalBinary(b)
 	}
+	if in.LogTargets != nil {
+		out.LogTargets = make([]*models.LogTarget, len(in.LogTargets))
+		for i, v := range in.LogTargets {
+			b, _ := v.MarshalBinary()
+			_ = out.LogTargets[i].UnmarshalBinary(b)
+		}
+	}
 }
 
 // +k8s:deepcopy-gen:interfaces=k8s.io/apimachinery/pkg/runtime.Object