From 35f1ac6848554338c1fc22718f134235bab4a388 Mon Sep 17 00:00:00 2001
From: afaras0572 <slawal@oteemo.com>
Date: Fri, 15 Nov 2024 20:34:25 -0600
Subject: [PATCH 01/21] adding app.kubernetes.io Labels required for kiali

---
 .../gitlab/charts/geo-logcursor/templates/deployment.yaml | 2 ++
 .../gitlab/charts/gitaly/templates/_statefulset_spec.yaml | 1 +
 .../charts/gitaly/templates/statefulset-with-praefect.yml | 1 +
 charts/gitlab/charts/gitaly/templates/statefulset.yml     | 1 +
 .../charts/gitlab-exporter/templates/deployment.yaml      | 2 ++
 .../gitlab/charts/gitlab-pages/templates/deployment.yaml  | 2 ++
 .../gitlab/charts/gitlab-shell/templates/deployment.yaml  | 2 ++
 charts/gitlab/charts/kas/templates/deployment.yaml        | 2 ++
 charts/gitlab/charts/mailroom/templates/deployment.yaml   | 2 ++
 charts/gitlab/charts/praefect/templates/statefulset.yaml  | 2 ++
 charts/gitlab/charts/sidekiq/templates/deployment.yaml    | 2 ++
 charts/gitlab/charts/spamcheck/templates/deployment.yaml  | 2 ++
 charts/gitlab/charts/toolbox/templates/deployment.yaml    | 2 ++
 charts/gitlab/charts/webservice/templates/deployment.yaml | 2 ++
 charts/minio/templates/minio_deployment.yaml              | 2 ++
 charts/nginx-ingress/templates/controller-daemonset.yaml  | 2 ++
 charts/nginx-ingress/templates/controller-deployment.yaml | 2 ++
 charts/registry/templates/deployment.yaml                 | 2 ++
 templates/_application.tpl                                | 8 ++++++++
 19 files changed, 41 insertions(+)

diff --git a/charts/gitlab/charts/geo-logcursor/templates/deployment.yaml b/charts/gitlab/charts/geo-logcursor/templates/deployment.yaml
index b053dc6606..5c9565b163 100644
--- a/charts/gitlab/charts/geo-logcursor/templates/deployment.yaml
+++ b/charts/gitlab/charts/geo-logcursor/templates/deployment.yaml
@@ -10,6 +10,7 @@ metadata:
   labels:
     {{- include "gitlab.standardLabels" . | nindent 4 }}
     {{- include "gitlab.commonLabels" . | nindent 4 }}
+    {{- include "gitlab.kiali.labels" . | nindent 4 }}
   annotations:
     {{- include "gitlab.deploymentAnnotations" . | nindent 4 }}
 spec:
@@ -26,6 +27,7 @@ spec:
         {{- include "gitlab.standardLabels" . | nindent 8 }}
         {{- include "gitlab.commonLabels" . | nindent 8 }}
         {{- include "gitlab.podLabels" . | nindent 8 }}
+        {{- include "gitlab.kiali.labels" . | nindent 8 }}
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/configmap.yml") . | sha256sum }}
         cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
diff --git a/charts/gitlab/charts/gitaly/templates/_statefulset_spec.yaml b/charts/gitlab/charts/gitaly/templates/_statefulset_spec.yaml
index 9d72f30190..67623cecfd 100644
--- a/charts/gitlab/charts/gitaly/templates/_statefulset_spec.yaml
+++ b/charts/gitlab/charts/gitaly/templates/_statefulset_spec.yaml
@@ -31,6 +31,7 @@ spec:
         {{- include "gitlab.standardLabels" . | nindent 8 }}
         {{- include "gitlab.commonLabels" . | nindent 8 }}
         {{- include "gitlab.podLabels" . | nindent 8 }}
+        {{- include "gitlab.kiali.labels" . | nindent 8 }}
       annotations:
       {{- $cm := "/configmap.yml" -}}
       {{- if .storage }}
diff --git a/charts/gitlab/charts/gitaly/templates/statefulset-with-praefect.yml b/charts/gitlab/charts/gitaly/templates/statefulset-with-praefect.yml
index 7edf994b36..83217dca22 100644
--- a/charts/gitlab/charts/gitaly/templates/statefulset-with-praefect.yml
+++ b/charts/gitlab/charts/gitaly/templates/statefulset-with-praefect.yml
@@ -8,6 +8,7 @@ metadata:
   labels:
     {{- include "gitlab.standardLabels" $ | nindent 4 }}
     {{- include "gitlab.commonLabels" $ | nindent 4 }}
+    {{- include "gitlab.kiali.labels" . | 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 ac310d5dd7..05d67015f6 100644
--- a/charts/gitlab/charts/gitaly/templates/statefulset.yml
+++ b/charts/gitlab/charts/gitaly/templates/statefulset.yml
@@ -7,5 +7,6 @@ metadata:
   labels:
     {{- include "gitlab.standardLabels" . | nindent 4 }}
     {{- include "gitlab.commonLabels" . | nindent 4 }}
+    {{- include "gitlab.kiali.labels" . | 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 70da0c83c2..698cba9791 100644
--- a/charts/gitlab/charts/gitlab-exporter/templates/deployment.yaml
+++ b/charts/gitlab/charts/gitlab-exporter/templates/deployment.yaml
@@ -10,6 +10,7 @@ metadata:
   labels:
     {{- include "gitlab.standardLabels" . | nindent 4 }}
     {{- include "gitlab.commonLabels" . | nindent 4 }}
+    {{- include "gitlab.kiali.labels" . | nindent 4 }}
   annotations:
     {{- include "gitlab.deploymentAnnotations" . | nindent 4 }}
 spec:
@@ -26,6 +27,7 @@ spec:
         {{- include "gitlab.standardLabels" . | nindent 8 }}
         {{- include "gitlab.commonLabels" . | nindent 8 }}
         {{- include "gitlab.podLabels" . | nindent 8 }}
+        {{- include "gitlab.kiali.labels" . | nindent 8 }}
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
       {{- if and .Values.metrics.enabled (not .Values.metrics.serviceMonitor.enabled) }}
diff --git a/charts/gitlab/charts/gitlab-pages/templates/deployment.yaml b/charts/gitlab/charts/gitlab-pages/templates/deployment.yaml
index 438c08845c..f99dad5df3 100644
--- a/charts/gitlab/charts/gitlab-pages/templates/deployment.yaml
+++ b/charts/gitlab/charts/gitlab-pages/templates/deployment.yaml
@@ -8,6 +8,7 @@ metadata:
   labels:
     {{- include "gitlab.standardLabels" . | nindent 4 }}
     {{- include "gitlab.commonLabels" . | nindent 4 }}
+    {{- include "gitlab.kiali.labels" . | nindent 4 }}
   annotations:
     {{- include "gitlab.deploymentAnnotations" . | nindent 4 }}
 spec:
@@ -24,6 +25,7 @@ spec:
         {{- include "gitlab.standardLabels" . | nindent 8 }}
         {{- include "gitlab.commonLabels" . | nindent 8 }}
         {{- include "gitlab.podLabels" . | nindent 8 }}
+        {{- include "gitlab.kiali.labels" . | nindent 8 }}
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/configmap.yml") . | sha256sum }}
         cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
diff --git a/charts/gitlab/charts/gitlab-shell/templates/deployment.yaml b/charts/gitlab/charts/gitlab-shell/templates/deployment.yaml
index d74ada4e68..85d7d17b84 100644
--- a/charts/gitlab/charts/gitlab-shell/templates/deployment.yaml
+++ b/charts/gitlab/charts/gitlab-shell/templates/deployment.yaml
@@ -9,6 +9,7 @@ metadata:
   labels:
     {{- include "gitlab.standardLabels" . | nindent 4 }}
     {{- include "gitlab.commonLabels" . | nindent 4 }}
+    {{- include "gitlab.kiali.labels" . | nindent 4 }}
   annotations:
     {{- include "gitlab.deploymentAnnotations" . | nindent 4 }}
 spec:
@@ -24,6 +25,7 @@ spec:
         {{- include "gitlab.standardLabels" . | nindent 8 }}
         {{- include "gitlab.commonLabels" . | nindent 8 }}
         {{- include "gitlab.podLabels" . | nindent 8 }}
+        {{- include "gitlab.kiali.labels" . | nindent 8 }}
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/configmap.yml") . | sha256sum }}
         checksum/config-sshd: {{ include (print $.Template.BasePath "/configmap-sshd.yml") . | sha256sum }}
diff --git a/charts/gitlab/charts/kas/templates/deployment.yaml b/charts/gitlab/charts/kas/templates/deployment.yaml
index 253187e952..c00760a535 100644
--- a/charts/gitlab/charts/kas/templates/deployment.yaml
+++ b/charts/gitlab/charts/kas/templates/deployment.yaml
@@ -8,6 +8,7 @@ metadata:
   labels:
     {{- include "gitlab.standardLabels" . | nindent 4 }}
     {{- include "gitlab.commonLabels" . | nindent 4 }}
+    {{- include "gitlab.kiali.labels" . | nindent 4 }}
   annotations:
     {{- include "gitlab.deploymentAnnotations" . | nindent 4 }}
 spec:
@@ -26,6 +27,7 @@ spec:
         {{- include "gitlab.standardLabels" . | nindent 8 }}
         {{- include "gitlab.commonLabels" . | nindent 8 }}
         {{- include "gitlab.podLabels" . | nindent 8 }}
+        {{- include "gitlab.kiali.labels" . | nindent 8 }}
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
         cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
diff --git a/charts/gitlab/charts/mailroom/templates/deployment.yaml b/charts/gitlab/charts/mailroom/templates/deployment.yaml
index 82968a5273..36f7080ef3 100644
--- a/charts/gitlab/charts/mailroom/templates/deployment.yaml
+++ b/charts/gitlab/charts/mailroom/templates/deployment.yaml
@@ -9,6 +9,7 @@ metadata:
   labels:
     {{- include "gitlab.standardLabels" . | nindent 4 }}
     {{- include "gitlab.commonLabels" . | nindent 4 }}
+    {{- include "gitlab.kiali.labels" . | nindent 4 }}
   annotations:
     {{- include "gitlab.deploymentAnnotations" . | nindent 4 }}
 spec:
@@ -26,6 +27,7 @@ spec:
         {{- include "gitlab.standardLabels" . | nindent 8 }}
         {{- include "gitlab.commonLabels" . | nindent 8 }}
         {{- include "gitlab.podLabels" . | nindent 8 }}
+        {{- include "gitlab.kiali.labels" . | nindent 8 }}
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
       {{- range $key, $value := .Values.annotations }}
diff --git a/charts/gitlab/charts/praefect/templates/statefulset.yaml b/charts/gitlab/charts/praefect/templates/statefulset.yaml
index 7b939f4798..0a49d283be 100644
--- a/charts/gitlab/charts/praefect/templates/statefulset.yaml
+++ b/charts/gitlab/charts/praefect/templates/statefulset.yaml
@@ -8,6 +8,7 @@ metadata:
   labels:
     {{- include "gitlab.standardLabels" . | nindent 4 }}
     {{- include "gitlab.commonLabels" . | nindent 4 }}
+    {{- include "gitlab.kiali.labels" . | nindent 4 }}
 spec:
   selector:
     matchLabels:
@@ -24,6 +25,7 @@ spec:
         {{- include "gitlab.standardLabels" . | nindent 8 }}
         {{- include "gitlab.commonLabels" . | nindent 8 }}
         {{- include "gitlab.podLabels" . | nindent 8 }}
+        {{- include "gitlab.kiali.labels" . | nindent 8 }}
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
       {{- range $key, $value := .Values.annotations }}
diff --git a/charts/gitlab/charts/sidekiq/templates/deployment.yaml b/charts/gitlab/charts/sidekiq/templates/deployment.yaml
index 13f36c7a33..a2221eebf2 100644
--- a/charts/gitlab/charts/sidekiq/templates/deployment.yaml
+++ b/charts/gitlab/charts/sidekiq/templates/deployment.yaml
@@ -35,6 +35,7 @@ metadata:
   labels:
     {{- include "gitlab.standardLabels" $ | nindent 4 }}
     {{- include "sidekiq.commonLabels" (dict "pod" .common.labels "global" $.Values.common.labels) | nindent 4 }}
+    {{- include "gitlab.kiali.labels" . | nindent 4 }}
     queue-pod-name: {{ .name }}
   annotations:
     {{- include "gitlab.deploymentAnnotations" $ | nindent 4 }}
@@ -52,6 +53,7 @@ spec:
         {{- include "gitlab.standardLabels" $ | nindent 8 }}
         {{- include "sidekiq.commonLabels" (dict "pod" .common.labels "global" $.Values.common.labels) | nindent 8 }}
         {{- include "sidekiq.podLabels" (dict "pod" .podLabels ) | nindent 8 }}
+        {{- include "gitlab.kiali.labels" . | nindent 8 }}
         queue-pod-name: {{ .name }}
       annotations:
         checksum/configmap: {{ $configMapChecksum }}
diff --git a/charts/gitlab/charts/spamcheck/templates/deployment.yaml b/charts/gitlab/charts/spamcheck/templates/deployment.yaml
index d96d7c5fd7..deb90a315e 100644
--- a/charts/gitlab/charts/spamcheck/templates/deployment.yaml
+++ b/charts/gitlab/charts/spamcheck/templates/deployment.yaml
@@ -8,6 +8,7 @@ metadata:
   labels:
     {{- include "gitlab.standardLabels" . | nindent 4 }}
     {{- include "gitlab.commonLabels" . | nindent 4 }}
+    {{- include "gitlab.kiali.labels" . | nindent 4 }}
   annotations:
     {{- include "gitlab.deploymentAnnotations" $ | nindent 4 }}
 spec:
@@ -23,6 +24,7 @@ spec:
         {{- include "gitlab.standardLabels" . | nindent 8 }}
         {{- include "gitlab.commonLabels" . | nindent 8 }}
         {{- include "gitlab.podLabels" . | nindent 8 }}
+        {{- include "gitlab.kiali.labels" . | nindent 8 }}
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") $ | sha256sum }}
         cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
diff --git a/charts/gitlab/charts/toolbox/templates/deployment.yaml b/charts/gitlab/charts/toolbox/templates/deployment.yaml
index c0868bf349..35e1904f26 100644
--- a/charts/gitlab/charts/toolbox/templates/deployment.yaml
+++ b/charts/gitlab/charts/toolbox/templates/deployment.yaml
@@ -10,6 +10,7 @@ metadata:
   labels:
     {{- include "gitlab.standardLabels" . | nindent 4 }}
     {{- include "gitlab.commonLabels" . | nindent 4 }}
+    {{- include "gitlab.kiali.labels" . | nindent 4 }}
   annotations:
     {{- include "gitlab.deploymentAnnotations" . | nindent 4 }}
 spec:
@@ -26,6 +27,7 @@ spec:
         {{- include "gitlab.standardLabels" . | nindent 8 }}
         {{- include "gitlab.commonLabels" . | nindent 8 }}
         {{- include "gitlab.podLabels" . | nindent 8 }}
+        {{- include "gitlab.kiali.labels" . | nindent 8 }}
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
         cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
diff --git a/charts/gitlab/charts/webservice/templates/deployment.yaml b/charts/gitlab/charts/webservice/templates/deployment.yaml
index 8eea9fa178..fffc86128a 100644
--- a/charts/gitlab/charts/webservice/templates/deployment.yaml
+++ b/charts/gitlab/charts/webservice/templates/deployment.yaml
@@ -19,6 +19,7 @@ metadata:
   labels:
     {{- include "gitlab.standardLabels" $ | nindent 4 }}
     {{- include "webservice.labels" . | nindent 4 }}
+    {{- include "gitlab.kiali.labels" . | nindent 4 }}
     {{- include "webservice.commonLabels" . | nindent 4 }}
     {{- if .deployment.labels -}}
     {{-   toYaml .deployment.labels | nindent 4 }}
@@ -47,6 +48,7 @@ spec:
         {{- include "gitlab.podLabels" $ | nindent 8 }}
         {{- include "webservice.commonLabels" . | nindent 8 }}
         {{- include "webservice.podLabels" . | nindent 8 }}
+        {{- include "gitlab.kiali.labels" . | nindent 8 }}
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/configmap.yml") $ | sha256sum }}
         cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
diff --git a/charts/minio/templates/minio_deployment.yaml b/charts/minio/templates/minio_deployment.yaml
index f671e8a154..5e223c92ad 100755
--- a/charts/minio/templates/minio_deployment.yaml
+++ b/charts/minio/templates/minio_deployment.yaml
@@ -11,6 +11,7 @@ metadata:
   labels:
     {{- include "gitlab.standardLabels" . | nindent 4 }}
     {{- include "gitlab.commonLabels" . | nindent 4 }}
+    {{- include "gitlab.kiali.labels" . | nindent 4 }}
   annotations:
     {{- include "gitlab.deploymentAnnotations" . | nindent 4 }}
 spec:
@@ -30,6 +31,7 @@ spec:
         {{- include "gitlab.standardLabels" . | nindent 8 }}
         {{- include "gitlab.commonLabels" . | nindent 8 }}
         {{- include "gitlab.podLabels" . | nindent 8 }}
+        {{- include "gitlab.kiali.labels" . | nindent 8 }}
       annotations:
 {{- if .Values.podAnnotations }}
 {{ toYaml .Values.podAnnotations | trimSuffix "\n" | indent 8 }}
diff --git a/charts/nginx-ingress/templates/controller-daemonset.yaml b/charts/nginx-ingress/templates/controller-daemonset.yaml
index 15d4e9e479..333e7da9f9 100644
--- a/charts/nginx-ingress/templates/controller-daemonset.yaml
+++ b/charts/nginx-ingress/templates/controller-daemonset.yaml
@@ -5,6 +5,7 @@ metadata:
   labels:
     {{- include "gitlab.standardLabels" . | nindent 4 }}
     {{- include "gitlab.commonLabels" . | nindent 4 }}
+    {{- include "gitlab.kiali.labels" . | nindent 4 }}
     component: "{{ .Values.controller.name }}"
     {{- include "ingress-nginx.labels" . | nindent 4 }}
     app.kubernetes.io/component: controller
@@ -35,6 +36,7 @@ spec:
       {{- end }}
     {{- end }}
       labels:
+        {{- include "gitlab.kiali.labels" . | nindent 8 }}
         {{- include "ingress-nginx.selectorLabels" . | nindent 8 }}
         component: "{{ .Values.controller.name }}"
       {{- if .Values.controller.podLabels }}
diff --git a/charts/nginx-ingress/templates/controller-deployment.yaml b/charts/nginx-ingress/templates/controller-deployment.yaml
index 1a7612aa45..6622ed6d20 100644
--- a/charts/nginx-ingress/templates/controller-deployment.yaml
+++ b/charts/nginx-ingress/templates/controller-deployment.yaml
@@ -4,6 +4,7 @@ kind: Deployment
 metadata:
   labels:
     {{- include "gitlab.standardLabels" . | nindent 4 }}
+    {{- include "gitlab.kiali.labels" . | nindent 4 }}
     {{- include "gitlab.commonLabels" . | nindent 4 }}
     component: "{{ .Values.controller.name }}"
     {{- include "ingress-nginx.labels" . | nindent 4 }}
@@ -44,6 +45,7 @@ spec:
     {{- end }}
       labels:
         {{- include "ingress-nginx.selectorLabels" . | nindent 8 }}
+        {{- include "gitlab.kiali.labels" . | nindent 8 }}
         component: "{{ .Values.controller.name }}"
       {{- include "gitlab.podLabels" . | nindent 8 }}
       {{- if .Values.controller.podLabels }}
diff --git a/charts/registry/templates/deployment.yaml b/charts/registry/templates/deployment.yaml
index 6d92eadd19..dc30a55b29 100644
--- a/charts/registry/templates/deployment.yaml
+++ b/charts/registry/templates/deployment.yaml
@@ -9,6 +9,7 @@ metadata:
   labels:
     {{- include "gitlab.standardLabels" . | nindent 4 }}
     {{- include "gitlab.commonLabels" . | nindent 4 }}
+    {{- include "gitlab.kiali.labels" . | nindent 4 }}
   annotations:
     {{- include "gitlab.deploymentAnnotations" . | nindent 4 }}
 spec:
@@ -27,6 +28,7 @@ spec:
         {{- include "gitlab.standardLabels" . | nindent 8 }}
         {{- include "gitlab.commonLabels" . | nindent 8 }}
         {{- include "gitlab.podLabels" . | nindent 8 }}
+        {{- include "gitlab.kiali.labels" . | nindent 8 }}
       annotations:
         checksum/configmap: {{ include (print $.Template.BasePath "/configmap.yaml") . | sha256sum }}
         cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
diff --git a/templates/_application.tpl b/templates/_application.tpl
index 95639daf23..20ab2797bb 100644
--- a/templates/_application.tpl
+++ b/templates/_application.tpl
@@ -61,3 +61,11 @@ Return priorityClassName for Pod definitions
 priorityClassName: {{ $pcName }}
 {{- end -}}
 {{- end -}}
+
+{{/*
+Define a app.kubernetes.io/name: {{ .Chart.Name }} and app.kubernetes.io/version: {{ .Chart.AppVersion }} label for kiali on pods, deployments, statefulsets, and daemonsets.
+*/}}
+{{- define "gitlab.kiali.labels" -}}
+app.kubernetes.io/name: {{ .Chart.Name }}
+app.kubernetes.io/version: {{ .Chart.AppVersion }}
+{{- end -}}
\ No newline at end of file
-- 
GitLab


From 34f824fac3033a7d910f27fd45f7f765408b173c Mon Sep 17 00:00:00 2001
From: afaras0572 <slawal@oteemo.com>
Date: Mon, 18 Nov 2024 10:26:29 -0600
Subject: [PATCH 02/21] updating application template file

---
 templates/_application.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/_application.tpl b/templates/_application.tpl
index 20ab2797bb..c29a73a5a4 100644
--- a/templates/_application.tpl
+++ b/templates/_application.tpl
@@ -66,6 +66,6 @@ priorityClassName: {{ $pcName }}
 Define a app.kubernetes.io/name: {{ .Chart.Name }} and app.kubernetes.io/version: {{ .Chart.AppVersion }} label for kiali on pods, deployments, statefulsets, and daemonsets.
 */}}
 {{- define "gitlab.kiali.labels" -}}
-app.kubernetes.io/name: {{ .Chart.Name }}
+app.kubernetes.io/name: "{{ .Chart.Name }}"
 app.kubernetes.io/version: {{ .Chart.AppVersion }}
 {{- end -}}
\ No newline at end of file
-- 
GitLab


From 576ef3f0fcdd8ae7a60604d1eec8de63d58c6e42 Mon Sep 17 00:00:00 2001
From: afaras0572 <slawal@oteemo.com>
Date: Mon, 18 Nov 2024 10:36:26 -0600
Subject: [PATCH 03/21] updating application template helper

---
 templates/_application.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/_application.tpl b/templates/_application.tpl
index c29a73a5a4..ed5b67f541 100644
--- a/templates/_application.tpl
+++ b/templates/_application.tpl
@@ -66,6 +66,6 @@ priorityClassName: {{ $pcName }}
 Define a app.kubernetes.io/name: {{ .Chart.Name }} and app.kubernetes.io/version: {{ .Chart.AppVersion }} label for kiali on pods, deployments, statefulsets, and daemonsets.
 */}}
 {{- define "gitlab.kiali.labels" -}}
-app.kubernetes.io/name: "{{ .Chart.Name }}"
+{{- include "gitlab.application.labels" -}}
 app.kubernetes.io/version: {{ .Chart.AppVersion }}
 {{- end -}}
\ No newline at end of file
-- 
GitLab


From 1d9dc65cc3bdb49b4b5e9963c81aac3a33c9bcf8 Mon Sep 17 00:00:00 2001
From: afaras0572 <slawal@oteemo.com>
Date: Mon, 18 Nov 2024 10:38:43 -0600
Subject: [PATCH 04/21] updating application template helper new

---
 templates/_application.tpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/_application.tpl b/templates/_application.tpl
index ed5b67f541..6c6a217d27 100644
--- a/templates/_application.tpl
+++ b/templates/_application.tpl
@@ -66,6 +66,6 @@ priorityClassName: {{ $pcName }}
 Define a app.kubernetes.io/name: {{ .Chart.Name }} and app.kubernetes.io/version: {{ .Chart.AppVersion }} label for kiali on pods, deployments, statefulsets, and daemonsets.
 */}}
 {{- define "gitlab.kiali.labels" -}}
-{{- include "gitlab.application.labels" -}}
+{{ include "gitlab.application.labels" . }}
 app.kubernetes.io/version: {{ .Chart.AppVersion }}
 {{- end -}}
\ No newline at end of file
-- 
GitLab


From 9acecfa8432dc0f7da02cb56c9dd9aa5678b47d6 Mon Sep 17 00:00:00 2001
From: afaras0572 <slawal@oteemo.com>
Date: Mon, 18 Nov 2024 10:54:16 -0600
Subject: [PATCH 05/21] updating webservice deployment yaml file

---
 charts/gitlab/charts/webservice/templates/deployment.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/charts/gitlab/charts/webservice/templates/deployment.yaml b/charts/gitlab/charts/webservice/templates/deployment.yaml
index fffc86128a..cc237fa679 100644
--- a/charts/gitlab/charts/webservice/templates/deployment.yaml
+++ b/charts/gitlab/charts/webservice/templates/deployment.yaml
@@ -19,7 +19,9 @@ metadata:
   labels:
     {{- include "gitlab.standardLabels" $ | nindent 4 }}
     {{- include "webservice.labels" . | nindent 4 }}
-    {{- include "gitlab.kiali.labels" . | nindent 4 }}
+    {{- if .Release }}
+       {{- include "gitlab.kiali.labels" . | nindent 4 }}
+    {{- end }}
     {{- include "webservice.commonLabels" . | nindent 4 }}
     {{- if .deployment.labels -}}
     {{-   toYaml .deployment.labels | nindent 4 }}
-- 
GitLab


From 1d8967dba5ce6269fcc549f9f3e94829621916f7 Mon Sep 17 00:00:00 2001
From: afaras0572 <slawal@oteemo.com>
Date: Mon, 18 Nov 2024 11:02:25 -0600
Subject: [PATCH 06/21] updating webservice deployment yaml file new

---
 charts/gitlab/charts/webservice/templates/deployment.yaml | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/charts/gitlab/charts/webservice/templates/deployment.yaml b/charts/gitlab/charts/webservice/templates/deployment.yaml
index cc237fa679..052e70e477 100644
--- a/charts/gitlab/charts/webservice/templates/deployment.yaml
+++ b/charts/gitlab/charts/webservice/templates/deployment.yaml
@@ -50,7 +50,9 @@ spec:
         {{- include "gitlab.podLabels" $ | nindent 8 }}
         {{- include "webservice.commonLabels" . | nindent 8 }}
         {{- include "webservice.podLabels" . | nindent 8 }}
-        {{- include "gitlab.kiali.labels" . | nindent 8 }}
+        {{- if .Release }}
+           {{- include "gitlab.kiali.labels" . | nindent 4 }}
+        {{- end }}
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/configmap.yml") $ | sha256sum }}
         cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
-- 
GitLab


From cc8650fd603997b116a8ba084950bda7179fcb40 Mon Sep 17 00:00:00 2001
From: afaras0572 <slawal@oteemo.com>
Date: Mon, 18 Nov 2024 11:12:38 -0600
Subject: [PATCH 07/21] updating deployment and application template file

---
 charts/gitlab/charts/webservice/templates/deployment.yaml | 8 ++------
 templates/_application.tpl                                | 4 +++-
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/charts/gitlab/charts/webservice/templates/deployment.yaml b/charts/gitlab/charts/webservice/templates/deployment.yaml
index 052e70e477..fffc86128a 100644
--- a/charts/gitlab/charts/webservice/templates/deployment.yaml
+++ b/charts/gitlab/charts/webservice/templates/deployment.yaml
@@ -19,9 +19,7 @@ metadata:
   labels:
     {{- include "gitlab.standardLabels" $ | nindent 4 }}
     {{- include "webservice.labels" . | nindent 4 }}
-    {{- if .Release }}
-       {{- include "gitlab.kiali.labels" . | nindent 4 }}
-    {{- end }}
+    {{- include "gitlab.kiali.labels" . | nindent 4 }}
     {{- include "webservice.commonLabels" . | nindent 4 }}
     {{- if .deployment.labels -}}
     {{-   toYaml .deployment.labels | nindent 4 }}
@@ -50,9 +48,7 @@ spec:
         {{- include "gitlab.podLabels" $ | nindent 8 }}
         {{- include "webservice.commonLabels" . | nindent 8 }}
         {{- include "webservice.podLabels" . | nindent 8 }}
-        {{- if .Release }}
-           {{- include "gitlab.kiali.labels" . | nindent 4 }}
-        {{- end }}
+        {{- include "gitlab.kiali.labels" . | nindent 8 }}
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/configmap.yml") $ | sha256sum }}
         cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
diff --git a/templates/_application.tpl b/templates/_application.tpl
index 6c6a217d27..bc26a5ebcc 100644
--- a/templates/_application.tpl
+++ b/templates/_application.tpl
@@ -66,6 +66,8 @@ priorityClassName: {{ $pcName }}
 Define a app.kubernetes.io/name: {{ .Chart.Name }} and app.kubernetes.io/version: {{ .Chart.AppVersion }} label for kiali on pods, deployments, statefulsets, and daemonsets.
 */}}
 {{- define "gitlab.kiali.labels" -}}
-{{ include "gitlab.application.labels" . }}
+{{- if .Release }}
+   {{ include "gitlab.application.labels" . }}
+{{- end }}
 app.kubernetes.io/version: {{ .Chart.AppVersion }}
 {{- end -}}
\ No newline at end of file
-- 
GitLab


From 04fbe5576ca8b6333a09c865eac5d47abe41f11e Mon Sep 17 00:00:00 2001
From: afaras0572 <slawal@oteemo.com>
Date: Mon, 18 Nov 2024 11:24:33 -0600
Subject: [PATCH 08/21] updating deployment and application template file

---
 templates/_application.tpl | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/templates/_application.tpl b/templates/_application.tpl
index bc26a5ebcc..8880edf0f5 100644
--- a/templates/_application.tpl
+++ b/templates/_application.tpl
@@ -68,6 +68,6 @@ Define a app.kubernetes.io/name: {{ .Chart.Name }} and app.kubernetes.io/version
 {{- define "gitlab.kiali.labels" -}}
 {{- if .Release }}
    {{ include "gitlab.application.labels" . }}
-{{- end }}
-app.kubernetes.io/version: {{ .Chart.AppVersion }}
+   app.kubernetes.io/version: {{ .Chart.AppVersion }}
+{{- end -}}
 {{- end -}}
\ No newline at end of file
-- 
GitLab


From 5dc25d38f10cc8c7e395c86de825b5c9b2aace2d Mon Sep 17 00:00:00 2001
From: afaras0572 <slawal@oteemo.com>
Date: Mon, 18 Nov 2024 11:33:04 -0600
Subject: [PATCH 09/21] resolving empty line on
 gitaly/templates/statefulset.yml

---
 charts/gitlab/charts/gitaly/templates/statefulset.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/gitlab/charts/gitaly/templates/statefulset.yml b/charts/gitlab/charts/gitaly/templates/statefulset.yml
index 05d67015f6..32b4aab862 100644
--- a/charts/gitlab/charts/gitaly/templates/statefulset.yml
+++ b/charts/gitlab/charts/gitaly/templates/statefulset.yml
@@ -9,4 +9,4 @@ metadata:
     {{- include "gitlab.commonLabels" . | nindent 4 }}
     {{- include "gitlab.kiali.labels" . | nindent 4 }}
 {{ include (print $.Template.BasePath "/_statefulset_spec.yaml") . }}
-{{- end }}
+{{- end }}
\ No newline at end of file
-- 
GitLab


From 3cacb2246c61faf5d9ab1770225b25e913eb83a6 Mon Sep 17 00:00:00 2001
From: afaras0572 <slawal@oteemo.com>
Date: Mon, 18 Nov 2024 11:41:56 -0600
Subject: [PATCH 10/21] resolving nindentation issue on statefulset file

---
 charts/gitlab/charts/gitaly/templates/statefulset.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/gitlab/charts/gitaly/templates/statefulset.yml b/charts/gitlab/charts/gitaly/templates/statefulset.yml
index 32b4aab862..0eaa88ba2f 100644
--- a/charts/gitlab/charts/gitaly/templates/statefulset.yml
+++ b/charts/gitlab/charts/gitaly/templates/statefulset.yml
@@ -8,5 +8,5 @@ metadata:
     {{- include "gitlab.standardLabels" . | nindent 4 }}
     {{- include "gitlab.commonLabels" . | nindent 4 }}
     {{- include "gitlab.kiali.labels" . | nindent 4 }}
-{{ include (print $.Template.BasePath "/_statefulset_spec.yaml") . }}
+{{ include (print $.Template.BasePath "/_statefulset_spec.yaml") . | nindent 0 }}
 {{- end }}
\ No newline at end of file
-- 
GitLab


From 67f52fdf354da548bc0853a23fd761f7500f3c01 Mon Sep 17 00:00:00 2001
From: afaras0572 <slawal@oteemo.com>
Date: Mon, 18 Nov 2024 11:49:23 -0600
Subject: [PATCH 11/21] resolving nindentation issue on statefulset

---
 charts/gitlab/charts/gitaly/templates/statefulset.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/gitlab/charts/gitaly/templates/statefulset.yml b/charts/gitlab/charts/gitaly/templates/statefulset.yml
index 0eaa88ba2f..31df6763e8 100644
--- a/charts/gitlab/charts/gitaly/templates/statefulset.yml
+++ b/charts/gitlab/charts/gitaly/templates/statefulset.yml
@@ -8,5 +8,5 @@ metadata:
     {{- include "gitlab.standardLabels" . | nindent 4 }}
     {{- include "gitlab.commonLabels" . | nindent 4 }}
     {{- include "gitlab.kiali.labels" . | nindent 4 }}
-{{ include (print $.Template.BasePath "/_statefulset_spec.yaml") . | nindent 0 }}
+{{- include (print $.Template.BasePath "/_statefulset_spec.yaml") . | nindent 0 }}
 {{- end }}
\ No newline at end of file
-- 
GitLab


From ff1da8caae27c587584ad35908f021fc44b94007 Mon Sep 17 00:00:00 2001
From: afaras0572 <slawal@oteemo.com>
Date: Mon, 18 Nov 2024 11:57:45 -0600
Subject: [PATCH 12/21] resolving nindentation issue on statefulset indentation

---
 charts/gitlab/charts/gitaly/templates/statefulset.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/gitlab/charts/gitaly/templates/statefulset.yml b/charts/gitlab/charts/gitaly/templates/statefulset.yml
index 31df6763e8..54af78151f 100644
--- a/charts/gitlab/charts/gitaly/templates/statefulset.yml
+++ b/charts/gitlab/charts/gitaly/templates/statefulset.yml
@@ -8,5 +8,5 @@ metadata:
     {{- include "gitlab.standardLabels" . | nindent 4 }}
     {{- include "gitlab.commonLabels" . | nindent 4 }}
     {{- include "gitlab.kiali.labels" . | nindent 4 }}
-{{- include (print $.Template.BasePath "/_statefulset_spec.yaml") . | nindent 0 }}
+  {{- include (print $.Template.BasePath "/_statefulset_spec.yaml") . | nindent 2 }}
 {{- end }}
\ No newline at end of file
-- 
GitLab


From 3d86fa12807170309c2794cbca70e1b11b225fa8 Mon Sep 17 00:00:00 2001
From: afaras0572 <slawal@oteemo.com>
Date: Mon, 18 Nov 2024 12:05:30 -0600
Subject: [PATCH 13/21] resolving nindentation issue

---
 charts/gitlab/charts/gitaly/templates/statefulset.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/charts/gitlab/charts/gitaly/templates/statefulset.yml b/charts/gitlab/charts/gitaly/templates/statefulset.yml
index 54af78151f..076794af55 100644
--- a/charts/gitlab/charts/gitaly/templates/statefulset.yml
+++ b/charts/gitlab/charts/gitaly/templates/statefulset.yml
@@ -8,5 +8,5 @@ metadata:
     {{- include "gitlab.standardLabels" . | nindent 4 }}
     {{- include "gitlab.commonLabels" . | nindent 4 }}
     {{- include "gitlab.kiali.labels" . | nindent 4 }}
-  {{- include (print $.Template.BasePath "/_statefulset_spec.yaml") . | nindent 2 }}
+{{- include (print $.Template.BasePath "/_statefulset_spec.yaml") . | nindent 2 }}
 {{- end }}
\ No newline at end of file
-- 
GitLab


From 602e95700bb7757ea80670eb97bc950d1a423376 Mon Sep 17 00:00:00 2001
From: afaras0572 <slawal@oteemo.com>
Date: Mon, 18 Nov 2024 13:12:23 -0600
Subject: [PATCH 14/21] adding if statements to deployment file

---
 charts/gitlab/charts/gitaly/templates/statefulset.yml     | 2 +-
 charts/gitlab/charts/webservice/templates/deployment.yaml | 4 ++++
 templates/_application.tpl                                | 6 ++----
 3 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/charts/gitlab/charts/gitaly/templates/statefulset.yml b/charts/gitlab/charts/gitaly/templates/statefulset.yml
index 076794af55..32b4aab862 100644
--- a/charts/gitlab/charts/gitaly/templates/statefulset.yml
+++ b/charts/gitlab/charts/gitaly/templates/statefulset.yml
@@ -8,5 +8,5 @@ metadata:
     {{- include "gitlab.standardLabels" . | nindent 4 }}
     {{- include "gitlab.commonLabels" . | nindent 4 }}
     {{- include "gitlab.kiali.labels" . | nindent 4 }}
-{{- include (print $.Template.BasePath "/_statefulset_spec.yaml") . | nindent 2 }}
+{{ include (print $.Template.BasePath "/_statefulset_spec.yaml") . }}
 {{- end }}
\ No newline at end of file
diff --git a/charts/gitlab/charts/webservice/templates/deployment.yaml b/charts/gitlab/charts/webservice/templates/deployment.yaml
index fffc86128a..216d67f860 100644
--- a/charts/gitlab/charts/webservice/templates/deployment.yaml
+++ b/charts/gitlab/charts/webservice/templates/deployment.yaml
@@ -19,7 +19,9 @@ metadata:
   labels:
     {{- include "gitlab.standardLabels" $ | nindent 4 }}
     {{- include "webservice.labels" . | nindent 4 }}
+    {{- if .Release }}
     {{- include "gitlab.kiali.labels" . | nindent 4 }}
+    {{- end }}
     {{- include "webservice.commonLabels" . | nindent 4 }}
     {{- if .deployment.labels -}}
     {{-   toYaml .deployment.labels | nindent 4 }}
@@ -48,7 +50,9 @@ spec:
         {{- include "gitlab.podLabels" $ | nindent 8 }}
         {{- include "webservice.commonLabels" . | nindent 8 }}
         {{- include "webservice.podLabels" . | nindent 8 }}
+        {{- if .Release }}
         {{- include "gitlab.kiali.labels" . | nindent 8 }}
+        {{- end }}
       annotations:
         checksum/config: {{ include (print $.Template.BasePath "/configmap.yml") $ | sha256sum }}
         cluster-autoscaler.kubernetes.io/safe-to-evict: "true"
diff --git a/templates/_application.tpl b/templates/_application.tpl
index 8880edf0f5..6c6a217d27 100644
--- a/templates/_application.tpl
+++ b/templates/_application.tpl
@@ -66,8 +66,6 @@ priorityClassName: {{ $pcName }}
 Define a app.kubernetes.io/name: {{ .Chart.Name }} and app.kubernetes.io/version: {{ .Chart.AppVersion }} label for kiali on pods, deployments, statefulsets, and daemonsets.
 */}}
 {{- define "gitlab.kiali.labels" -}}
-{{- if .Release }}
-   {{ include "gitlab.application.labels" . }}
-   app.kubernetes.io/version: {{ .Chart.AppVersion }}
-{{- end -}}
+{{ include "gitlab.application.labels" . }}
+app.kubernetes.io/version: {{ .Chart.AppVersion }}
 {{- end -}}
\ No newline at end of file
-- 
GitLab


From e886d0fd6798aefd722effa4423bb44b63d5af2f Mon Sep 17 00:00:00 2001
From: afaras0572 <slawal@oteemo.com>
Date: Mon, 18 Nov 2024 13:23:06 -0600
Subject: [PATCH 15/21] adding if statements to sidekiq deployment file

---
 charts/gitlab/charts/sidekiq/templates/deployment.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/charts/gitlab/charts/sidekiq/templates/deployment.yaml b/charts/gitlab/charts/sidekiq/templates/deployment.yaml
index a2221eebf2..7bb3363752 100644
--- a/charts/gitlab/charts/sidekiq/templates/deployment.yaml
+++ b/charts/gitlab/charts/sidekiq/templates/deployment.yaml
@@ -35,7 +35,9 @@ metadata:
   labels:
     {{- include "gitlab.standardLabels" $ | nindent 4 }}
     {{- include "sidekiq.commonLabels" (dict "pod" .common.labels "global" $.Values.common.labels) | nindent 4 }}
+    {{- if .Release }}
     {{- include "gitlab.kiali.labels" . | nindent 4 }}
+    {{- end }}
     queue-pod-name: {{ .name }}
   annotations:
     {{- include "gitlab.deploymentAnnotations" $ | nindent 4 }}
@@ -53,7 +55,9 @@ spec:
         {{- include "gitlab.standardLabels" $ | nindent 8 }}
         {{- include "sidekiq.commonLabels" (dict "pod" .common.labels "global" $.Values.common.labels) | nindent 8 }}
         {{- include "sidekiq.podLabels" (dict "pod" .podLabels ) | nindent 8 }}
+        {{- if .Release }}
         {{- include "gitlab.kiali.labels" . | nindent 8 }}
+        {{- end }}
         queue-pod-name: {{ .name }}
       annotations:
         checksum/configmap: {{ $configMapChecksum }}
-- 
GitLab


From cf3574cbaff48059cc452534354a9d331f8dc3d3 Mon Sep 17 00:00:00 2001
From: afaras0572 <slawal@oteemo.com>
Date: Mon, 18 Nov 2024 13:39:33 -0600
Subject: [PATCH 16/21] removing labels for nginx deployments

---
 charts/nginx-ingress/templates/controller-daemonset.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/charts/nginx-ingress/templates/controller-daemonset.yaml b/charts/nginx-ingress/templates/controller-daemonset.yaml
index 333e7da9f9..15d4e9e479 100644
--- a/charts/nginx-ingress/templates/controller-daemonset.yaml
+++ b/charts/nginx-ingress/templates/controller-daemonset.yaml
@@ -5,7 +5,6 @@ metadata:
   labels:
     {{- include "gitlab.standardLabels" . | nindent 4 }}
     {{- include "gitlab.commonLabels" . | nindent 4 }}
-    {{- include "gitlab.kiali.labels" . | nindent 4 }}
     component: "{{ .Values.controller.name }}"
     {{- include "ingress-nginx.labels" . | nindent 4 }}
     app.kubernetes.io/component: controller
@@ -36,7 +35,6 @@ spec:
       {{- end }}
     {{- end }}
       labels:
-        {{- include "gitlab.kiali.labels" . | nindent 8 }}
         {{- include "ingress-nginx.selectorLabels" . | nindent 8 }}
         component: "{{ .Values.controller.name }}"
       {{- if .Values.controller.podLabels }}
-- 
GitLab


From f1f38df165ec7958355ce68c79681669fb785955 Mon Sep 17 00:00:00 2001
From: afaras0572 <slawal@oteemo.com>
Date: Mon, 18 Nov 2024 13:59:24 -0600
Subject: [PATCH 17/21] removing labels for nginx deployments

---
 charts/nginx-ingress/templates/controller-deployment.yaml | 2 --
 1 file changed, 2 deletions(-)

diff --git a/charts/nginx-ingress/templates/controller-deployment.yaml b/charts/nginx-ingress/templates/controller-deployment.yaml
index 6622ed6d20..1a7612aa45 100644
--- a/charts/nginx-ingress/templates/controller-deployment.yaml
+++ b/charts/nginx-ingress/templates/controller-deployment.yaml
@@ -4,7 +4,6 @@ kind: Deployment
 metadata:
   labels:
     {{- include "gitlab.standardLabels" . | nindent 4 }}
-    {{- include "gitlab.kiali.labels" . | nindent 4 }}
     {{- include "gitlab.commonLabels" . | nindent 4 }}
     component: "{{ .Values.controller.name }}"
     {{- include "ingress-nginx.labels" . | nindent 4 }}
@@ -45,7 +44,6 @@ spec:
     {{- end }}
       labels:
         {{- include "ingress-nginx.selectorLabels" . | nindent 8 }}
-        {{- include "gitlab.kiali.labels" . | nindent 8 }}
         component: "{{ .Values.controller.name }}"
       {{- include "gitlab.podLabels" . | nindent 8 }}
       {{- if .Values.controller.podLabels }}
-- 
GitLab


From 0b44acd7a1d8cdbefa5ffd7298adfd318641ceb5 Mon Sep 17 00:00:00 2001
From: afaras0572 <slawal@oteemo.com>
Date: Mon, 18 Nov 2024 14:56:02 -0600
Subject: [PATCH 18/21] updating gitaly labels for kiali

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

diff --git a/charts/gitlab/charts/gitaly/templates/_statefulset_spec.yaml b/charts/gitlab/charts/gitaly/templates/_statefulset_spec.yaml
index 67623cecfd..f6876dd0eb 100644
--- a/charts/gitlab/charts/gitaly/templates/_statefulset_spec.yaml
+++ b/charts/gitlab/charts/gitaly/templates/_statefulset_spec.yaml
@@ -31,7 +31,9 @@ spec:
         {{- include "gitlab.standardLabels" . | nindent 8 }}
         {{- include "gitlab.commonLabels" . | nindent 8 }}
         {{- include "gitlab.podLabels" . | nindent 8 }}
+        {{- if .Release }}
         {{- include "gitlab.kiali.labels" . | nindent 8 }}
+        {{- end }}
       annotations:
       {{- $cm := "/configmap.yml" -}}
       {{- if .storage }}
diff --git a/charts/gitlab/charts/gitaly/templates/statefulset-with-praefect.yml b/charts/gitlab/charts/gitaly/templates/statefulset-with-praefect.yml
index 83217dca22..30d7712c73 100644
--- a/charts/gitlab/charts/gitaly/templates/statefulset-with-praefect.yml
+++ b/charts/gitlab/charts/gitaly/templates/statefulset-with-praefect.yml
@@ -8,7 +8,9 @@ metadata:
   labels:
     {{- include "gitlab.standardLabels" $ | nindent 4 }}
     {{- include "gitlab.commonLabels" $ | nindent 4 }}
+    {{- if .Release}}
     {{- include "gitlab.kiali.labels" . | nindent 4 }}
+    {{- end }}
     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 32b4aab862..617582c2b1 100644
--- a/charts/gitlab/charts/gitaly/templates/statefulset.yml
+++ b/charts/gitlab/charts/gitaly/templates/statefulset.yml
@@ -7,6 +7,8 @@ metadata:
   labels:
     {{- include "gitlab.standardLabels" . | nindent 4 }}
     {{- include "gitlab.commonLabels" . | nindent 4 }}
+    {{- if .Release }} 
     {{- include "gitlab.kiali.labels" . | nindent 4 }}
+    {{- end }}
 {{ include (print $.Template.BasePath "/_statefulset_spec.yaml") . }}
 {{- end }}
\ No newline at end of file
-- 
GitLab


From 0ff4df0e5122a3bfe1b9df67b1dc31d1042de6ba Mon Sep 17 00:00:00 2001
From: afaras0572 <slawal@oteemo.com>
Date: Tue, 17 Dec 2024 13:18:02 -0600
Subject: [PATCH 19/21] test commit

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f708169ae4..129a7e84b4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,6 +2,7 @@
 documentation](doc/development/changelog.md) for instructions on adding your own
 entry.
 
+
 ## 8.5.2 (2024-11-12)
 
 ### Changed (1 change)
-- 
GitLab


From f9c1060053d5c011ef573fb41a3c47ea95777992 Mon Sep 17 00:00:00 2001
From: afaras0572 <slawal@oteemo.com>
Date: Tue, 17 Dec 2024 13:49:24 -0600
Subject: [PATCH 20/21] retesting verify

---
 CHANGELOG.md | 1 -
 1 file changed, 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 129a7e84b4..f708169ae4 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -2,7 +2,6 @@
 documentation](doc/development/changelog.md) for instructions on adding your own
 entry.
 
-
 ## 8.5.2 (2024-11-12)
 
 ### Changed (1 change)
-- 
GitLab


From 2291578092fa241319e4032435d201ca7697922f Mon Sep 17 00:00:00 2001
From: afaras0572 <slawal@oteemo.com>
Date: Tue, 17 Dec 2024 14:04:53 -0600
Subject: [PATCH 21/21] retesting verify

---
 CHANGELOG.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index f708169ae4..10465c45af 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,6 +8,7 @@ entry.
 
 - [Update Helm release gitlab-runner to v0.70.1](https://gitlab.com/gitlab-org/security/charts/gitlab/-/commit/c25959ffaa4e8377938c22c19e651549e6f07839)
 
+
 ## 8.5.1 (2024-10-22)
 
 No changes.
-- 
GitLab