Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion pkg/uptime-utils/uptime_utils.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,19 @@ package uptimeutils
import (
"crypto/sha1" //nolint:gosec
"encoding/hex"
"sort"
"strings"
)

func GetUptimeAnnotations(customResourceAnnotations map[string]string, id string, name string, url string, tags []string) map[string]string {
func GetUptimeAnnotations(customResourceAnnotations map[string]string, id string, name string, url string, customResourceLabels map[string]string) map[string]string {

tags := []string{
"public-stats",
}
for _, v := range customResourceLabels {
tags = append(tags, v)
}
sort.Strings(tags)

ingressRouteAnnotations := make(map[string]string)

Expand Down
7 changes: 5 additions & 2 deletions pkg/uptime-utils/uptime_utils_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -87,13 +87,16 @@ func TestSetUptimeAnnotations(t *testing.T) {
id := "1"
name := "test"
url := "http://test.com"
tags := []string{"tag1", "tag2"}
tags := map[string]string{
"a": "tag1",
"b": "tag2",
}

expected := map[string]string{
"uptime.pdok.nl/id": "356a192b7913b04c54574d18c28d46e6395428ab",
"uptime.pdok.nl/name": "test",
"uptime.pdok.nl/url": "http://test.com",
"uptime.pdok.nl/tags": "tag1,tag2",
"uptime.pdok.nl/tags": "public-stats,tag1,tag2",
"uptime.pdok.nl/extra": "extra-value",
}

Expand Down
Loading