Skip to content

Commit

Permalink
fix: Correct loop in kube pod selector
Browse files Browse the repository at this point in the history
  • Loading branch information
LashaJini committed Sep 25, 2024
1 parent c001a1d commit a2f4f46
Show file tree
Hide file tree
Showing 2 changed files with 73 additions and 6 deletions.
12 changes: 6 additions & 6 deletions clients/pkg/promtail/targets/file/filetargetmanager.go
Original file line number Diff line number Diff line change
Expand Up @@ -264,13 +264,13 @@ func (tm *FileTargetManager) fulfillKubePodSelector(selectors []kubernetes.Selec
return []kubernetes.SelectorConfig{{Role: kubernetes.RolePod, Field: nodeSelector}}
}

for _, selector := range selectors {
if selector.Field == "" {
selector.Field = nodeSelector
} else if !strings.Contains(selector.Field, nodeSelector) {
selector.Field += "," + nodeSelector
for i := range selectors {
if selectors[i].Field == "" {
selectors[i].Field = nodeSelector
} else if !strings.Contains(selectors[i].Field, nodeSelector) {
selectors[i].Field += "," + nodeSelector
}
selector.Role = kubernetes.RolePod
selectors[i].Role = kubernetes.RolePod
}

return selectors
Expand Down
67 changes: 67 additions & 0 deletions clients/pkg/promtail/targets/file/filetargetmanager_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ import (
"github.com/go-kit/log"
"github.com/prometheus/common/model"
"github.com/prometheus/prometheus/discovery"
"github.com/prometheus/prometheus/discovery/kubernetes"
"github.com/prometheus/prometheus/discovery/targetgroup"

"github.com/grafana/loki/v3/clients/pkg/promtail/api"
Expand Down Expand Up @@ -594,3 +595,69 @@ func TestLabelSetUpdate(t *testing.T) {
require.Equal(t, 0, len(syncer.fileEventWatchers))

}

func TestFulfillKubePodSelector(t *testing.T) {
w := log.NewSyncWriter(os.Stderr)
logger := log.NewLogfmtLogger(w)
logDirName := newTestLogDirectories(t)

positionsFileName := filepath.Join(logDirName, "positions.yml")
ps, err := newTestPositions(logger, positionsFileName)
if err != nil {
t.Fatal(err)
}

client := fake.New(func() {})
defer client.Stop()

ftm, err := newTestFileTargetManager(logger, client, ps, logDirName+"/*")

host := "test-host"

// empty selectors
selectors := []kubernetes.SelectorConfig{}
expected := []kubernetes.SelectorConfig{
{Role: kubernetes.RolePod, Field: fmt.Sprintf("%s=%s", kubernetesPodNodeField, host)},
}

result := ftm.fulfillKubePodSelector(selectors, host)
require.Equal(t, expected, result)

// non-empty selectors with empty field
selectors = []kubernetes.SelectorConfig{
{Role: kubernetes.RolePod, Field: ""},
}
expected = []kubernetes.SelectorConfig{
{Role: kubernetes.RolePod, Field: fmt.Sprintf("%s=%s", kubernetesPodNodeField, host)},
}

result = ftm.fulfillKubePodSelector(selectors, host)
require.Equal(t, expected, result)

// non-empty selectors with existing field without nodeSelector
selectors = []kubernetes.SelectorConfig{
{Role: kubernetes.RolePod, Field: "app=frontend"},
}
expectedField := "app=frontend," + fmt.Sprintf("%s=%s", kubernetesPodNodeField, host)
expected = []kubernetes.SelectorConfig{
{Role: kubernetes.RolePod, Field: expectedField},
}

result = ftm.fulfillKubePodSelector(selectors, host)
require.Equal(t, expected, result)

// non-empty selectors with existing Field containing nodeSelector
nodeSelector := fmt.Sprintf("%s=%s", kubernetesPodNodeField, host)
selectors = []kubernetes.SelectorConfig{
{Role: kubernetes.RolePod, Field: nodeSelector},
}
expected = []kubernetes.SelectorConfig{
{Role: kubernetes.RolePod, Field: nodeSelector},
}

result = ftm.fulfillKubePodSelector(selectors, host)
require.Equal(t, expected, result)

ftm.Stop()
ps.Stop()
}

0 comments on commit a2f4f46

Please sign in to comment.