From e005f04d157502919c24a602e06cbb50f55cd71e Mon Sep 17 00:00:00 2001 From: DylanGuedes Date: Thu, 21 Mar 2024 07:56:38 -0300 Subject: [PATCH] Add `name` label --- production/helm/loki/templates/admin-api/_helpers.yaml | 2 ++ production/helm/loki/templates/backend/_helpers-backend.tpl | 2 ++ production/helm/loki/templates/compactor/_helpers-compactor.tpl | 2 ++ .../helm/loki/templates/distributor/_helpers-distributor.tpl | 2 ++ production/helm/loki/templates/gateway/_helpers-gateway.tpl | 2 ++ .../loki/templates/index-gateway/_helpers-index-gateway.tpl | 2 ++ .../loki/templates/index-gateway/statefulset-index-gateway.yaml | 2 +- .../loki/templates/ingester/statefulset-ingester-zone-a.yaml | 2 +- .../loki/templates/ingester/statefulset-ingester-zone-b.yaml | 2 +- .../loki/templates/ingester/statefulset-ingester-zone-c.yaml | 2 +- production/helm/loki/templates/loki-canary/_helpers.tpl | 2 ++ production/helm/loki/templates/querier/_helpers-querier.tpl | 2 ++ .../loki/templates/query-frontend/_helpers-query-frontend.tpl | 2 ++ .../templates/query-frontend/deployment-query-frontend.yaml | 2 +- .../loki/templates/query-scheduler/_helpers-query-scheduler.tpl | 2 ++ production/helm/loki/templates/read/_helpers-read.tpl | 2 ++ production/helm/loki/templates/ruler/_helpers-ruler.tpl | 2 ++ production/helm/loki/templates/ruler/statefulset-ruler.yaml | 2 +- .../loki/templates/single-binary/_helpers-single-binary.tpl | 2 ++ production/helm/loki/templates/write/_helpers-write.tpl | 2 ++ 20 files changed, 34 insertions(+), 6 deletions(-) diff --git a/production/helm/loki/templates/admin-api/_helpers.yaml b/production/helm/loki/templates/admin-api/_helpers.yaml index e13ff8adbcc3..a88ea4b798bb 100644 --- a/production/helm/loki/templates/admin-api/_helpers.yaml +++ b/production/helm/loki/templates/admin-api/_helpers.yaml @@ -12,6 +12,7 @@ adminApi common labels {{ include "loki.labels" . }} app.kubernetes.io/component: admin-api target: admin-api +name: admin-api {{- end }} {{/* @@ -21,4 +22,5 @@ adminApi selector labels {{ include "loki.selectorLabels" . }} app.kubernetes.io/component: admin-api target: admin-api +name: admin-api {{- end }} \ No newline at end of file diff --git a/production/helm/loki/templates/backend/_helpers-backend.tpl b/production/helm/loki/templates/backend/_helpers-backend.tpl index 08f5f8f7b619..f805c1105374 100644 --- a/production/helm/loki/templates/backend/_helpers-backend.tpl +++ b/production/helm/loki/templates/backend/_helpers-backend.tpl @@ -11,6 +11,7 @@ backend common labels {{- define "loki.backendLabels" -}} {{ include "loki.labels" . }} app.kubernetes.io/component: backend +name: backend {{- end }} {{/* @@ -19,6 +20,7 @@ backend selector labels {{- define "loki.backendSelectorLabels" -}} {{ include "loki.selectorLabels" . }} app.kubernetes.io/component: backend +name: backend {{- end }} {{/* diff --git a/production/helm/loki/templates/compactor/_helpers-compactor.tpl b/production/helm/loki/templates/compactor/_helpers-compactor.tpl index 75c21db16747..4b51ab8d5f65 100644 --- a/production/helm/loki/templates/compactor/_helpers-compactor.tpl +++ b/production/helm/loki/templates/compactor/_helpers-compactor.tpl @@ -11,6 +11,7 @@ compactor common labels {{- define "loki.compactorLabels" -}} {{ include "loki.labels" . }} app.kubernetes.io/component: compactor +name: compactor {{- end }} {{/* @@ -19,6 +20,7 @@ compactor selector labels {{- define "loki.compactorSelectorLabels" -}} {{ include "loki.selectorLabels" . }} app.kubernetes.io/component: compactor +name: compactor {{- end }} {{/* diff --git a/production/helm/loki/templates/distributor/_helpers-distributor.tpl b/production/helm/loki/templates/distributor/_helpers-distributor.tpl index c23179e90501..3966e3caffed 100644 --- a/production/helm/loki/templates/distributor/_helpers-distributor.tpl +++ b/production/helm/loki/templates/distributor/_helpers-distributor.tpl @@ -11,6 +11,7 @@ distributor common labels {{- define "loki.distributorLabels" -}} {{ include "loki.labels" . }} app.kubernetes.io/component: distributor +name: distributor {{- end }} {{/* @@ -19,6 +20,7 @@ distributor selector labels {{- define "loki.distributorSelectorLabels" -}} {{ include "loki.selectorLabels" . }} app.kubernetes.io/component: distributor +name: distributor {{- end }} {{/* diff --git a/production/helm/loki/templates/gateway/_helpers-gateway.tpl b/production/helm/loki/templates/gateway/_helpers-gateway.tpl index 272814b6c0e1..3922b8fe7fe6 100644 --- a/production/helm/loki/templates/gateway/_helpers-gateway.tpl +++ b/production/helm/loki/templates/gateway/_helpers-gateway.tpl @@ -11,6 +11,7 @@ gateway common labels {{- define "loki.gatewayLabels" -}} {{ include "loki.labels" . }} app.kubernetes.io/component: gateway +name: gateway {{- end }} {{/* @@ -19,6 +20,7 @@ gateway selector labels {{- define "loki.gatewaySelectorLabels" -}} {{ include "loki.selectorLabels" . }} app.kubernetes.io/component: gateway +name: gateway {{- end }} {{/* diff --git a/production/helm/loki/templates/index-gateway/_helpers-index-gateway.tpl b/production/helm/loki/templates/index-gateway/_helpers-index-gateway.tpl index f42dff3d0636..285b201bc0e7 100644 --- a/production/helm/loki/templates/index-gateway/_helpers-index-gateway.tpl +++ b/production/helm/loki/templates/index-gateway/_helpers-index-gateway.tpl @@ -11,6 +11,7 @@ index-gateway common labels {{- define "loki.indexGatewayLabels" -}} {{ include "loki.labels" . }} app.kubernetes.io/component: index-gateway +name: index-gateway {{- end }} {{/* @@ -19,6 +20,7 @@ index-gateway selector labels {{- define "loki.indexGatewaySelectorLabels" -}} {{ include "loki.selectorLabels" . }} app.kubernetes.io/component: index-gateway +name: index-gateway {{- end }} {{/* diff --git a/production/helm/loki/templates/index-gateway/statefulset-index-gateway.yaml b/production/helm/loki/templates/index-gateway/statefulset-index-gateway.yaml index bacf9db6c45d..5797185ef052 100644 --- a/production/helm/loki/templates/index-gateway/statefulset-index-gateway.yaml +++ b/production/helm/loki/templates/index-gateway/statefulset-index-gateway.yaml @@ -140,7 +140,7 @@ spec: {{- include "loki.configVolume" . | nindent 10 }} - name: runtime-config configMap: - name: {{ template "loki.fullname" . }}-runtime + name: {{ template "loki.name" . }}-runtime {{- if .Values.enterprise.enabled }} - name: license secret: diff --git a/production/helm/loki/templates/ingester/statefulset-ingester-zone-a.yaml b/production/helm/loki/templates/ingester/statefulset-ingester-zone-a.yaml index 69b2fcaf9a51..13c7018e53e2 100644 --- a/production/helm/loki/templates/ingester/statefulset-ingester-zone-a.yaml +++ b/production/helm/loki/templates/ingester/statefulset-ingester-zone-a.yaml @@ -184,7 +184,7 @@ spec: {{- include "loki.configVolume" . | nindent 10 }} - name: runtime-config configMap: - name: {{ template "loki.fullname" . }}-runtime + name: {{ template "loki.name" . }}-runtime {{- if .Values.enterprise.enabled }} - name: license secret: diff --git a/production/helm/loki/templates/ingester/statefulset-ingester-zone-b.yaml b/production/helm/loki/templates/ingester/statefulset-ingester-zone-b.yaml index 60bd81f0c4a0..a0c7b85f8a14 100644 --- a/production/helm/loki/templates/ingester/statefulset-ingester-zone-b.yaml +++ b/production/helm/loki/templates/ingester/statefulset-ingester-zone-b.yaml @@ -184,7 +184,7 @@ spec: {{- include "loki.configVolume" . | nindent 10 }} - name: runtime-config configMap: - name: {{ template "loki.fullname" . }}-runtime + name: {{ template "loki.name" . }}-runtime {{- if .Values.enterprise.enabled }} - name: license secret: diff --git a/production/helm/loki/templates/ingester/statefulset-ingester-zone-c.yaml b/production/helm/loki/templates/ingester/statefulset-ingester-zone-c.yaml index dcb1a0d4baee..cc65f49b244c 100644 --- a/production/helm/loki/templates/ingester/statefulset-ingester-zone-c.yaml +++ b/production/helm/loki/templates/ingester/statefulset-ingester-zone-c.yaml @@ -184,7 +184,7 @@ spec: {{- include "loki.configVolume" . | nindent 10 }} - name: runtime-config configMap: - name: {{ template "loki.fullname" . }}-runtime + name: {{ template "loki.name" . }}-runtime {{- if .Values.enterprise.enabled }} - name: license secret: diff --git a/production/helm/loki/templates/loki-canary/_helpers.tpl b/production/helm/loki/templates/loki-canary/_helpers.tpl index 01e588c8d10a..e200eaaf0cea 100644 --- a/production/helm/loki/templates/loki-canary/_helpers.tpl +++ b/production/helm/loki/templates/loki-canary/_helpers.tpl @@ -11,6 +11,7 @@ canary common labels {{- define "loki-canary.labels" -}} {{ include "loki.labels" . }} app.kubernetes.io/component: canary +name: canary {{- end }} {{/* @@ -19,6 +20,7 @@ canary selector labels {{- define "loki-canary.selectorLabels" -}} {{ include "loki.selectorLabels" . }} app.kubernetes.io/component: canary +name: canary {{- end }} {{/* diff --git a/production/helm/loki/templates/querier/_helpers-querier.tpl b/production/helm/loki/templates/querier/_helpers-querier.tpl index aa557c5b8da4..964911ccefcb 100644 --- a/production/helm/loki/templates/querier/_helpers-querier.tpl +++ b/production/helm/loki/templates/querier/_helpers-querier.tpl @@ -11,6 +11,7 @@ querier common labels {{- define "loki.querierLabels" -}} {{ include "loki.labels" . }} app.kubernetes.io/component: querier +name: querier {{- end }} {{/* @@ -19,6 +20,7 @@ querier selector labels {{- define "loki.querierSelectorLabels" -}} {{ include "loki.selectorLabels" . }} app.kubernetes.io/component: querier +name: querier {{- end }} {{/* diff --git a/production/helm/loki/templates/query-frontend/_helpers-query-frontend.tpl b/production/helm/loki/templates/query-frontend/_helpers-query-frontend.tpl index 5aebde755efe..45cefdfede81 100644 --- a/production/helm/loki/templates/query-frontend/_helpers-query-frontend.tpl +++ b/production/helm/loki/templates/query-frontend/_helpers-query-frontend.tpl @@ -11,6 +11,7 @@ query-frontend common labels {{- define "loki.queryFrontendLabels" -}} {{ include "loki.labels" . }} app.kubernetes.io/component: query-frontend +name: query-frontend {{- end }} {{/* @@ -19,6 +20,7 @@ query-frontend selector labels {{- define "loki.queryFrontendSelectorLabels" -}} {{ include "loki.selectorLabels" . }} app.kubernetes.io/component: query-frontend +name: query-frontend {{- end }} {{/* diff --git a/production/helm/loki/templates/query-frontend/deployment-query-frontend.yaml b/production/helm/loki/templates/query-frontend/deployment-query-frontend.yaml index 0ee7a5ff4152..6eda5c51dfc0 100644 --- a/production/helm/loki/templates/query-frontend/deployment-query-frontend.yaml +++ b/production/helm/loki/templates/query-frontend/deployment-query-frontend.yaml @@ -126,7 +126,7 @@ spec: {{- include "loki.configVolume" . | nindent 10 }} - name: runtime-config configMap: - name: {{ template "loki.fullname" . }}-runtime + name: {{ template "loki.name" . }}-runtime {{- if .Values.enterprise.enabled }} - name: license secret: diff --git a/production/helm/loki/templates/query-scheduler/_helpers-query-scheduler.tpl b/production/helm/loki/templates/query-scheduler/_helpers-query-scheduler.tpl index 1f64802428af..db6d227bf703 100644 --- a/production/helm/loki/templates/query-scheduler/_helpers-query-scheduler.tpl +++ b/production/helm/loki/templates/query-scheduler/_helpers-query-scheduler.tpl @@ -11,6 +11,7 @@ query-scheduler common labels {{- define "loki.querySchedulerLabels" -}} {{ include "loki.labels" . }} app.kubernetes.io/component: query-scheduler +name: query-scheduler {{- end }} {{/* @@ -19,6 +20,7 @@ query-scheduler selector labels {{- define "loki.querySchedulerSelectorLabels" -}} {{ include "loki.selectorLabels" . }} app.kubernetes.io/component: query-scheduler +name: query-scheduler {{- end }} {{/* diff --git a/production/helm/loki/templates/read/_helpers-read.tpl b/production/helm/loki/templates/read/_helpers-read.tpl index d205314a6cc6..a3d4eb5d30d2 100644 --- a/production/helm/loki/templates/read/_helpers-read.tpl +++ b/production/helm/loki/templates/read/_helpers-read.tpl @@ -11,6 +11,7 @@ read common labels {{- define "loki.readLabels" -}} {{ include "loki.labels" . }} app.kubernetes.io/component: read +name: read {{- end }} {{/* @@ -19,6 +20,7 @@ read selector labels {{- define "loki.readSelectorLabels" -}} {{ include "loki.selectorLabels" . }} app.kubernetes.io/component: read +name: read {{- end }} {{/* diff --git a/production/helm/loki/templates/ruler/_helpers-ruler.tpl b/production/helm/loki/templates/ruler/_helpers-ruler.tpl index 2079e03b0367..202c6a3ae74a 100644 --- a/production/helm/loki/templates/ruler/_helpers-ruler.tpl +++ b/production/helm/loki/templates/ruler/_helpers-ruler.tpl @@ -11,6 +11,7 @@ ruler common labels {{- define "loki.rulerLabels" -}} {{ include "loki.labels" . }} app.kubernetes.io/component: ruler +name: ruler {{- end }} {{/* @@ -19,6 +20,7 @@ ruler selector labels {{- define "loki.rulerSelectorLabels" -}} {{ include "loki.selectorLabels" . }} app.kubernetes.io/component: ruler +name: ruler {{- end }} {{/* diff --git a/production/helm/loki/templates/ruler/statefulset-ruler.yaml b/production/helm/loki/templates/ruler/statefulset-ruler.yaml index e066b6e63ed8..8153a8bb3827 100644 --- a/production/helm/loki/templates/ruler/statefulset-ruler.yaml +++ b/production/helm/loki/templates/ruler/statefulset-ruler.yaml @@ -133,7 +133,7 @@ spec: {{- include "loki.configVolume" . | nindent 10 }} - name: runtime-config configMap: - name: {{ template "loki.fullname" . }}-runtime + name: {{ template "loki.name" . }}-runtime {{- if .Values.enterprise.enabled }} - name: license secret: diff --git a/production/helm/loki/templates/single-binary/_helpers-single-binary.tpl b/production/helm/loki/templates/single-binary/_helpers-single-binary.tpl index 4ea3c6d77b91..156df54fe104 100644 --- a/production/helm/loki/templates/single-binary/_helpers-single-binary.tpl +++ b/production/helm/loki/templates/single-binary/_helpers-single-binary.tpl @@ -4,6 +4,7 @@ singleBinary common labels {{- define "loki.singleBinaryLabels" -}} {{ include "loki.labels" . }} app.kubernetes.io/component: single-binary +name: single-binary {{- end }} @@ -11,6 +12,7 @@ app.kubernetes.io/component: single-binary {{- define "loki.singleBinarySelectorLabels" -}} {{ include "loki.selectorLabels" . }} app.kubernetes.io/component: single-binary +name: single-binary {{- end }} {{/* diff --git a/production/helm/loki/templates/write/_helpers-write.tpl b/production/helm/loki/templates/write/_helpers-write.tpl index 8f526bcf2bd2..38585a82cad5 100644 --- a/production/helm/loki/templates/write/_helpers-write.tpl +++ b/production/helm/loki/templates/write/_helpers-write.tpl @@ -11,6 +11,7 @@ write common labels {{- define "loki.writeLabels" -}} {{ include "loki.labels" . }} app.kubernetes.io/component: write +name: write {{- end }} {{/* @@ -19,6 +20,7 @@ write selector labels {{- define "loki.writeSelectorLabels" -}} {{ include "loki.selectorLabels" . }} app.kubernetes.io/component: write +name: write {{- end }} {{/*