diff --git a/operator/CHANGELOG.md b/operator/CHANGELOG.md index aae398a877..2de326e6bf 100644 --- a/operator/CHANGELOG.md +++ b/operator/CHANGELOG.md @@ -1,5 +1,6 @@ ## Main +- [5621](https://github.com/grafana/loki/pull/5621) **periklis**: Use recommended labels for LokiStack components - [5607](https://github.com/grafana/loki/pull/5607) **periklis**: Use lokistack name as prefix for owned resources - [5588](https://github.com/grafana/loki/pull/5588) **periklis**: Add RBAC for Prometheus service discovery to Loki component metrics (OpenShift) - [5576](https://github.com/grafana/loki/pull/5576) **xperimental**: Change endpoints for generated liveness and readiness probes diff --git a/operator/internal/manifests/var.go b/operator/internal/manifests/var.go index 0b26605a87..dd99153007 100644 --- a/operator/internal/manifests/var.go +++ b/operator/internal/manifests/var.go @@ -77,9 +77,10 @@ func commonAnnotations(h string) map[string]string { func commonLabels(stackName string) map[string]string { return map[string]string{ - "app.kubernetes.io/name": "loki", - "app.kubernetes.io/provider": "openshift", - "loki.grafana.com/name": stackName, + "app.kubernetes.io/name": "lokistack", + "app.kubernetes.io/instance": stackName, + "app.kubernetes.io/managed-by": "lokistack-controller", + "app.kubernetes.io/created-by": "lokistack-controller", } } @@ -91,10 +92,10 @@ func serviceAnnotations(serviceName string, enableSigningService bool) map[strin return annotations } -// ComponentLabels is a list of all commonLabels including the loki.grafana.com/component: label +// ComponentLabels is a list of all commonLabels including the app.kubernetes.io/component: label func ComponentLabels(component, stackName string) labels.Set { return labels.Merge(commonLabels(stackName), map[string]string{ - "loki.grafana.com/component": component, + "app.kubernetes.io/component": component, }) }