MINOR: expect any podname format in GetPodPrefix

Author: Mo3m3n

controller/kubernetes.go

@@ -740,6 +740,10 @@ func (k *K8s) EventsSecrets(channel chan SyncDataEvent, stop chan struct{}, info
 }
 
 func (k *K8s) EventPods(namespace, podPrefix string, resyncPeriod time.Duration, eventChan chan SyncDataEvent) {
+	var prefix string
+	if podPrefix == "" {
+		return
+	}
 	watchlist := cache.NewListWatchFromClient(k.API.CoreV1().RESTClient(), "pods", namespace, fields.Nothing())
 	_, eController := cache.NewInformer(
 		watchlist,
@@ -748,15 +752,16 @@ func (k *K8s) EventPods(namespace, podPrefix string, resyncPeriod time.Duration,
 		cache.ResourceEventHandlerFuncs{
 			AddFunc: func(obj interface{}) {
 				meta := obj.(*corev1.Pod).ObjectMeta
-				if utils.GetPodPrefix(meta.Name) != podPrefix {
+				prefix, _ = utils.GetPodPrefix(meta.Name)
+				if prefix != podPrefix {
 					return
 				}
 				eventChan <- SyncDataEvent{SyncType: POD, Namespace: meta.Namespace, Data: store.PodEvent{Created: true}}
 			},
 			DeleteFunc: func(obj interface{}) {
 				meta := obj.(*corev1.Pod).ObjectMeta
-
-				if utils.GetPodPrefix(meta.Name) != podPrefix {
+				prefix, _ = utils.GetPodPrefix(meta.Name)
+				if prefix != podPrefix {
 					return
 				}
 				eventChan <- SyncDataEvent{SyncType: POD, Namespace: meta.Namespace, Data: store.PodEvent{}}

controller/utils/utils.go

@@ -16,6 +16,7 @@ package utils
 
 import (
 	"encoding/hex"
+	"fmt"
 	"hash/fnv"
 	"os"
 	"strconv"
@@ -116,11 +117,17 @@ func GetBoolValue(dataValue, dataName string) (result bool, err error) {
 	return result, nil
 }
 
-func GetPodPrefix(podName string) string {
+func GetPodPrefix(podName string) (prefix string, err error) {
 	i := strings.LastIndex(podName, "-")
 	if i == -1 {
-		return ""
+		err = fmt.Errorf("incorrect podName format: '%s'", podName)
+		return
 	}
 	i = strings.LastIndex(string([]rune(podName)[:i]), "-")
-	return string([]rune(podName)[:i])
+	if i == -1 {
+		err = fmt.Errorf("incorrect podName format: '%s'", podName)
+		return
+	}
+	prefix = string([]rune(podName)[:i])
+	return
 }

main.go

@@ -150,12 +150,14 @@ func main() {
 	}
 	logger.Error(os.Chdir(cfg.Env.CfgDir))
 
+	prefix, errPrefix := utils.GetPodPrefix(podName)
+	logger.Error(errPrefix)
+
 	controller := c.HAProxyController{
 		Cfg:          cfg,
 		OSArgs:       osArgs,
 		PodNamespace: os.Getenv("POD_NAMESPACE"),
-		PodPrefix:    utils.GetPodPrefix(podName),
-	}
+		PodPrefix:    prefix}
 	logger.FileName = true
 	// K8s Store
 	s := store.NewK8sStore(osArgs)