operator: Use recommended labels for LokiStack components (#5621)

pull/5624/head
Periklis Tsirakidis 4 years ago committed by GitHub
parent 88372c93cc
commit 0ca425d471
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 1
      operator/CHANGELOG.md
  2. 11
      operator/internal/manifests/var.go

@ -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

@ -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:<component> label
// ComponentLabels is a list of all commonLabels including the app.kubernetes.io/component:<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,
})
}

Loading…
Cancel
Save