From 4b155f6fb75a38c7f70232e6756bc6953830b7e9 Mon Sep 17 00:00:00 2001
From: Adrien Ferrand <ferrand.ad@gmail.com>
Date: Sun, 18 Jul 2021 23:58:17 +0200
Subject: [PATCH] Fix duplicated labels

---
 .../charts/gitaly/templates/statefulset-with-praefect.yml      | 3 +--
 charts/gitlab/charts/gitaly/templates/statefulset.yml          | 3 +--
 charts/gitlab/charts/gitlab-exporter/templates/deployment.yaml | 2 --
 3 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/charts/gitlab/charts/gitaly/templates/statefulset-with-praefect.yml b/charts/gitlab/charts/gitaly/templates/statefulset-with-praefect.yml
index 7017321175..531f17b79f 100644
--- a/charts/gitlab/charts/gitaly/templates/statefulset-with-praefect.yml
+++ b/charts/gitlab/charts/gitaly/templates/statefulset-with-praefect.yml
@@ -6,9 +6,8 @@ metadata:
   name: {{ include "gitlab.praefect.gitaly.serviceName" (dict "context" $ "name" .name) }}
   namespace: {{ $.Release.Namespace }}
   labels:
-    {{- include "gitlab.standardLabels" $ | nindent 4 }}
-    {{- include "gitlab.commonLabels" $ | nindent 4 }}
     {{- include "gitlab.immutableLabels" $ | nindent 4 }}
+    {{- include "gitlab.commonLabels" $ | nindent 4 }}
     storage: {{ .name }}
 {{ include (print $.Template.BasePath "/_statefulset_spec.yaml") (merge (dict) $ (dict "storage" .)) }}
 ---
diff --git a/charts/gitlab/charts/gitaly/templates/statefulset.yml b/charts/gitlab/charts/gitaly/templates/statefulset.yml
index 9f3ab47d00..5ed491d3f8 100644
--- a/charts/gitlab/charts/gitaly/templates/statefulset.yml
+++ b/charts/gitlab/charts/gitaly/templates/statefulset.yml
@@ -5,8 +5,7 @@ metadata:
   name: {{ template "fullname" . }}
   namespace: {{ $.Release.Namespace }}
   labels:
-    {{- include "gitlab.standardLabels" . | nindent 4 }}
+    {{- include "gitlab.immutableLabels" $ | nindent 4 }}
     {{- include "gitlab.commonLabels" . | nindent 4 }}
-    {{- include "gitlab.immutableLabels" . | nindent 4 }}
 {{ include (print $.Template.BasePath "/_statefulset_spec.yaml") . }}
 {{- end }}
diff --git a/charts/gitlab/charts/gitlab-exporter/templates/deployment.yaml b/charts/gitlab/charts/gitlab-exporter/templates/deployment.yaml
index dd69ae8926..8263748a51 100644
--- a/charts/gitlab/charts/gitlab-exporter/templates/deployment.yaml
+++ b/charts/gitlab/charts/gitlab-exporter/templates/deployment.yaml
@@ -21,8 +21,6 @@ spec:
   template:
     metadata:
       labels:
-        app: {{ template "name" . }}
-        release: {{ .Release.Name }}
         {{- include "gitlab.standardLabels" . | nindent 8 }}
         {{- include "gitlab.commonLabels" . | nindent 8 }}
         {{- include "gitlab.podLabels" . | nindent 8 }}
-- 
GitLab