Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add missing label servicemonitor #2573

Merged
merged 15 commits into from
Mar 11, 2024
Merged

Add missing label servicemonitor #2573

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
ea1e00a
Add missing label for Service/Pod Monitors
yuriolisa Jan 29, 2024
3f6fd0b
Added manifests.utils to set labels
yuriolisa Jan 30, 2024
32bf984
Fixed labels names
yuriolisa Jan 31, 2024
b456ba6
Fixed labels for PodMonitor
yuriolisa Feb 12, 2024
fc03579
Fixed e2e test
yuriolisa Feb 12, 2024
00d2a04
Fixed e2e test
yuriolisa Feb 13, 2024
2ee13bb
Fixed selectorMatchLabels
yuriolisa Feb 13, 2024
81ae4ab
Removed the extra method
yuriolisa Feb 29, 2024
a8a518a
Adjusted nil
yuriolisa Mar 1, 2024
525eb94
Merge branch 'main' into add-missing-label-servicemonitor
yuriolisa Mar 1, 2024
fd39eb9
Changed labels
yuriolisa Mar 7, 2024
50a375d
Changed labels
yuriolisa Mar 7, 2024
956b94e
Readded common labels
yuriolisa Mar 7, 2024
d41662b
Readded common labels
yuriolisa Mar 7, 2024
38464fb
Added labels assert
yuriolisa Mar 8, 2024
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
3 changes: 1 addition & 2 deletions internal/manifests/manifestutils/labels.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
package manifestutils

import (
"fmt"
"regexp"
"strings"

Expand Down Expand Up @@ -90,6 +89,6 @@ func SelectorMatchLabels(instance metav1.ObjectMeta, component string) map[strin
"app.kubernetes.io/instance": naming.Truncate("%s.%s", 63, instance.Namespace, instance.Name),
"app.kubernetes.io/part-of": "opentelemetry",
"app.kubernetes.io/component": component,
"app.kubernetes.io/name": fmt.Sprintf("%s-monitoring", instance.Name),
"app.kubernetes.io/name": naming.ServiceMonitorSelectorName(instance.Name),
}
}
4 changes: 4 additions & 0 deletions internal/naming/main.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,10 @@ func ServiceAccount(otelcol string) string {
func ServiceMonitor(otelcol string) string {
return DNSName(Truncate("%s-collector", 63, otelcol))
}
// ServiceMonitorSelectorName builds the service Monitor name based on the instance.
func ServiceMonitorSelectorName(otelcol string) string {
return DNSName(Truncate("%s-monitoring", 63, otelcol))
}

// PodMonitor builds the pod Monitor name based on the instance.
func PodMonitor(otelcol string) string {
Expand Down
Loading