From 87a00a395486a94e8d49d10a203e0dce24f552d2 Mon Sep 17 00:00:00 2001
From: DylanGuedes <djmgguedes@gmail.com>
Date: Thu, 21 Mar 2024 17:09:56 -0300
Subject: [PATCH] Revert "Add `name` labels and modify runtime cfg name
 (#12291)"

This reverts commit 38d8b6235daf0d8c5308b52390594de24ab097ae.
---
 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, 6 insertions(+), 34 deletions(-)

diff --git a/production/helm/loki/templates/admin-api/_helpers.yaml b/production/helm/loki/templates/admin-api/_helpers.yaml
index a88ea4b798bb..e13ff8adbcc3 100644
--- a/production/helm/loki/templates/admin-api/_helpers.yaml
+++ b/production/helm/loki/templates/admin-api/_helpers.yaml
@@ -12,7 +12,6 @@ adminApi common labels
 {{ include "loki.labels" . }}
 app.kubernetes.io/component: admin-api
 target: admin-api
-name: admin-api
 {{- end }}
 
 {{/*
@@ -22,5 +21,4 @@ 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 f805c1105374..08f5f8f7b619 100644
--- a/production/helm/loki/templates/backend/_helpers-backend.tpl
+++ b/production/helm/loki/templates/backend/_helpers-backend.tpl
@@ -11,7 +11,6 @@ backend common labels
 {{- define "loki.backendLabels" -}}
 {{ include "loki.labels" . }}
 app.kubernetes.io/component: backend
-name: backend
 {{- end }}
 
 {{/*
@@ -20,7 +19,6 @@ 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 4b51ab8d5f65..75c21db16747 100644
--- a/production/helm/loki/templates/compactor/_helpers-compactor.tpl
+++ b/production/helm/loki/templates/compactor/_helpers-compactor.tpl
@@ -11,7 +11,6 @@ compactor common labels
 {{- define "loki.compactorLabels" -}}
 {{ include "loki.labels" . }}
 app.kubernetes.io/component: compactor
-name: compactor
 {{- end }}
 
 {{/*
@@ -20,7 +19,6 @@ 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 3966e3caffed..c23179e90501 100644
--- a/production/helm/loki/templates/distributor/_helpers-distributor.tpl
+++ b/production/helm/loki/templates/distributor/_helpers-distributor.tpl
@@ -11,7 +11,6 @@ distributor common labels
 {{- define "loki.distributorLabels" -}}
 {{ include "loki.labels" . }}
 app.kubernetes.io/component: distributor
-name: distributor
 {{- end }}
 
 {{/*
@@ -20,7 +19,6 @@ 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 3922b8fe7fe6..272814b6c0e1 100644
--- a/production/helm/loki/templates/gateway/_helpers-gateway.tpl
+++ b/production/helm/loki/templates/gateway/_helpers-gateway.tpl
@@ -11,7 +11,6 @@ gateway common labels
 {{- define "loki.gatewayLabels" -}}
 {{ include "loki.labels" . }}
 app.kubernetes.io/component: gateway
-name: gateway
 {{- end }}
 
 {{/*
@@ -20,7 +19,6 @@ 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 285b201bc0e7..f42dff3d0636 100644
--- a/production/helm/loki/templates/index-gateway/_helpers-index-gateway.tpl
+++ b/production/helm/loki/templates/index-gateway/_helpers-index-gateway.tpl
@@ -11,7 +11,6 @@ index-gateway common labels
 {{- define "loki.indexGatewayLabels" -}}
 {{ include "loki.labels" . }}
 app.kubernetes.io/component: index-gateway
-name: index-gateway
 {{- end }}
 
 {{/*
@@ -20,7 +19,6 @@ 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 5797185ef052..bacf9db6c45d 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.name" . }}-runtime
+            name: {{ template "loki.fullname" . }}-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 13c7018e53e2..69b2fcaf9a51 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.name" . }}-runtime
+            name: {{ template "loki.fullname" . }}-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 a0c7b85f8a14..60bd81f0c4a0 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.name" . }}-runtime
+            name: {{ template "loki.fullname" . }}-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 cc65f49b244c..dcb1a0d4baee 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.name" . }}-runtime
+            name: {{ template "loki.fullname" . }}-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 e200eaaf0cea..01e588c8d10a 100644
--- a/production/helm/loki/templates/loki-canary/_helpers.tpl
+++ b/production/helm/loki/templates/loki-canary/_helpers.tpl
@@ -11,7 +11,6 @@ canary common labels
 {{- define "loki-canary.labels" -}}
 {{ include "loki.labels" . }}
 app.kubernetes.io/component: canary
-name: canary
 {{- end }}
 
 {{/*
@@ -20,7 +19,6 @@ 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 964911ccefcb..aa557c5b8da4 100644
--- a/production/helm/loki/templates/querier/_helpers-querier.tpl
+++ b/production/helm/loki/templates/querier/_helpers-querier.tpl
@@ -11,7 +11,6 @@ querier common labels
 {{- define "loki.querierLabels" -}}
 {{ include "loki.labels" . }}
 app.kubernetes.io/component: querier
-name: querier
 {{- end }}
 
 {{/*
@@ -20,7 +19,6 @@ 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 45cefdfede81..5aebde755efe 100644
--- a/production/helm/loki/templates/query-frontend/_helpers-query-frontend.tpl
+++ b/production/helm/loki/templates/query-frontend/_helpers-query-frontend.tpl
@@ -11,7 +11,6 @@ query-frontend common labels
 {{- define "loki.queryFrontendLabels" -}}
 {{ include "loki.labels" . }}
 app.kubernetes.io/component: query-frontend
-name: query-frontend
 {{- end }}
 
 {{/*
@@ -20,7 +19,6 @@ 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 6eda5c51dfc0..0ee7a5ff4152 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.name" . }}-runtime
+            name: {{ template "loki.fullname" . }}-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 db6d227bf703..1f64802428af 100644
--- a/production/helm/loki/templates/query-scheduler/_helpers-query-scheduler.tpl
+++ b/production/helm/loki/templates/query-scheduler/_helpers-query-scheduler.tpl
@@ -11,7 +11,6 @@ query-scheduler common labels
 {{- define "loki.querySchedulerLabels" -}}
 {{ include "loki.labels" . }}
 app.kubernetes.io/component: query-scheduler
-name: query-scheduler
 {{- end }}
 
 {{/*
@@ -20,7 +19,6 @@ 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 a3d4eb5d30d2..d205314a6cc6 100644
--- a/production/helm/loki/templates/read/_helpers-read.tpl
+++ b/production/helm/loki/templates/read/_helpers-read.tpl
@@ -11,7 +11,6 @@ read common labels
 {{- define "loki.readLabels" -}}
 {{ include "loki.labels" . }}
 app.kubernetes.io/component: read
-name: read
 {{- end }}
 
 {{/*
@@ -20,7 +19,6 @@ 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 202c6a3ae74a..2079e03b0367 100644
--- a/production/helm/loki/templates/ruler/_helpers-ruler.tpl
+++ b/production/helm/loki/templates/ruler/_helpers-ruler.tpl
@@ -11,7 +11,6 @@ ruler common labels
 {{- define "loki.rulerLabels" -}}
 {{ include "loki.labels" . }}
 app.kubernetes.io/component: ruler
-name: ruler
 {{- end }}
 
 {{/*
@@ -20,7 +19,6 @@ 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 8153a8bb3827..e066b6e63ed8 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.name" . }}-runtime
+            name: {{ template "loki.fullname" . }}-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 156df54fe104..4ea3c6d77b91 100644
--- a/production/helm/loki/templates/single-binary/_helpers-single-binary.tpl
+++ b/production/helm/loki/templates/single-binary/_helpers-single-binary.tpl
@@ -4,7 +4,6 @@ singleBinary common labels
 {{- define "loki.singleBinaryLabels" -}}
 {{ include "loki.labels" . }}
 app.kubernetes.io/component: single-binary
-name: single-binary
 {{- end }}
 
 
@@ -12,7 +11,6 @@ name: 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 38585a82cad5..8f526bcf2bd2 100644
--- a/production/helm/loki/templates/write/_helpers-write.tpl
+++ b/production/helm/loki/templates/write/_helpers-write.tpl
@@ -11,7 +11,6 @@ write common labels
 {{- define "loki.writeLabels" -}}
 {{ include "loki.labels" . }}
 app.kubernetes.io/component: write
-name: write
 {{- end }}
 
 {{/*
@@ -20,7 +19,6 @@ write selector labels
 {{- define "loki.writeSelectorLabels" -}}
 {{ include "loki.selectorLabels" . }}
 app.kubernetes.io/component: write
-name: write
 {{- end }}
 
 {{/*