Skip to content

Commit 5862249

Browse files
hdurand0710hdurand0710
committed
BUG/MINOR: add k8s logs and fix k8s resync for endpoints and endpointslices
1 parent 52b1534 commit 5862249

File tree

6 files changed

+54
-69
lines changed

6 files changed

+54
-69
lines changed

‎pkg/haproxy/api/runtime.go‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -83,11 +83,11 @@ func (c *clientNative) SyncBackendSrvs(backend *store.RuntimeBackend, portUpdate
8383
if backend.Name == "" {
8484
return nil
8585
}
86-
logger.Tracef("updating backend %s for haproxy servers update (address and state) through socket", backend.Name)
86+
logger.Tracef("[RUNTIME] [BACKEND] [SERVER] updating backend %s for haproxy servers update (address and state) through socket", backend.Name)
8787
haproxySrvs := backend.HAProxySrvs
8888
addresses := backend.Endpoints.Addresses
89-
logger.Tracef("backend %s: list of servers %+v", backend.Name, haproxySrvs)
90-
logger.Tracef("backend %s: list of endpoints addresses %+v", backend.Name, addresses)
89+
logger.Tracef("[RUNTIME] [BACKEND] [SERVER] backend %s: list of servers %+v", backend.Name, haproxySrvs)
90+
logger.Tracef("[RUNTIME] [BACKEND] [SERVER] backend %s: list of endpoints addresses %+v", backend.Name, addresses)
9191
// Disable stale entries from HAProxySrvs
9292
// and provide list of Disabled Srvs
9393
var disabled []*store.HAProxySrv
@@ -114,8 +114,8 @@ func (c *clientNative) SyncBackendSrvs(backend *store.RuntimeBackend, portUpdate
114114
delete(addresses, newAddr)
115115
}
116116

117-
logger.Tracef("backend %s: list of servers after treatment %+v", backend.Name, haproxySrvs)
118-
logger.Tracef("backend %s: list of endpoints addresses after treatment %+v", backend.Name, addresses)
117+
logger.Tracef("[RUNTIME] [BACKEND] [SERVER] backend %s: list of servers after treatment %+v", backend.Name, haproxySrvs)
118+
logger.Tracef("[RUNTIME] [BACKEND] [SERVER] backend %s: list of endpoints addresses after treatment %+v", backend.Name, addresses)
119119

120120
// Dynamically updates HAProxy backend servers with HAProxySrvs content
121121
var addrErr, stateErr error
@@ -124,18 +124,19 @@ func (c *clientNative) SyncBackendSrvs(backend *store.RuntimeBackend, portUpdate
124124
continue
125125
}
126126
if srv.Address == "" {
127-
logger.Tracef("backend %s: server '%s' changed status to %v", backend.Name, srv.Name, "maint")
127+
logger.Tracef("[RUNTIME] [BACKEND] [SERVER] [SOCKET] backend %s: server '%s' changed status to %v", backend.Name, srv.Name, "maint")
128128
addrErr = c.SetServerAddr(backend.Name, srv.Name, "127.0.0.1", 0)
129129
stateErr = c.SetServerState(backend.Name, srv.Name, "maint")
130130
} else {
131-
logger.Tracef("backend %s: server '%s' changed status to %v", backend.Name, srv.Name, "ready")
131+
logger.Tracef("[RUNTIME] [BACKEND] [SERVER] [SOCKET] backend %s: server '%s': addr '%s' changed status to %v", backend.Name, srv.Name, srv.Address, "ready")
132132
addrErr = c.SetServerAddr(backend.Name, srv.Name, srv.Address, int(backend.Endpoints.Port))
133133
stateErr = c.SetServerState(backend.Name, srv.Name, "ready")
134134
}
135135
if addrErr != nil || stateErr != nil {
136136
backend.DynUpdateFailed = true
137137
errors.Add(addrErr)
138138
errors.Add(stateErr)
139+
logger.Errorf("[RUNTIME] [BACKEND] [SERVER] [SOCKET] backend %s: server '%s': addr '%s': addrError '%v': stateError: '%v'", backend.Name, srv.Name, srv.Address, addrErr, stateErr)
139140
}
140141
}
141142
return errors.Result()

‎pkg/k8s/informers.go‎

Lines changed: 29 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ func (k k8s) getNamespaceInfomer(eventChan chan SyncDataEvent, factory informers
4949
},
5050
Status: status,
5151
}
52-
logger.Tracef("%s %s: %s", NAMESPACE, item.Status, item.Name)
52+
logger.Tracef("[RUNTIME] [K8s] %s %s: %s", NAMESPACE, item.Status, item.Name)
5353
eventChan <- SyncDataEvent{SyncType: NAMESPACE, Namespace: item.Name, Data: item}
5454
},
5555
DeleteFunc: func(obj interface{}) {
@@ -74,7 +74,7 @@ func (k k8s) getNamespaceInfomer(eventChan chan SyncDataEvent, factory informers
7474
},
7575
Status: status,
7676
}
77-
logger.Tracef("%s %s: %s", NAMESPACE, item.Status, item.Name)
77+
logger.Tracef("[RUNTIME] [K8s] %s %s: %s", NAMESPACE, item.Status, item.Name)
7878
eventChan <- SyncDataEvent{SyncType: NAMESPACE, Namespace: item.Name, Data: item}
7979
},
8080
UpdateFunc: func(oldObj, newObj interface{}) {
@@ -100,7 +100,7 @@ func (k k8s) getNamespaceInfomer(eventChan chan SyncDataEvent, factory informers
100100
if item1.Name == item2.Name {
101101
return
102102
}
103-
logger.Tracef("%s %s: %s", SERVICE, item2.Status, item2.Name)
103+
logger.Tracef("[RUNTIME] [K8s] %s %s: %s", NAMESPACE, item2.Status, item2.Name)
104104
eventChan <- SyncDataEvent{SyncType: NAMESPACE, Namespace: item2.Name, Data: item2}
105105
},
106106
},
@@ -143,12 +143,13 @@ func (k k8s) getServiceInformer(eventChan chan SyncDataEvent, factory informers.
143143
Port: int64(sp.Port),
144144
})
145145
}
146-
logger.Tracef("%s %s: %s", SERVICE, item.Status, item.Name)
146+
logger.Tracef("[RUNTIME] [K8s] %s %s: %s", SERVICE, item.Status, item.Name)
147147
eventChan <- SyncDataEvent{SyncType: SERVICE, Namespace: item.Namespace, Data: item}
148148
if k.publishSvc != nil && k.publishSvc.Namespace == item.Namespace && k.publishSvc.Name == item.Name {
149149
// item copy because of ADDED handler in events.go which must modify the STATUS based solely on addresses
150150
itemCopy := *item
151151
itemCopy.Addresses = getServiceAddresses(data)
152+
logger.Tracef("[RUNTIME] [K8s] %s %s: %s", PUBLISH_SERVICE, item.Status, item.Name)
152153
eventChan <- SyncDataEvent{SyncType: PUBLISH_SERVICE, Namespace: item.Namespace, Data: &itemCopy}
153154
}
154155
},
@@ -171,10 +172,11 @@ func (k k8s) getServiceInformer(eventChan chan SyncDataEvent, factory informers.
171172
if data.Spec.Type == corev1.ServiceTypeExternalName {
172173
item.DNS = data.Spec.ExternalName
173174
}
174-
logger.Tracef("%s %s: %s", SERVICE, item.Status, item.Name)
175+
logger.Tracef("[RUNTIME] [K8s] %s %s: %s", SERVICE, item.Status, item.Name)
175176
eventChan <- SyncDataEvent{SyncType: SERVICE, Namespace: item.Namespace, Data: item}
176177
if k.publishSvc != nil && k.publishSvc.Namespace == item.Namespace && k.publishSvc.Name == item.Name {
177178
item.Addresses = getServiceAddresses(data)
179+
logger.Tracef("[RUNTIME] [K8s] %s %s: %s", PUBLISH_SERVICE, item.Status, item.Name)
178180
eventChan <- SyncDataEvent{SyncType: PUBLISH_SERVICE, Namespace: data.Namespace, Data: item}
179181
}
180182
},
@@ -237,11 +239,12 @@ func (k k8s) getServiceInformer(eventChan chan SyncDataEvent, factory informers.
237239
if item2.Equal(item1) {
238240
return
239241
}
240-
logger.Tracef("%s %s: %s", SERVICE, item2.Status, item2.Name)
242+
logger.Tracef("[RUNTIME] [K8s] %s %s: %s", SERVICE, item2.Status, item2.Name)
241243
eventChan <- SyncDataEvent{SyncType: SERVICE, Namespace: item2.Namespace, Data: item2}
242244

243245
if k.publishSvc != nil && k.publishSvc.Namespace == item2.Namespace && k.publishSvc.Name == item2.Name {
244246
item2.Addresses = getServiceAddresses(data2)
247+
logger.Tracef("[RUNTIME] [K8s] %s %s: %s", PUBLISH_SERVICE, item2.Status, item2.Name)
245248
eventChan <- SyncDataEvent{SyncType: PUBLISH_SERVICE, Namespace: item2.Namespace, Data: item2}
246249
}
247250
},
@@ -270,7 +273,7 @@ func (k k8s) getSecretInformer(eventChan chan SyncDataEvent, factory informers.S
270273
Data: data.Data,
271274
Status: status,
272275
}
273-
logger.Tracef("%s %s: %s", SECRET, item.Status, item.Name)
276+
logger.Tracef("[RUNTIME] [K8s] %s %s: %s", SECRET, item.Status, item.Name)
274277
eventChan <- SyncDataEvent{SyncType: SECRET, Namespace: item.Namespace, Data: item}
275278
},
276279
DeleteFunc: func(obj interface{}) {
@@ -286,7 +289,7 @@ func (k k8s) getSecretInformer(eventChan chan SyncDataEvent, factory informers.S
286289
Data: data.Data,
287290
Status: status,
288291
}
289-
logger.Tracef("%s %s: %s", SECRET, item.Status, item.Name)
292+
logger.Tracef("[RUNTIME] [K8s] %s %s: %s", SECRET, item.Status, item.Name)
290293
eventChan <- SyncDataEvent{SyncType: SECRET, Namespace: item.Namespace, Data: item}
291294
},
292295
UpdateFunc: func(oldObj, newObj interface{}) {
@@ -316,7 +319,7 @@ func (k k8s) getSecretInformer(eventChan chan SyncDataEvent, factory informers.S
316319
if item2.Equal(item1) {
317320
return
318321
}
319-
logger.Tracef("%s %s: %s", SECRET, item2.Status, item2.Name)
322+
logger.Tracef("[RUNTIME] [K8s] %s %s: %s", SECRET, item2.Status, item2.Name)
320323
eventChan <- SyncDataEvent{SyncType: SECRET, Namespace: item2.Namespace, Data: item2}
321324
},
322325
},
@@ -345,7 +348,7 @@ func (k k8s) getConfigMapInformer(eventChan chan SyncDataEvent, factory informer
345348
Annotations: store.CopyAnnotations(data.Data),
346349
Status: status,
347350
}
348-
logger.Tracef("%s %s: %s", CONFIGMAP, item.Status, item.Name)
351+
logger.Tracef("[RUNTIME] [K8s] %s %s: %s", CONFIGMAP, item.Status, item.Name)
349352
eventChan <- SyncDataEvent{SyncType: CONFIGMAP, Namespace: item.Namespace, Data: item}
350353
},
351354
DeleteFunc: func(obj interface{}) {
@@ -361,7 +364,7 @@ func (k k8s) getConfigMapInformer(eventChan chan SyncDataEvent, factory informer
361364
Annotations: store.CopyAnnotations(data.Data),
362365
Status: status,
363366
}
364-
logger.Tracef("%s %s: %s", CONFIGMAP, item.Status, item.Name)
367+
logger.Tracef("[RUNTIME] [K8s] %s %s: %s", CONFIGMAP, item.Status, item.Name)
365368
eventChan <- SyncDataEvent{SyncType: CONFIGMAP, Namespace: item.Namespace, Data: item}
366369
},
367370
UpdateFunc: func(oldObj, newObj interface{}) {
@@ -391,7 +394,7 @@ func (k k8s) getConfigMapInformer(eventChan chan SyncDataEvent, factory informer
391394
if item2.Equal(item1) {
392395
return
393396
}
394-
logger.Tracef("%s %s: %s", CONFIGMAP, item2.Status, item2.Name)
397+
logger.Tracef("[RUNTIME] [K8s] %s %s: %s", CONFIGMAP, item2.Status, item2.Name)
395398
eventChan <- SyncDataEvent{SyncType: CONFIGMAP, Namespace: item2.Namespace, Data: item2}
396399
},
397400
},
@@ -471,28 +474,25 @@ func (k k8s) getEndpointsInformer(eventChan chan SyncDataEvent, factory informer
471474
if errors.Is(err, ErrIgnored) {
472475
return
473476
}
474-
logger.Tracef("%s %s: %s", ENDPOINTS, item.Status, item.Service)
477+
logger.Tracef("[RUNTIME] [K8s] %s %s: %s %s", ENDPOINTS, item.Status, item.Service, item.SliceName)
475478
eventChan <- SyncDataEvent{SyncType: ENDPOINTS, Namespace: item.Namespace, Data: item}
476479
},
477480
DeleteFunc: func(obj interface{}) {
478481
item, err := k.convertToEndpoints(obj, store.DELETED)
479482
if errors.Is(err, ErrIgnored) {
480483
return
481484
}
482-
logger.Tracef("%s %s: %s", ENDPOINTS, item.Status, item.Service)
485+
logger.Tracef("[RUNTIME] [K8s] %s %s: %s %s", ENDPOINTS, item.Status, item.Service, item.SliceName)
483486
eventChan <- SyncDataEvent{SyncType: ENDPOINTS, Namespace: item.Namespace, Data: item}
484487
},
485488
UpdateFunc: func(oldObj, newObj interface{}) {
486-
item1, err := k.convertToEndpoints(oldObj, store.EMPTY)
489+
_, err := k.convertToEndpoints(oldObj, store.EMPTY)
487490
if errors.Is(err, ErrIgnored) {
488491
return
489492
}
490493
item2, _ := k.convertToEndpoints(newObj, store.MODIFIED)
491-
if item2.Equal(item1) {
492-
return
493-
}
494494
// fix modified state for ones that are deleted,new,same
495-
logger.Tracef("%s %s: %s", ENDPOINTS, item2.Status, item2.Service)
495+
logger.Tracef("[RUNTIME] [K8s] %s %s: %s %s", ENDPOINTS, item2.Status, item2.Service, item2.SliceName)
496496
eventChan <- SyncDataEvent{SyncType: ENDPOINTS, Namespace: item2.Namespace, Data: item2}
497497
},
498498
})
@@ -537,7 +537,7 @@ func (k k8s) addIngressClassHandlers(eventChan chan SyncDataEvent, informer cach
537537
logger.Errorf("%s: Invalid data from k8s api, %s", INGRESS_CLASS, obj)
538538
return
539539
}
540-
logger.Tracef("%s %s: %s", INGRESS_CLASS, item.Status, item.Name)
540+
logger.Tracef("[RUNTIME] [K8s] %s %s: %s", INGRESS_CLASS, item.Status, item.Name)
541541
eventChan <- SyncDataEvent{SyncType: INGRESS_CLASS, Data: item}
542542
},
543543
DeleteFunc: func(obj interface{}) {
@@ -547,7 +547,7 @@ func (k k8s) addIngressClassHandlers(eventChan chan SyncDataEvent, informer cach
547547
return
548548
}
549549
item.Status = store.DELETED
550-
logger.Tracef("%s %s: %s", INGRESS_CLASS, item.Status, item.Name)
550+
logger.Tracef("[RUNTIME] [K8s] %s %s: %s", INGRESS_CLASS, item.Status, item.Name)
551551
eventChan <- SyncDataEvent{SyncType: INGRESS_CLASS, Data: item}
552552
},
553553
UpdateFunc: func(oldObj, newObj interface{}) {
@@ -558,7 +558,7 @@ func (k k8s) addIngressClassHandlers(eventChan chan SyncDataEvent, informer cach
558558
}
559559
item.Status = store.MODIFIED
560560

561-
logger.Tracef("%s %s: %s", INGRESS_CLASS, item.Status, item.Name)
561+
logger.Tracef("[RUNTIME] [K8s] %s %s: %s", INGRESS_CLASS, item.Status, item.Name)
562562
eventChan <- SyncDataEvent{SyncType: INGRESS_CLASS, Data: item}
563563
},
564564
},
@@ -575,7 +575,7 @@ func (k k8s) addIngressHandlers(eventChan chan SyncDataEvent, informer cache.Sha
575575
return
576576
}
577577
item.Status = store.ADDED
578-
logger.Tracef("%s %s: %s", INGRESS, item.Status, item.Name)
578+
logger.Tracef("[RUNTIME] [K8s] %s %s: %s", INGRESS, item.Status, item.Name)
579579
eventChan <- SyncDataEvent{SyncType: INGRESS, Namespace: item.Namespace, Data: item}
580580
},
581581
DeleteFunc: func(obj interface{}) {
@@ -585,7 +585,7 @@ func (k k8s) addIngressHandlers(eventChan chan SyncDataEvent, informer cache.Sha
585585
return
586586
}
587587
item.Status = store.DELETED
588-
logger.Tracef("%s %s: %s", INGRESS, item.Status, item.Name)
588+
logger.Tracef("[RUNTIME] [K8s] %s %s: %s", INGRESS, item.Status, item.Name)
589589
eventChan <- SyncDataEvent{SyncType: INGRESS, Namespace: item.Namespace, Data: item}
590590
},
591591
UpdateFunc: func(oldObj, newObj interface{}) {
@@ -595,7 +595,7 @@ func (k k8s) addIngressHandlers(eventChan chan SyncDataEvent, informer cache.Sha
595595
return
596596
}
597597
item.Status = store.MODIFIED
598-
logger.Tracef("%s %s: %s", INGRESS, item.Status, item.Name)
598+
logger.Tracef("[RUNTIME] [K8s] %s %s: %s", INGRESS, item.Status, item.Name)
599599
eventChan <- SyncDataEvent{SyncType: INGRESS, Namespace: item.Namespace, Data: item}
600600
},
601601
},
@@ -609,28 +609,25 @@ func (k k8s) addEndpointSliceHandlers(eventChan chan SyncDataEvent, informer cac
609609
if errors.Is(err, ErrIgnored) {
610610
return
611611
}
612-
logger.Tracef("%s %s: %s", ENDPOINTS, item.Status, item.Service)
612+
logger.Tracef("[RUNTIME] [K8s] %s %s: %s %s", ENDPOINTS, item.Status, item.Service, item.SliceName)
613613
eventChan <- SyncDataEvent{SyncType: ENDPOINTS, Namespace: item.Namespace, Data: item}
614614
},
615615
DeleteFunc: func(obj interface{}) {
616616
item, err := k.convertToEndpoints(obj, store.DELETED)
617617
if errors.Is(err, ErrIgnored) {
618618
return
619619
}
620-
logger.Tracef("%s %s: %s", ENDPOINTS, item.Status, item.Service)
620+
logger.Tracef("[RUNTIME] [K8s] %s %s: %s %s", ENDPOINTS, item.Status, item.Service, item.SliceName)
621621
eventChan <- SyncDataEvent{SyncType: ENDPOINTS, Namespace: item.Namespace, Data: item}
622622
},
623623
UpdateFunc: func(oldObj, newObj interface{}) {
624-
item1, err := k.convertToEndpoints(oldObj, store.EMPTY)
624+
_, err := k.convertToEndpoints(oldObj, store.EMPTY)
625625
if errors.Is(err, ErrIgnored) {
626626
return
627627
}
628628
item2, _ := k.convertToEndpoints(newObj, store.MODIFIED)
629-
if item2.Equal(item1) {
630-
return
631-
}
632629
// fix modified state for ones that are deleted,new,same
633-
logger.Tracef("%s %s: %s", ENDPOINTS, item2.Status, item2.Service)
630+
logger.Tracef("[RUNTIME] [K8s] %s %s: %s %s", ENDPOINTS, item2.Status, item2.Service, item2.SliceName)
634631
eventChan <- SyncDataEvent{SyncType: ENDPOINTS, Namespace: item2.Namespace, Data: item2}
635632
},
636633
})

‎pkg/k8s/main.go‎

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -33,11 +33,10 @@ import (
3333
"github.com/haproxytech/kubernetes-ingress/pkg/utils"
3434
)
3535

36-
var logger = utils.GetK8sAPILogger()
36+
var logger = utils.GetLogger()
3737

3838
// TRACE_API outputs all k8s events received from k8s API
3939
const (
40-
TRACE_API = false //nolint:golint,stylecheck
4140
CRSGroupVersionV1alpha1 = "core.haproxy.org/v1alpha1"
4241
CRSGroupVersionV1alpha2 = "core.haproxy.org/v1alpha2"
4342
)
@@ -73,10 +72,6 @@ type k8s struct {
7372
}
7473

7574
func New(osArgs utils.OSArgs, whitelist map[string]struct{}, publishSvc *utils.NamespaceValue) K8s { //nolint:ireturn
76-
if !TRACE_API {
77-
logger.SetLevel(utils.Info)
78-
}
79-
8075
restconfig, err := getRestConfig(osArgs)
8176
logger.Panic(err)
8277
builtInClient := k8sclientset.NewForConfigOrDie(restconfig)

‎pkg/service/endpoints.go‎

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -70,17 +70,22 @@ func (s *Service) updateHAProxySrv(client api.HAProxyClient, srvSlot store.HAPro
7070
srv.Address = srvSlot.Address
7171
srv.Maintenance = "disabled"
7272
}
73-
logger.Tracef("backend %s: about to update server in configuration file : models.Server { Name: %s, Port: %d, Address: %s, Maintenance: %s }", s.backend.Name, srv.Name, *srv.Port, srv.Address, srv.Maintenance)
73+
logger.Tracef("[CONFIG] [BACKEND] [SERVER] backend %s: about to update server in configuration file : models.Server { Name: %s, Port: %d, Address: %s, Maintenance: %s }", s.backend.Name, srv.Name, *srv.Port, srv.Address, srv.Maintenance)
7474
// Update server
7575
errAPI := client.BackendServerEdit(s.backend.Name, srv)
7676
if errAPI == nil {
77-
logger.Tracef("Updating server '%s/%s'", s.backend.Name, srv.Name)
77+
logger.Tracef("[CONFIG] [BACKEND] [SERVER] Updating server '%s/%s'", s.backend.Name, srv.Name)
7878
return
7979
}
8080
// Create server
8181
if strings.Contains(errAPI.Error(), "does not exist") {
82-
logger.Tracef("Creating server '%s/%s'", s.backend.Name, srv.Name)
83-
logger.Error(client.BackendServerCreate(s.backend.Name, srv))
82+
logger.Tracef("[CONFIG] [BACKEND] [SERVER] Creating server '%s/%s'", s.backend.Name, srv.Name)
83+
errAPI = client.BackendServerCreate(s.backend.Name, srv)
84+
if errAPI != nil {
85+
logger.Errorf("[CONFIG] [BACKEND] [SERVER] %v", errAPI)
86+
}
87+
} else {
88+
logger.Errorf("[CONFIG] [BACKEND] [SERVER] %v", errAPI)
8489
}
8590
}
8691

@@ -97,13 +102,13 @@ func (s *Service) scaleHAProxySrvs(backend *store.RuntimeBackend) (reload bool)
97102
for _, annotation := range []string{"servers-increment", "server-slots", "scale-server-slots"} {
98103
annVal, annErr = annotations.Int(annotation, s.annotations...)
99104
if annErr != nil {
100-
logger.Errorf("Scale HAProxy servers: %s", annErr)
105+
logger.Errorf("[CONFIG] [BACKEND] [SERVER] Scale HAProxy servers: %s", annErr)
101106
} else if annVal != 0 {
102107
srvSlots = annVal
103108
break
104109
}
105110
}
106-
logger.Tracef("backend %s: number of slots %d", backend.Name, srvSlots)
111+
logger.Tracef("[CONFIG] [BACKEND] [SERVER] backend %s: number of slots %d", backend.Name, srvSlots)
107112
for len(backend.HAProxySrvs) < srvSlots {
108113
srv := &store.HAProxySrv{
109114
Name: fmt.Sprintf("SRV_%d", len(backend.HAProxySrvs)+1),
@@ -116,7 +121,7 @@ func (s *Service) scaleHAProxySrvs(backend *store.RuntimeBackend) (reload bool)
116121
}
117122
if flag {
118123
reload = true
119-
logger.Debugf("Server slots in backend '%s' scaled to match scale-server-slots value: %d, reload required", s.backend.Name, srvSlots)
124+
logger.Debugf("[CONFIG] [BACKEND] [SERVER] Server slots in backend '%s' scaled to match scale-server-slots value: %d, reload required", s.backend.Name, srvSlots)
120125
}
121126
// Configure remaining addresses in available HAProxySrvs
122127
flag = false
@@ -138,7 +143,7 @@ func (s *Service) scaleHAProxySrvs(backend *store.RuntimeBackend) (reload bool)
138143
}
139144
if flag {
140145
reload = true
141-
logger.Debugf("Server slots in backend '%s' scaled to match available endpoints, reload required", s.backend.Name)
146+
logger.Debugf("[CONFIG] [BACKEND] [SERVER] Server slots in backend '%s' scaled to match available endpoints, reload required", s.backend.Name)
142147
}
143148
return reload
144149
}

‎pkg/store/events.go‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,9 @@ func (k *K8s) EventEndpoints(ns *Namespace, data *Endpoints, syncHAproxySrvs fun
9292
}
9393
if endpoints, ok := ns.Endpoints[data.Service][data.SliceName]; ok {
9494
if data.Status != DELETED && endpoints.Equal(data) {
95+
if data != nil {
96+
logger.Tracef("[RUNTIME] [BACKEND] [SERVER] [No change] [EventEndpoints]. No change for %s %s %s", data.Status, data.Service, data.SliceName)
97+
}
9598
return false
9699
}
97100
}

0 commit comments

Comments
 (0)