Skip to content

Commit 885d61c

Browse files
committed
BUG/MINOR: fixes podprefix test in maxconn calculation after names changed with Helm naming adoption.
With previous naming of kubernetes resources, no collision could happen with : if !strings.HasPrefix(meta.Name, podPrefix) {...} But after Helm naming adoption, we have default backend pod named "haproxy-kubernetes-ingress-default-backend-xxxxxxxxx-xxxxx" and ingress controller named "haproxy-kubernetes-ingress-xxxxxxxxxx-xxxxx" which results in podprefix = haproxy-kubernetes-ingress and both pods passing the test.
1 parent 6156cfe commit 885d61c

File tree

1 file changed

+2
-3
lines changed

1 file changed

+2
-3
lines changed

controller/kubernetes.go

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ package controller
1616

1717
import (
1818
"errors"
19-
"strings"
2019
"time"
2120

2221
corev1 "k8s.io/api/core/v1"
@@ -749,15 +748,15 @@ func (k *K8s) EventPods(namespace, podPrefix string, resyncPeriod time.Duration,
749748
cache.ResourceEventHandlerFuncs{
750749
AddFunc: func(obj interface{}) {
751750
meta := obj.(*corev1.Pod).ObjectMeta
752-
if !strings.HasPrefix(meta.Name, podPrefix) {
751+
if utils.GetPodPrefix(meta.Name) != podPrefix {
753752
return
754753
}
755754
eventChan <- SyncDataEvent{SyncType: POD, Namespace: meta.Namespace, Data: store.PodEvent{Created: true}}
756755
},
757756
DeleteFunc: func(obj interface{}) {
758757
meta := obj.(*corev1.Pod).ObjectMeta
759758

760-
if !strings.HasPrefix(meta.Name, podPrefix) {
759+
if utils.GetPodPrefix(meta.Name) != podPrefix {
761760
return
762761
}
763762
eventChan <- SyncDataEvent{SyncType: POD, Namespace: meta.Namespace, Data: store.PodEvent{}}

0 commit comments

Comments
 (0)