From 5e46bef8f7843545d5cbea70f6765e5325ffd0cc Mon Sep 17 00:00:00 2001
From: Silvester <swainaina@gitlab.com>
Date: Sat, 22 May 2021 09:49:59 +0300
Subject: [PATCH 1/4] Fix consistency issue with standard labels

Changelog: changed
---
 charts/certmanager-issuer/templates/_issuer.yaml           | 4 +++-
 charts/certmanager-issuer/templates/cert-manager.yml       | 3 ++-
 charts/certmanager-issuer/templates/issuer-job.yaml        | 3 ++-
 charts/certmanager-issuer/templates/rbac-config.yaml       | 3 ++-
 charts/certmanager-issuer/values.yaml                      | 3 +++
 .../gitlab-grafana/templates/datasource-configmap.yaml     | 1 +
 .../gitlab-grafana/templates/import-secret-configmap.yaml  | 1 +
 charts/gitlab/charts/gitlab-grafana/templates/ingress.yaml | 1 +
 charts/gitlab/charts/gitlab-grafana/values.yaml            | 2 ++
 charts/gitlab/charts/gitlab-pages/values.yaml              | 1 -
 charts/gitlab/charts/kas/templates/networkpolicy.yaml      | 4 ++--
 charts/gitlab/charts/mailroom/templates/networkpolicy.yaml | 4 ++--
 charts/gitlab/charts/migrations/templates/configmap.yaml   | 1 +
 charts/gitlab/charts/operator/templates/deployment.yaml    | 1 +
 charts/gitlab/charts/operator/templates/gitlab.yaml        | 1 +
 charts/gitlab/charts/operator/templates/rbac.yaml          | 3 +++
 charts/gitlab/charts/operator/values.yaml                  | 2 ++
 charts/gitlab/charts/sidekiq/templates/networkpolicy.yaml  | 4 ++--
 charts/gitlab/charts/webservice/templates/configmap.yml    | 1 +
 .../gitlab/charts/webservice/templates/networkpolicy.yaml  | 4 ++--
 charts/nginx-ingress/templates/clusterrole.yaml            | 1 +
 charts/nginx-ingress/templates/clusterrolebinding.yaml     | 1 +
 .../templates/controller-configmap-addheaders.yaml         | 1 +
 .../templates/controller-configmap-proxyheaders.yaml       | 1 +
 .../nginx-ingress/templates/controller-configmap-tcp.yaml  | 1 +
 .../nginx-ingress/templates/controller-configmap-udp.yaml  | 1 +
 charts/nginx-ingress/templates/controller-configmap.yaml   | 1 +
 charts/nginx-ingress/templates/controller-daemonset.yaml   | 1 +
 charts/nginx-ingress/templates/controller-deployment.yaml  | 1 +
 charts/nginx-ingress/templates/controller-hpa.yaml         | 1 +
 charts/nginx-ingress/templates/controller-keda.yaml        | 1 +
 .../templates/controller-poddisruptionbudget.yaml          | 1 +
 .../templates/controller-prometheusrules.yaml              | 1 +
 charts/nginx-ingress/templates/controller-psp.yaml         | 1 +
 charts/nginx-ingress/templates/controller-role.yaml        | 1 +
 charts/nginx-ingress/templates/controller-rolebinding.yaml | 1 +
 .../templates/controller-service-internal.yaml             | 1 +
 .../templates/controller-service-metrics.yaml              | 1 +
 .../templates/controller-service-webhook.yaml              | 1 +
 charts/nginx-ingress/templates/controller-service.yaml     | 1 +
 .../nginx-ingress/templates/controller-serviceaccount.yaml | 1 +
 .../nginx-ingress/templates/controller-servicemonitor.yaml | 1 +
 .../templates/default-backend-deployment.yaml              | 1 +
 charts/nginx-ingress/templates/default-backend-hpa.yaml    | 1 +
 .../templates/default-backend-poddisruptionbudget.yaml     | 1 +
 charts/nginx-ingress/templates/default-backend-psp.yaml    | 1 +
 charts/nginx-ingress/templates/default-backend-role.yaml   | 1 +
 .../templates/default-backend-rolebinding.yaml             | 1 +
 .../nginx-ingress/templates/default-backend-service.yaml   | 1 +
 .../templates/default-backend-serviceaccount.yaml          | 1 +
 charts/nginx-ingress/values.yaml                           | 3 +++
 doc/charts/gitlab/gitlab-exporter/index.md                 | 1 +
 doc/charts/gitlab/gitlab-grafana/index.md                  | 1 +
 doc/charts/gitlab/kas/index.md                             | 1 +
 doc/charts/gitlab/task-runner/index.md                     | 3 ++-
 doc/charts/shared-secrets.md                               | 1 +
 templates/application.yaml                                 | 1 +
 templates/chart-info.yaml                                  | 1 +
 templates/initdb-configmap.yaml                            | 1 +
 templates/shared-secrets/_generate_secrets.sh.tpl          | 2 +-
 templates/shared-secrets/_jobspec.yaml                     | 3 +++
 templates/shared-secrets/_rbac-serviceaccount.yaml         | 1 +
 templates/shared-secrets/_self-signed-cert-job.yml         | 7 ++++---
 templates/shared-secrets/configmap.yaml                    | 2 ++
 templates/upgrade_check_hook.yaml                          | 2 ++
 values.yaml                                                | 4 ++++
 66 files changed, 93 insertions(+), 18 deletions(-)

diff --git a/charts/certmanager-issuer/templates/_issuer.yaml b/charts/certmanager-issuer/templates/_issuer.yaml
index bad45fee6b..ac0b159c05 100644
--- a/charts/certmanager-issuer/templates/_issuer.yaml
+++ b/charts/certmanager-issuer/templates/_issuer.yaml
@@ -5,7 +5,9 @@ metadata:
   name: {{ .Release.Name }}-issuer
   namespace: {{ $.Release.Namespace }}
   labels:
-{{ include "gitlab.standardLabels" . | indent 4 }}
+  {{- include "gitlab.standardLabels" . | nindent 4 }}
+    {{- include "gitlab.standardLabels" . | nindent 4 }}
+    {{- include "gitlab.commonLabels" . | nindent 4 }}
 spec:
   acme:
     # The ACME server URL
diff --git a/charts/certmanager-issuer/templates/cert-manager.yml b/charts/certmanager-issuer/templates/cert-manager.yml
index 0c206cc9da..2a59eb0f14 100644
--- a/charts/certmanager-issuer/templates/cert-manager.yml
+++ b/charts/certmanager-issuer/templates/cert-manager.yml
@@ -5,7 +5,8 @@ metadata:
   name: {{ template "fullname" . }}-certmanager
   namespace: {{ $.Release.Namespace }}
   labels:
-{{ include "gitlab.standardLabels" . | indent 4 }}
+    {{- include "gitlab.standardLabels" . | nindent 4 }}
+    {{- include "gitlab.commonLabels" . | nindent 4 }}
 data:
   create-issuer: |
 {{ include (print $.Template.BasePath "/_create_issuer.sh") . | indent 4 }}
diff --git a/charts/certmanager-issuer/templates/issuer-job.yaml b/charts/certmanager-issuer/templates/issuer-job.yaml
index 27b0bc6f34..efde5f1e51 100644
--- a/charts/certmanager-issuer/templates/issuer-job.yaml
+++ b/charts/certmanager-issuer/templates/issuer-job.yaml
@@ -5,7 +5,8 @@ metadata:
   name: {{ template "certmanager-issuer.jobname" . }}
   namespace: {{ $.Release.Namespace }}
   labels:
-{{ include "gitlab.standardLabels" . | indent 4 }}
+    {{- include "gitlab.standardLabels" . | nindent 4 }}
+    {{- include "gitlab.commonLabels" . | nindent 4 }}
 spec:
   activeDeadlineSeconds: 300
   template:
diff --git a/charts/certmanager-issuer/templates/rbac-config.yaml b/charts/certmanager-issuer/templates/rbac-config.yaml
index b9f72e86fb..b05c275c3b 100644
--- a/charts/certmanager-issuer/templates/rbac-config.yaml
+++ b/charts/certmanager-issuer/templates/rbac-config.yaml
@@ -5,7 +5,8 @@ metadata:
   name: {{ template "fullname" . }}
   namespace: {{ $.Release.Namespace }}
   labels:
-{{ include "gitlab.standardLabels" . | indent 4 }}
+    {{- include "gitlab.standardLabels" . | nindent 4 }}
+    {{- include "gitlab.commonLabels" . | nindent 4 }}
   annotations:
     namespace: {{ .Release.Namespace }}
 ---
diff --git a/charts/certmanager-issuer/values.yaml b/charts/certmanager-issuer/values.yaml
index 051184a656..016ef256f7 100644
--- a/charts/certmanager-issuer/values.yaml
+++ b/charts/certmanager-issuer/values.yaml
@@ -10,3 +10,6 @@ rbac:
 resources:
   requests:
     cpu: 50m
+
+common:
+  labels: {}
\ No newline at end of file
diff --git a/charts/gitlab/charts/gitlab-grafana/templates/datasource-configmap.yaml b/charts/gitlab/charts/gitlab-grafana/templates/datasource-configmap.yaml
index 4b8851a3ee..99cdc89671 100644
--- a/charts/gitlab/charts/gitlab-grafana/templates/datasource-configmap.yaml
+++ b/charts/gitlab/charts/gitlab-grafana/templates/datasource-configmap.yaml
@@ -7,6 +7,7 @@ metadata:
   labels:
     gitlab_grafana_datasource: "true"
     {{- include "gitlab.standardLabels" . | nindent 4 }}
+    {{- include "gitlab.commonLabels" . | nindent 4 }}
 data:
   gitlab.yaml: |
     apiVersion: 1
diff --git a/charts/gitlab/charts/gitlab-grafana/templates/import-secret-configmap.yaml b/charts/gitlab/charts/gitlab-grafana/templates/import-secret-configmap.yaml
index 685faaa4d0..81f31d6e71 100644
--- a/charts/gitlab/charts/gitlab-grafana/templates/import-secret-configmap.yaml
+++ b/charts/gitlab/charts/gitlab-grafana/templates/import-secret-configmap.yaml
@@ -6,6 +6,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "gitlab.standardLabels" . | nindent 4 }}
+    {{- include "gitlab.commonLabels" . | nindent 4 }}
 data:
   import-secret.sh: |-
     {{- include (print $.Template.BasePath "/_import-secret.sh") . | nindent 4 }}
diff --git a/charts/gitlab/charts/gitlab-grafana/templates/ingress.yaml b/charts/gitlab/charts/gitlab-grafana/templates/ingress.yaml
index a8dce5499b..47b4d8e74e 100644
--- a/charts/gitlab/charts/gitlab-grafana/templates/ingress.yaml
+++ b/charts/gitlab/charts/gitlab-grafana/templates/ingress.yaml
@@ -11,6 +11,7 @@ metadata:
   namespace: {{ $.Release.Namespace }}
   labels:
     {{- include "gitlab.standardLabels" . | nindent 4 }}
+    {{- include "gitlab.commonLabels" . | nindent 4 }}
   annotations:
     kubernetes.io/ingress.class: "{{ template "gitlab.ingressclass" . }}"
     {{- if .Values.global.ingress.provider }}
diff --git a/charts/gitlab/charts/gitlab-grafana/values.yaml b/charts/gitlab/charts/gitlab-grafana/values.yaml
index 9562dd01c1..311b57a4c0 100644
--- a/charts/gitlab/charts/gitlab-grafana/values.yaml
+++ b/charts/gitlab/charts/gitlab-grafana/values.yaml
@@ -16,3 +16,5 @@ ingress:
   proxyReadTimeout: 180
   proxyConnectTimeout: 15
 
+common:
+  labels: {}
\ No newline at end of file
diff --git a/charts/gitlab/charts/gitlab-pages/values.yaml b/charts/gitlab/charts/gitlab-pages/values.yaml
index 7bd98e411f..c47b53cff6 100644
--- a/charts/gitlab/charts/gitlab-pages/values.yaml
+++ b/charts/gitlab/charts/gitlab-pages/values.yaml
@@ -67,7 +67,6 @@ extraEnv: {}
 
 maxUnavailable: 1
 
-podLabels: {}
 resources:
   requests:
     cpu: 900m
diff --git a/charts/gitlab/charts/kas/templates/networkpolicy.yaml b/charts/gitlab/charts/kas/templates/networkpolicy.yaml
index 4e2f485cf2..764e929b36 100644
--- a/charts/gitlab/charts/kas/templates/networkpolicy.yaml
+++ b/charts/gitlab/charts/kas/templates/networkpolicy.yaml
@@ -6,8 +6,8 @@ metadata:
   name: {{ template "fullname" . }}-v1
   namespace: {{ $.Release.Namespace }}
   labels:
-    {{ include "gitlab.standardLabels" . | nindent 4 }}
-    {{ include "gitlab.commonLabels" . | nindent 4 }}
+    {{- include "gitlab.standardLabels" . | nindent 4 }}
+    {{- include "gitlab.commonLabels" . | nindent 4 }}
   annotations:
     {{ toYaml .Values.networkpolicy.annotations | nindent 4 }}
 spec:
diff --git a/charts/gitlab/charts/mailroom/templates/networkpolicy.yaml b/charts/gitlab/charts/mailroom/templates/networkpolicy.yaml
index 341cbf1230..cd4b1d7d68 100644
--- a/charts/gitlab/charts/mailroom/templates/networkpolicy.yaml
+++ b/charts/gitlab/charts/mailroom/templates/networkpolicy.yaml
@@ -6,8 +6,8 @@ metadata:
   name: {{ template "fullname" . }}-v1
   namespace: {{ $.Release.Namespace }}
   labels:
-    {{ include "gitlab.standardLabels" . | nindent 4 }}
-    {{ include "gitlab.commonLabels" . | nindent 4 }}
+    {{- include "gitlab.standardLabels" . | nindent 4 }}
+    {{- include "gitlab.commonLabels" . | nindent 4 }}
   annotations:
     {{ toYaml .Values.networkpolicy.annotations | nindent 4 }}
 spec:
diff --git a/charts/gitlab/charts/migrations/templates/configmap.yaml b/charts/gitlab/charts/migrations/templates/configmap.yaml
index 01faa5c88d..bc1dcc89a4 100644
--- a/charts/gitlab/charts/migrations/templates/configmap.yaml
+++ b/charts/gitlab/charts/migrations/templates/configmap.yaml
@@ -47,6 +47,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "gitlab.standardLabels" . | nindent 4 }}
+    {{- include "gitlab.commonLabels" . | nindent 4 }}
 data:
   template: |-
     {{- include (print $.Template.BasePath "/_jobspec.yaml") . | nindent 4 }}
diff --git a/charts/gitlab/charts/operator/templates/deployment.yaml b/charts/gitlab/charts/operator/templates/deployment.yaml
index efe499d955..60cd30b2b8 100644
--- a/charts/gitlab/charts/operator/templates/deployment.yaml
+++ b/charts/gitlab/charts/operator/templates/deployment.yaml
@@ -6,6 +6,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "gitlab.standardLabels" . | nindent 4 }}
+    {{- include "gitlab.commonLabels" . | nindent 4 }}
   annotations:
     {{- include "gitlab.deploymentAnnotations" . | nindent 4 }}
 spec:
diff --git a/charts/gitlab/charts/operator/templates/gitlab.yaml b/charts/gitlab/charts/operator/templates/gitlab.yaml
index dbada965b7..0b542fef0c 100644
--- a/charts/gitlab/charts/operator/templates/gitlab.yaml
+++ b/charts/gitlab/charts/operator/templates/gitlab.yaml
@@ -8,6 +8,7 @@ metadata:
   annotations:
     gitlab.com/class: {{ .Release.Name }}
     {{- include "gitlab.standardLabels" $ | nindent 4 }}
+    {{- include "gitlab.commonLabels" . | nindent 4 }}
   name: {{ template "fullname" . }}
 spec:
   version: {{ include "gitlab.operator.gitlabVersion" . | quote }}
diff --git a/charts/gitlab/charts/operator/templates/rbac.yaml b/charts/gitlab/charts/operator/templates/rbac.yaml
index b1843a21ef..eb95b65638 100644
--- a/charts/gitlab/charts/operator/templates/rbac.yaml
+++ b/charts/gitlab/charts/operator/templates/rbac.yaml
@@ -6,6 +6,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "gitlab.standardLabels" $ | nindent 4 }}
+    {{- include "gitlab.commonLabels" . | nindent 4 }}
 ---
 apiVersion: rbac.authorization.k8s.io/v1
 {{- if (include "gitlab.operator.namespaced" .) }}
@@ -17,6 +18,7 @@ metadata:
   name: {{ template "fullname" . }}
   labels:
     {{- include "gitlab.standardLabels" $ | nindent 4 }}
+    {{- include "gitlab.commonLabels" . | nindent 4 }}
 rules:
 - apiGroups:
   - apps
@@ -94,6 +96,7 @@ metadata:
   name: {{ template "fullname" . }}
   labels:
     {{- include "gitlab.standardLabels" $ | nindent 4 }}
+    {{- include "gitlab.commonLabels" . | nindent 4 }}
 roleRef:
   apiGroup: rbac.authorization.k8s.io
 {{- if (include "gitlab.operator.namespaced" .) }}
diff --git a/charts/gitlab/charts/operator/values.yaml b/charts/gitlab/charts/operator/values.yaml
index 7711c0cdf0..7fddabb156 100644
--- a/charts/gitlab/charts/operator/values.yaml
+++ b/charts/gitlab/charts/operator/values.yaml
@@ -31,3 +31,5 @@ resources:
 # A prefix for group name of GitLab CRD. It can be used for distinguishing
 # different CRDs in a cluster, e.g. for development purposes such GitLab CI.
 #crdPrefix:
+common:
+  labels: {}
\ No newline at end of file
diff --git a/charts/gitlab/charts/sidekiq/templates/networkpolicy.yaml b/charts/gitlab/charts/sidekiq/templates/networkpolicy.yaml
index 341cbf1230..cd4b1d7d68 100644
--- a/charts/gitlab/charts/sidekiq/templates/networkpolicy.yaml
+++ b/charts/gitlab/charts/sidekiq/templates/networkpolicy.yaml
@@ -6,8 +6,8 @@ metadata:
   name: {{ template "fullname" . }}-v1
   namespace: {{ $.Release.Namespace }}
   labels:
-    {{ include "gitlab.standardLabels" . | nindent 4 }}
-    {{ include "gitlab.commonLabels" . | nindent 4 }}
+    {{- include "gitlab.standardLabels" . | nindent 4 }}
+    {{- include "gitlab.commonLabels" . | nindent 4 }}
   annotations:
     {{ toYaml .Values.networkpolicy.annotations | nindent 4 }}
 spec:
diff --git a/charts/gitlab/charts/webservice/templates/configmap.yml b/charts/gitlab/charts/webservice/templates/configmap.yml
index 9797db6fa4..14602b6160 100644
--- a/charts/gitlab/charts/webservice/templates/configmap.yml
+++ b/charts/gitlab/charts/webservice/templates/configmap.yml
@@ -162,6 +162,7 @@ metadata:
   namespace: {{ $.Release.Namespace }}
   labels:
     {{- include "gitlab.standardLabels" $ | nindent 4 }}
+    {{- include "gitlab.commonLabels" $ | nindent 4 }}
 data:
   installation_type: |
     gitlab-helm-chart
diff --git a/charts/gitlab/charts/webservice/templates/networkpolicy.yaml b/charts/gitlab/charts/webservice/templates/networkpolicy.yaml
index 341cbf1230..cd4b1d7d68 100644
--- a/charts/gitlab/charts/webservice/templates/networkpolicy.yaml
+++ b/charts/gitlab/charts/webservice/templates/networkpolicy.yaml
@@ -6,8 +6,8 @@ metadata:
   name: {{ template "fullname" . }}-v1
   namespace: {{ $.Release.Namespace }}
   labels:
-    {{ include "gitlab.standardLabels" . | nindent 4 }}
-    {{ include "gitlab.commonLabels" . | nindent 4 }}
+    {{- include "gitlab.standardLabels" . | nindent 4 }}
+    {{- include "gitlab.commonLabels" . | nindent 4 }}
   annotations:
     {{ toYaml .Values.networkpolicy.annotations | nindent 4 }}
 spec:
diff --git a/charts/nginx-ingress/templates/clusterrole.yaml b/charts/nginx-ingress/templates/clusterrole.yaml
index 2dde13a075..f777b28a00 100644
--- a/charts/nginx-ingress/templates/clusterrole.yaml
+++ b/charts/nginx-ingress/templates/clusterrole.yaml
@@ -4,6 +4,7 @@ kind: ClusterRole
 metadata:
   labels:
     {{- include "gitlab.standardLabels" . | nindent 4 }}
+    {{- include "gitlab.commonLabels" . | nindent 4 }}
     {{- include "ingress-nginx.labels" . | nindent 4 }}
   name: {{ include "ingress-nginx.fullname" . }}
 rules:
diff --git a/charts/nginx-ingress/templates/clusterrolebinding.yaml b/charts/nginx-ingress/templates/clusterrolebinding.yaml
index c6d16d9af7..41df108a06 100644
--- a/charts/nginx-ingress/templates/clusterrolebinding.yaml
+++ b/charts/nginx-ingress/templates/clusterrolebinding.yaml
@@ -4,6 +4,7 @@ kind: ClusterRoleBinding
 metadata:
   labels:
     {{- include "gitlab.standardLabels" . | nindent 4 }}
+    {{- include "gitlab.commonLabels" . | nindent 4 }}
     {{- include "ingress-nginx.labels" . | nindent 4 }}
   name: {{ include "ingress-nginx.fullname" . }}
 roleRef:
diff --git a/charts/nginx-ingress/templates/controller-configmap-addheaders.yaml b/charts/nginx-ingress/templates/controller-configmap-addheaders.yaml
index 6a5a29893d..8c94af1f4a 100644
--- a/charts/nginx-ingress/templates/controller-configmap-addheaders.yaml
+++ b/charts/nginx-ingress/templates/controller-configmap-addheaders.yaml
@@ -4,6 +4,7 @@ kind: ConfigMap
 metadata:
   labels:
     {{- include "gitlab.standardLabels" . | nindent 4 }}
+    {{- include "gitlab.commonLabels" . | nindent 4 }}
     component: "{{ .Values.controller.name }}"
     {{- include "ingress-nginx.labels" . | nindent 4 }}
     app.kubernetes.io/component: controller
diff --git a/charts/nginx-ingress/templates/controller-configmap-proxyheaders.yaml b/charts/nginx-ingress/templates/controller-configmap-proxyheaders.yaml
index ea9fdc0091..02ed9cc209 100644
--- a/charts/nginx-ingress/templates/controller-configmap-proxyheaders.yaml
+++ b/charts/nginx-ingress/templates/controller-configmap-proxyheaders.yaml
@@ -4,6 +4,7 @@ kind: ConfigMap
 metadata:
   labels:
     {{- include "gitlab.standardLabels" . | nindent 4 }}
+    {{- include "gitlab.commonLabels" . | nindent 4 }}
     component: "{{ .Values.controller.name }}"
     {{- include "ingress-nginx.labels" . | nindent 4 }}
     app.kubernetes.io/component: controller
diff --git a/charts/nginx-ingress/templates/controller-configmap-tcp.yaml b/charts/nginx-ingress/templates/controller-configmap-tcp.yaml
index f43e82ba19..45f5448cf4 100644
--- a/charts/nginx-ingress/templates/controller-configmap-tcp.yaml
+++ b/charts/nginx-ingress/templates/controller-configmap-tcp.yaml
@@ -4,6 +4,7 @@ kind: ConfigMap
 metadata:
   labels:
     {{- include "gitlab.standardLabels" . | nindent 4 }}
+    {{- include "gitlab.commonLabels" . | nindent 4 }}
     component: "{{ .Values.controller.name }}"
     {{- include "ingress-nginx.labels" . | nindent 4 }}
     app.kubernetes.io/component: controller
diff --git a/charts/nginx-ingress/templates/controller-configmap-udp.yaml b/charts/nginx-ingress/templates/controller-configmap-udp.yaml
index a2f09c5cbe..4e01981f46 100644
--- a/charts/nginx-ingress/templates/controller-configmap-udp.yaml
+++ b/charts/nginx-ingress/templates/controller-configmap-udp.yaml
@@ -4,6 +4,7 @@ kind: ConfigMap
 metadata:
   labels:
     {{- include "gitlab.standardLabels" . | nindent 4 }}
+    {{- include "gitlab.commonLabels" . | nindent 4 }}
     component: "{{ .Values.controller.name }}"
     {{- include "ingress-nginx.labels" . | nindent 4 }}
     app.kubernetes.io/component: controller
diff --git a/charts/nginx-ingress/templates/controller-configmap.yaml b/charts/nginx-ingress/templates/controller-configmap.yaml
index e178d994c9..500bb80340 100644
--- a/charts/nginx-ingress/templates/controller-configmap.yaml
+++ b/charts/nginx-ingress/templates/controller-configmap.yaml
@@ -3,6 +3,7 @@ kind: ConfigMap
 metadata:
   labels:
     {{- include "gitlab.standardLabels" . | nindent 4 }}
+    {{- include "gitlab.commonLabels" . | nindent 4 }}
     component: "{{ .Values.controller.name }}"
     {{- include "ingress-nginx.labels" . | nindent 4 }}
     app.kubernetes.io/component: controller
diff --git a/charts/nginx-ingress/templates/controller-daemonset.yaml b/charts/nginx-ingress/templates/controller-daemonset.yaml
index 61567f6f7e..c9d38d87b7 100644
--- a/charts/nginx-ingress/templates/controller-daemonset.yaml
+++ b/charts/nginx-ingress/templates/controller-daemonset.yaml
@@ -4,6 +4,7 @@ kind: DaemonSet
 metadata:
   labels:
     {{- include "gitlab.standardLabels" . | nindent 4 }}
+    {{- include "gitlab.commonLabels" . | nindent 4 }}
     component: "{{ .Values.controller.name }}"
     {{- include "ingress-nginx.labels" . | nindent 4 }}
     app.kubernetes.io/component: controller
diff --git a/charts/nginx-ingress/templates/controller-deployment.yaml b/charts/nginx-ingress/templates/controller-deployment.yaml
index e620a4b4c0..ae956cea23 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.commonLabels" . | nindent 4 }}
     component: "{{ .Values.controller.name }}"
     {{- include "ingress-nginx.labels" . | nindent 4 }}
     app.kubernetes.io/component: controller
diff --git a/charts/nginx-ingress/templates/controller-hpa.yaml b/charts/nginx-ingress/templates/controller-hpa.yaml
index b8617e2a88..eb646b04e6 100644
--- a/charts/nginx-ingress/templates/controller-hpa.yaml
+++ b/charts/nginx-ingress/templates/controller-hpa.yaml
@@ -6,6 +6,7 @@ kind: HorizontalPodAutoscaler
 metadata:
   labels:
     {{- include "gitlab.standardLabels" . | nindent 4 }}
+    {{- include "gitlab.commonLabels" . | nindent 4 }}
     component: "{{ .Values.controller.name }}"
     {{- include "ingress-nginx.labels" . | nindent 4 }}
     app.kubernetes.io/component: controller
diff --git a/charts/nginx-ingress/templates/controller-keda.yaml b/charts/nginx-ingress/templates/controller-keda.yaml
index 5adc5f6049..581f6ec772 100644
--- a/charts/nginx-ingress/templates/controller-keda.yaml
+++ b/charts/nginx-ingress/templates/controller-keda.yaml
@@ -6,6 +6,7 @@ kind: ScaledObject
 metadata:
   labels:
     {{- include "gitlab.standardLabels" . | nindent 4 }}
+    {{- include "gitlab.commonLabels" . | nindent 4 }}
     component: "{{ .Values.controller.name }}"
     {{- include "ingress-nginx.labels" . | nindent 4 }}
     app.kubernetes.io/component: controller
diff --git a/charts/nginx-ingress/templates/controller-poddisruptionbudget.yaml b/charts/nginx-ingress/templates/controller-poddisruptionbudget.yaml
index ef687c10e0..a1ff64ca89 100644
--- a/charts/nginx-ingress/templates/controller-poddisruptionbudget.yaml
+++ b/charts/nginx-ingress/templates/controller-poddisruptionbudget.yaml
@@ -4,6 +4,7 @@ kind: PodDisruptionBudget
 metadata:
   labels:
     {{- include "gitlab.standardLabels" . | nindent 4 }}
+    {{- include "gitlab.commonLabels" . | nindent 4 }}
     component: "{{ .Values.controller.name }}"
     {{- include "ingress-nginx.labels" . | nindent 4 }}
     app.kubernetes.io/component: controller
diff --git a/charts/nginx-ingress/templates/controller-prometheusrules.yaml b/charts/nginx-ingress/templates/controller-prometheusrules.yaml
index 457ade2933..3d67c19aa5 100644
--- a/charts/nginx-ingress/templates/controller-prometheusrules.yaml
+++ b/charts/nginx-ingress/templates/controller-prometheusrules.yaml
@@ -8,6 +8,7 @@ metadata:
 {{- end }}
   labels:
     {{- include "gitlab.standardLabels" . | nindent 4 }}
+    {{- include "gitlab.commonLabels" . | nindent 4 }}
     component: "{{ .Values.controller.name }}"
     {{- include "ingress-nginx.labels" . | nindent 4 }}
     app.kubernetes.io/component: controller
diff --git a/charts/nginx-ingress/templates/controller-psp.yaml b/charts/nginx-ingress/templates/controller-psp.yaml
index d3f4231a7d..c70c0aedc8 100644
--- a/charts/nginx-ingress/templates/controller-psp.yaml
+++ b/charts/nginx-ingress/templates/controller-psp.yaml
@@ -5,6 +5,7 @@ metadata:
   name: {{ include "ingress-nginx.fullname" . }}
   labels:
     {{- include "gitlab.standardLabels" . | nindent 4 }}
+    {{- include "gitlab.commonLabels" . | nindent 4 }}
     component: "{{ .Values.controller.name }}"
     {{- include "ingress-nginx.labels" . | nindent 4 }}
     app.kubernetes.io/component: controller
diff --git a/charts/nginx-ingress/templates/controller-role.yaml b/charts/nginx-ingress/templates/controller-role.yaml
index cbcb0cd00e..835f396acc 100644
--- a/charts/nginx-ingress/templates/controller-role.yaml
+++ b/charts/nginx-ingress/templates/controller-role.yaml
@@ -4,6 +4,7 @@ kind: Role
 metadata:
   labels:
     {{- include "gitlab.standardLabels" . | nindent 4 }}
+    {{- include "gitlab.commonLabels" . | nindent 4 }}
     component: "{{ .Values.controller.name }}"
     {{- include "ingress-nginx.labels" . | nindent 4 }}
     app.kubernetes.io/component: controller
diff --git a/charts/nginx-ingress/templates/controller-rolebinding.yaml b/charts/nginx-ingress/templates/controller-rolebinding.yaml
index bb0b60d76d..df384e9bc4 100644
--- a/charts/nginx-ingress/templates/controller-rolebinding.yaml
+++ b/charts/nginx-ingress/templates/controller-rolebinding.yaml
@@ -4,6 +4,7 @@ kind: RoleBinding
 metadata:
   labels:
     {{- include "gitlab.standardLabels" . | nindent 4 }}
+    {{- include "gitlab.commonLabels" . | nindent 4 }}
     component: "{{ .Values.controller.name }}"
     {{- include "ingress-nginx.labels" . | nindent 4 }}
     app.kubernetes.io/component: controller
diff --git a/charts/nginx-ingress/templates/controller-service-internal.yaml b/charts/nginx-ingress/templates/controller-service-internal.yaml
index 16a57f0261..0bd7b0a170 100644
--- a/charts/nginx-ingress/templates/controller-service-internal.yaml
+++ b/charts/nginx-ingress/templates/controller-service-internal.yaml
@@ -8,6 +8,7 @@ metadata:
   {{- end }}
   labels:
     {{- include "gitlab.standardLabels" . | nindent 4 }}
+    {{- include "gitlab.commonLabels" . | nindent 4 }}
     component: "{{ .Values.controller.name }}"
     {{- include "ingress-nginx.labels" . | nindent 4 }}
     app.kubernetes.io/component: controller
diff --git a/charts/nginx-ingress/templates/controller-service-metrics.yaml b/charts/nginx-ingress/templates/controller-service-metrics.yaml
index 88369cff02..a100559441 100644
--- a/charts/nginx-ingress/templates/controller-service-metrics.yaml
+++ b/charts/nginx-ingress/templates/controller-service-metrics.yaml
@@ -7,6 +7,7 @@ metadata:
 {{- end }}
   labels:
     {{- include "gitlab.standardLabels" . | nindent 4 }}
+    {{- include "gitlab.commonLabels" . | nindent 4 }}
     component: "{{ .Values.controller.name }}"
     {{- include "ingress-nginx.labels" . | nindent 4 }}
     app.kubernetes.io/component: controller
diff --git a/charts/nginx-ingress/templates/controller-service-webhook.yaml b/charts/nginx-ingress/templates/controller-service-webhook.yaml
index fdc10cf669..91db703833 100644
--- a/charts/nginx-ingress/templates/controller-service-webhook.yaml
+++ b/charts/nginx-ingress/templates/controller-service-webhook.yaml
@@ -8,6 +8,7 @@ metadata:
   labels:
     component: "{{ .Values.controller.name }}"
     {{- include "gitlab.standardLabels" . | nindent 4 }}
+    {{- include "gitlab.commonLabels" . | nindent 4 }}
     {{- include "ingress-nginx.labels" . | nindent 4 }}
     app.kubernetes.io/component: controller
   name: {{ include "ingress-nginx.controller.fullname" . }}-admission
diff --git a/charts/nginx-ingress/templates/controller-service.yaml b/charts/nginx-ingress/templates/controller-service.yaml
index dcefdf0411..40e8942e76 100644
--- a/charts/nginx-ingress/templates/controller-service.yaml
+++ b/charts/nginx-ingress/templates/controller-service.yaml
@@ -8,6 +8,7 @@ metadata:
   {{- end }}
   labels:
     {{- include "gitlab.standardLabels" . | nindent 4 }}
+    {{- include "gitlab.commonLabels" . | nindent 4 }}
     component: "{{ .Values.controller.name }}"
     {{- include "ingress-nginx.labels" . | nindent 4 }}
     app.kubernetes.io/component: controller
diff --git a/charts/nginx-ingress/templates/controller-serviceaccount.yaml b/charts/nginx-ingress/templates/controller-serviceaccount.yaml
index 9e70097d22..ac9bb5319e 100644
--- a/charts/nginx-ingress/templates/controller-serviceaccount.yaml
+++ b/charts/nginx-ingress/templates/controller-serviceaccount.yaml
@@ -4,6 +4,7 @@ kind: ServiceAccount
 metadata:
   labels:
     {{- include "gitlab.standardLabels" . | nindent 4 }}
+    {{- include "gitlab.commonLabels" . | nindent 4 }}
     component: "{{ .Values.controller.name }}"
     {{- include "ingress-nginx.labels" . | nindent 4 }}
     app.kubernetes.io/component: controller
diff --git a/charts/nginx-ingress/templates/controller-servicemonitor.yaml b/charts/nginx-ingress/templates/controller-servicemonitor.yaml
index 5fac5d4dc6..5bc0aa78f5 100644
--- a/charts/nginx-ingress/templates/controller-servicemonitor.yaml
+++ b/charts/nginx-ingress/templates/controller-servicemonitor.yaml
@@ -8,6 +8,7 @@ metadata:
 {{- end }}
   labels:
     {{- include "gitlab.standardLabels" . | nindent 4 }}
+    {{- include "gitlab.commonLabels" . | nindent 4 }}
     component: "{{ .Values.controller.name }}"
     {{- include "ingress-nginx.labels" . | nindent 4 }}
     app.kubernetes.io/component: controller
diff --git a/charts/nginx-ingress/templates/default-backend-deployment.yaml b/charts/nginx-ingress/templates/default-backend-deployment.yaml
index 083837a19d..c671609fc6 100644
--- a/charts/nginx-ingress/templates/default-backend-deployment.yaml
+++ b/charts/nginx-ingress/templates/default-backend-deployment.yaml
@@ -4,6 +4,7 @@ kind: Deployment
 metadata:
   labels:
     {{- include "gitlab.standardLabels" . | nindent 4 }}
+    {{- include "gitlab.commonLabels" . | nindent 4 }}
     component: "{{ .Values.defaultBackend.name }}"
     {{- include "ingress-nginx.labels" . | nindent 4 }}
     app.kubernetes.io/component: default-backend
diff --git a/charts/nginx-ingress/templates/default-backend-hpa.yaml b/charts/nginx-ingress/templates/default-backend-hpa.yaml
index e9e12e7d59..c024b8e51e 100644
--- a/charts/nginx-ingress/templates/default-backend-hpa.yaml
+++ b/charts/nginx-ingress/templates/default-backend-hpa.yaml
@@ -4,6 +4,7 @@ kind: HorizontalPodAutoscaler
 metadata:
   labels:
     {{- include "gitlab.standardLabels" . | nindent 4 }}
+    {{- include "gitlab.commonLabels" . | nindent 4 }}
     component: "{{ .Values.defaultBackend.name }}"
     {{- include "ingress-nginx.labels" . | nindent 4 }}
     app.kubernetes.io/component: default-backend
diff --git a/charts/nginx-ingress/templates/default-backend-poddisruptionbudget.yaml b/charts/nginx-ingress/templates/default-backend-poddisruptionbudget.yaml
index 7aebefb93c..1a9b82cf18 100644
--- a/charts/nginx-ingress/templates/default-backend-poddisruptionbudget.yaml
+++ b/charts/nginx-ingress/templates/default-backend-poddisruptionbudget.yaml
@@ -4,6 +4,7 @@ kind: PodDisruptionBudget
 metadata:
   labels:
     {{- include "gitlab.standardLabels" . | nindent 4 }}
+    {{- include "gitlab.commonLabels" . | nindent 4 }}
     component: "{{ .Values.defaultBackend.name }}"
     {{- include "ingress-nginx.labels" . | nindent 4 }}
     app.kubernetes.io/component: default-backend
diff --git a/charts/nginx-ingress/templates/default-backend-psp.yaml b/charts/nginx-ingress/templates/default-backend-psp.yaml
index d8830714ff..624bbbc7a6 100644
--- a/charts/nginx-ingress/templates/default-backend-psp.yaml
+++ b/charts/nginx-ingress/templates/default-backend-psp.yaml
@@ -5,6 +5,7 @@ metadata:
   name: {{ include "ingress-nginx.fullname" . }}-backend
   labels:
     {{- include "gitlab.standardLabels" . | nindent 4 }}
+    {{- include "gitlab.commonLabels" . | nindent 4 }}
     component: "{{ .Values.defaultBackend.name }}"
     {{- include "ingress-nginx.labels" . | nindent 4 }}
     app.kubernetes.io/component: default-backend
diff --git a/charts/nginx-ingress/templates/default-backend-role.yaml b/charts/nginx-ingress/templates/default-backend-role.yaml
index 03d46a0f34..030752c218 100644
--- a/charts/nginx-ingress/templates/default-backend-role.yaml
+++ b/charts/nginx-ingress/templates/default-backend-role.yaml
@@ -4,6 +4,7 @@ kind: Role
 metadata:
   labels:
     {{- include "gitlab.standardLabels" . | nindent 4 }}
+    {{- include "gitlab.commonLabels" . | nindent 4 }}
     component: "{{ .Values.defaultBackend.name }}"
     {{- include "ingress-nginx.labels" . | nindent 4 }}
     app.kubernetes.io/component: default-backend
diff --git a/charts/nginx-ingress/templates/default-backend-rolebinding.yaml b/charts/nginx-ingress/templates/default-backend-rolebinding.yaml
index d7291574e3..66ab7e6f1b 100644
--- a/charts/nginx-ingress/templates/default-backend-rolebinding.yaml
+++ b/charts/nginx-ingress/templates/default-backend-rolebinding.yaml
@@ -4,6 +4,7 @@ kind: RoleBinding
 metadata:
   labels:
     {{- include "gitlab.standardLabels" . | nindent 4 }}
+    {{- include "gitlab.commonLabels" . | nindent 4 }}
     component: "{{ .Values.defaultBackend.name }}"
     {{- include "ingress-nginx.labels" . | nindent 4 }}
     app.kubernetes.io/component: default-backend
diff --git a/charts/nginx-ingress/templates/default-backend-service.yaml b/charts/nginx-ingress/templates/default-backend-service.yaml
index db80d28b50..6473012f41 100644
--- a/charts/nginx-ingress/templates/default-backend-service.yaml
+++ b/charts/nginx-ingress/templates/default-backend-service.yaml
@@ -7,6 +7,7 @@ metadata:
 {{- end }}
   labels:
     {{- include "gitlab.standardLabels" . | nindent 4 }}
+    {{- include "gitlab.commonLabels" . | nindent 4 }}
     component: "{{ .Values.defaultBackend.name }}"
     {{- include "ingress-nginx.labels" . | nindent 4 }}
     app.kubernetes.io/component: default-backend
diff --git a/charts/nginx-ingress/templates/default-backend-serviceaccount.yaml b/charts/nginx-ingress/templates/default-backend-serviceaccount.yaml
index 165d0d2f58..02ed2c1aa5 100644
--- a/charts/nginx-ingress/templates/default-backend-serviceaccount.yaml
+++ b/charts/nginx-ingress/templates/default-backend-serviceaccount.yaml
@@ -4,6 +4,7 @@ kind: ServiceAccount
 metadata:
   labels:
     {{- include "gitlab.standardLabels" . | nindent 4 }}
+    {{- include "gitlab.commonLabels" . | nindent 4 }}
     component: "{{ .Values.controller.name }}"
     {{- include "ingress-nginx.labels" . | nindent 4 }}
     app.kubernetes.io/component: default-backend
diff --git a/charts/nginx-ingress/values.yaml b/charts/nginx-ingress/values.yaml
index 718de2dfd8..cdfa4f7584 100644
--- a/charts/nginx-ingress/values.yaml
+++ b/charts/nginx-ingress/values.yaml
@@ -730,3 +730,6 @@ udp: {}
 # Ref: https://github.com/kubernetes/contrib/tree/master/ingress/controllers/nginx/examples/tcp
 ##
 tcpExternalConfig: ""
+
+common:
+  labels: {}
\ No newline at end of file
diff --git a/doc/charts/gitlab/gitlab-exporter/index.md b/doc/charts/gitlab/gitlab-exporter/index.md
index 722aa524e0..4b2c5d8309 100644
--- a/doc/charts/gitlab/gitlab-exporter/index.md
+++ b/doc/charts/gitlab/gitlab-exporter/index.md
@@ -31,6 +31,7 @@ to the `helm install` command using the `--set` flags.
 | Parameter                        | Default               | Description                                    |
 | -------------------------------- | --------------------- | ---------------------------------------------- |
 | `annotations`                    |                       | Pod annotations                                |
+| `common.labels`                  | `{}`                  | Supplemental labels that are applied to all objects created by this chart.  |
 | `podLabels`                      |                       | Supplemental Pod labels. Will not be used for selectors. |
 | `common.labels`                  |                       | Supplemental labels that are applied to all objects created by this chart. |
 | `deployment.strategy`            | `{}`                  | Allows one to configure the update strategy utilized by the deployment |
diff --git a/doc/charts/gitlab/gitlab-grafana/index.md b/doc/charts/gitlab/gitlab-grafana/index.md
index b847d2a48a..6051a536c8 100644
--- a/doc/charts/gitlab/gitlab-grafana/index.md
+++ b/doc/charts/gitlab/gitlab-grafana/index.md
@@ -52,6 +52,7 @@ kubectl get secret gitlab-grafana-initial-password -ojsonpath='{.data.password}'
 
 | Parameter             | Default | Description                                                          |
 |-----------------------|---------|----------------------------------------------------------------------|
+| `common.labels`       | `{}`    | Supplemental labels that are applied to all objects created by this chart.  |
 | `ingress.tls`         | `{}`    | Hash of Ingress TLS settings if GitLab cert manager is not installed |
 | `ingress.annotations` | `{}`    | Additional annotations to add to Grafana Ingress resource            |
 
diff --git a/doc/charts/gitlab/kas/index.md b/doc/charts/gitlab/kas/index.md
index 490a8b5ee7..45a9cbaa2b 100644
--- a/doc/charts/gitlab/kas/index.md
+++ b/doc/charts/gitlab/kas/index.md
@@ -40,6 +40,7 @@ the `helm install` command using the `--set` flags.
 | Parameter                   | Default        | Description                      |
 | --------------------------- | -------------- | ---------------------------------|
 | `annotations`               | `{}`           | Pod annotations                  |
+| `common.labels`             | `{}`           | Supplemental labels that are applied to all objects created by this chart.  |
 | `extraContainers`           |                | List of extra containers to include      |
 | `image.repository`          | `registry.gitlab.com/gitlab-org/cluster-integration/gitlab-agent/kas` | image repository |
 | `image.tag`                 | `v13.7.0`      | Image tag                        |
diff --git a/doc/charts/gitlab/task-runner/index.md b/doc/charts/gitlab/task-runner/index.md
index dc78a21da1..d8abc8aa2e 100644
--- a/doc/charts/gitlab/task-runner/index.md
+++ b/doc/charts/gitlab/task-runner/index.md
@@ -52,7 +52,8 @@ gitlab:
 
 | Parameter                                   | Description                                  | Default                      |
 |---------------------------------------------|----------------------------------------------|------------------------------|
-| `annotations`                               | Annotations to add to the Task Runner Pods and Jobs | {}                      |
+| `annotations`                               | Annotations to add to the Task Runner Pods and Jobs | `{}`                      |
+| `common.labels`                             | Supplemental labels that are applied to all objects created by this chart.  | `{}` |
 | `antiAffinityLabels.matchLabels`            | Labels for setting anti-affinity options     |                              |
 | `backups.cron.concurrencyPolicy`            | Kubernetes Job concurrency policy            | `Replace`                    |
 | `backups.cron.enabled`                      | Backup CronJob enabled flag                  | false                        |
diff --git a/doc/charts/shared-secrets.md b/doc/charts/shared-secrets.md
index b3e863aee0..bf64f502d3 100644
--- a/doc/charts/shared-secrets.md
+++ b/doc/charts/shared-secrets.md
@@ -26,6 +26,7 @@ the `helm install` command using the `--set` flag:
 | -------------------------- | ------------------- | ----------------------------------- |
 | `enabled`                  | `true`              | [See Below](#disable-functionality) |
 | `env`                      | `production`        | Rails environment                   |
+| `common.labels`            | `{}`                | Supplemental labels that are applied to all objects created by this chart.  |
 | `podLabels`                |                     | Supplemental Pod labels. Will not be used for selectors. |
 | `annotations`              |                     | Supplemental Pod annotations.       |
 | `image.pullPolicy`         | `Always`            | Gitaly image pull policy            |
diff --git a/templates/application.yaml b/templates/application.yaml
index 0269c9f400..b0d18de216 100644
--- a/templates/application.yaml
+++ b/templates/application.yaml
@@ -10,6 +10,7 @@ metadata:
     marketplace.cloud.google.com/deploy-info: '{partner_id: "gitlab-public", product_id: "gitlab", partner_name: "GitLab"}'
   labels:
     {{- include "gitlab.standardLabels" . | nindent 4 }}
+    {{- include "gitlab.commonLabels" . | nindent 4 }}
 spec:
   descriptor:
     type: GitLab
diff --git a/templates/chart-info.yaml b/templates/chart-info.yaml
index cf82ab0aea..835e1a500e 100644
--- a/templates/chart-info.yaml
+++ b/templates/chart-info.yaml
@@ -5,6 +5,7 @@ metadata:
   namespace: {{ $.Release.Namespace }}
   labels:
     {{- include "gitlab.standardLabels" . | nindent 4 }}
+    {{- include "gitlab.commonLabels" . | nindent 4 }}
 data:
   gitlabVersion: "{{ coalesce .Values.global.gitlabVersion .Chart.AppVersion }}"
   gitlabChartVersion: "{{ .Chart.Version }}"
diff --git a/templates/initdb-configmap.yaml b/templates/initdb-configmap.yaml
index 5e0c401cc2..9c13d5b0f6 100644
--- a/templates/initdb-configmap.yaml
+++ b/templates/initdb-configmap.yaml
@@ -6,6 +6,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "gitlab.standardLabels" . | nindent 4 }}
+    {{- include "gitlab.commonLabels" . | nindent 4 }}
 data:
   init_revision.sh: |
     {{- $initRevision :=  index .Values.postgresql.master.podAnnotations "postgresql.gitlab/init-revision" }}
diff --git a/templates/shared-secrets/_generate_secrets.sh.tpl b/templates/shared-secrets/_generate_secrets.sh.tpl
index e783e680a1..e3942f564f 100644
--- a/templates/shared-secrets/_generate_secrets.sh.tpl
+++ b/templates/shared-secrets/_generate_secrets.sh.tpl
@@ -28,7 +28,7 @@ function label_secret(){
 {{ end }}
   kubectl --namespace=$namespace label \
     --overwrite \
-    secret $secret_name {{ include "gitlab.standardLabels" . | replace ": " "=" | replace "\r\n" " " | replace "\n" " " }}
+    secret $secret_name {{ include "gitlab.standardLabels" . | replace ": " "=" | replace "\r\n" " " | replace "\n" " " }} {{ include "gitlab.commonLabels" . | replace ": " "=" | replace "\r\n" " " | replace "\n" " " }}
 }
 
 # Args: secretname, args
diff --git a/templates/shared-secrets/_jobspec.yaml b/templates/shared-secrets/_jobspec.yaml
index 78232139c6..f7cd79c46b 100644
--- a/templates/shared-secrets/_jobspec.yaml
+++ b/templates/shared-secrets/_jobspec.yaml
@@ -6,6 +6,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "gitlab.standardLabels" . | nindent 4 }}
+    {{- include "gitlab.commonLabels" . | nindent 4 }}
 {{- if and $sharedSecretValues.enabled (not .Values.global.operator.enabled) }}
   annotations:
     "helm.sh/hook": pre-install,pre-upgrade
@@ -17,6 +18,8 @@ spec:
       labels:
         app: {{ template "name" . }}
         release: {{ .Release.Name }}
+        {{- include "gitlab.standardLabels" . | nindent 8 }}
+        {{- include "gitlab.commonLabels" . | nindent 8 }}
         {{- include "gitlab.podLabels" . | nindent 8 }}
       annotations:
       {{- range $key, $value := $sharedSecretValues.annotations }}
diff --git a/templates/shared-secrets/_rbac-serviceaccount.yaml b/templates/shared-secrets/_rbac-serviceaccount.yaml
index 2906dd691f..c5f48ab7bd 100644
--- a/templates/shared-secrets/_rbac-serviceaccount.yaml
+++ b/templates/shared-secrets/_rbac-serviceaccount.yaml
@@ -7,6 +7,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "gitlab.standardLabels" . | nindent 4 }}
+    {{- include "gitlab.commonLabels" . | nindent 4 }}
 {{- if and $sharedSecretValues.enabled (not .Values.global.operator.enabled) }}
   annotations:
     "helm.sh/hook": pre-install,pre-upgrade
diff --git a/templates/shared-secrets/_self-signed-cert-job.yml b/templates/shared-secrets/_self-signed-cert-job.yml
index cb3f83d6ac..c36b8ac7f7 100644
--- a/templates/shared-secrets/_self-signed-cert-job.yml
+++ b/templates/shared-secrets/_self-signed-cert-job.yml
@@ -7,6 +7,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "gitlab.standardLabels" . | nindent 4 }}
+    {{- include "gitlab.commonLabels" . | nindent 4 }}
 {{- if not .Values.global.operator.enabled }}
   annotations:
     "helm.sh/hook": pre-install,pre-upgrade
@@ -77,7 +78,7 @@ spec:
             secret $certname  $(echo '{{ include "gitlab.application.labels" . | replace ": " "=" | replace "\r\n" " " | replace "\n" " " }}' | sed -E 's/=[^ ]*/-/g')
 {{- end }}
           kubectl --namespace=$namespace label --overwrite \
-            secret $certname {{ include "gitlab.standardLabels" . | replace ": " "=" | replace "\r\n" " " | replace "\n" " " }}
+            secret $certname {{ include "gitlab.standardLabels" . | replace ": " "=" | replace "\r\n" " " | replace "\n" " " }} {{ include "gitlab.commonLabels" . | replace ": " "=" | replace "\r\n" " " | replace "\n" " " }}
           # create CA certificate secret
           kubectl create secret generic ${certname}-ca \
             --from-file=cfssl_ca=/output/ca.pem || true
@@ -86,7 +87,7 @@ spec:
             secret ${certname}-ca  $(echo '{{ include "gitlab.application.labels" . | replace ": " "=" | replace "\r\n" " " | replace "\n" " " }}' | sed -E 's/=[^ ]*/-/g')
 {{- end }}
           kubectl --namespace=$namespace label --overwrite \
-            secret ${certname}-ca {{ include "gitlab.standardLabels" . | replace ": " "=" | replace "\r\n" " " | replace "\n" " " }}
+            secret ${certname}-ca {{ include "gitlab.standardLabels" . | replace ": " "=" | replace "\r\n" " " | replace "\n" " " }} {{ include "gitlab.commonLabels" . | replace ": " "=" | replace "\r\n" " " | replace "\n" " " }}
           # create certificate chain for GitLab Runner
           cat /output/ca.pem /output/wildcard.pem > /tmp/{{ template "gitlab.gitlab.hostname" $ }}.crt
           kubectl create secret generic ${certname}-chain \
@@ -96,7 +97,7 @@ spec:
             secret ${certname}-chain  $(echo '{{ include "gitlab.application.labels" . | replace ": " "=" | replace "\r\n" " " | replace "\n" " " }}' | sed -E 's/=[^ ]*/-/g')
 {{- end }}
           kubectl --namespace=$namespace label --overwrite \
-            secret ${certname}-chain {{ include "gitlab.standardLabels" . | replace ": " "=" | replace "\r\n" " " | replace "\n" " " }}
+            secret ${certname}-chain {{ include "gitlab.standardLabels" . | replace ": " "=" | replace "\r\n" " " | replace "\n" " " }} {{ include "gitlab.commonLabels" . | replace ": " "=" | replace "\r\n" " " | replace "\n" " " }}
         volumeMounts:
         - name: certs-path
           mountPath: /output
diff --git a/templates/shared-secrets/configmap.yaml b/templates/shared-secrets/configmap.yaml
index 28871a083f..6b0769cb91 100644
--- a/templates/shared-secrets/configmap.yaml
+++ b/templates/shared-secrets/configmap.yaml
@@ -7,6 +7,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "gitlab.standardLabels" . | nindent 4 }}
+    {{- include "gitlab.commonLabels" . | nindent 4 }}
 {{- if not .Values.global.operator.enabled }}
   annotations:
     "helm.sh/hook": pre-install,pre-upgrade
@@ -25,6 +26,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "gitlab.standardLabels" . | nindent 4 }}
+    {{- include "gitlab.commonLabels" . | nindent 4 }}
 data:
   template: |-
     {{- include (print $.Template.BasePath "/shared-secrets/_jobspec.yaml") . | nindent 4 }}
diff --git a/templates/upgrade_check_hook.yaml b/templates/upgrade_check_hook.yaml
index 0e2cbc38a6..73be499d1d 100644
--- a/templates/upgrade_check_hook.yaml
+++ b/templates/upgrade_check_hook.yaml
@@ -6,6 +6,7 @@ metadata:
   namespace: {{ $.Release.Namespace }}
   labels:
     {{- include "gitlab.standardLabels" . | nindent 4 }}
+    {{- include "gitlab.commonLabels" . | nindent 4 }}
   annotations:
     "helm.sh/hook": pre-upgrade
     "helm.sh/hook-weight": "-11"
@@ -21,6 +22,7 @@ metadata:
   namespace: {{ .Release.Namespace }}
   labels:
     {{- include "gitlab.standardLabels" . | nindent 4 }}
+    {{- include "gitlab.commonLabels" . | nindent 4 }}
   annotations:
     "helm.sh/hook": pre-upgrade
     "helm.sh/hook-weight": "-10"
diff --git a/values.yaml b/values.yaml
index d61f78a749..7e8b7b07ab 100644
--- a/values.yaml
+++ b/values.yaml
@@ -1056,3 +1056,7 @@ gitlab:
 #     enabled: false
 ## https://docs.gitlab.com/charts/charts/gitlab/gitlab-grafana
 #   gitlab-grafana:
+
+# Common Labels for the main application resources
+common:
+  labels: {}
\ No newline at end of file
-- 
GitLab


From 4536a252b5244901eeec4e9edadd53aa3bedff1d Mon Sep 17 00:00:00 2001
From: Silvester <swainaina@gitlab.com>
Date: Thu, 10 Jun 2021 19:21:59 +0300
Subject: [PATCH 2/4] Remove common.labels in global charts

---
 charts/nginx-ingress/templates/_helpers.tpl     | 1 -
 doc/charts/shared-secrets.md                    | 1 -
 templates/_application.tpl                      | 2 +-
 templates/shared-secrets/_rbac-role.yaml        | 1 +
 templates/shared-secrets/_rbac-rolebinding.yaml | 1 +
 values.yaml                                     | 4 ----
 6 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/charts/nginx-ingress/templates/_helpers.tpl b/charts/nginx-ingress/templates/_helpers.tpl
index ec9a0dbe7b..bdfac406ad 100644
--- a/charts/nginx-ingress/templates/_helpers.tpl
+++ b/charts/nginx-ingress/templates/_helpers.tpl
@@ -66,7 +66,6 @@ Common labels
 */}}
 {{- define "ingress-nginx.labels" -}}
 helm.sh/chart: {{ include "ingress-nginx.chart" . }}
-{{ include "ingress-nginx.selectorLabels" . }}
 {{- if .Chart.AppVersion }}
 app.kubernetes.io/version: {{ .Chart.AppVersion | quote }}
 {{- end }}
diff --git a/doc/charts/shared-secrets.md b/doc/charts/shared-secrets.md
index bf64f502d3..b3e863aee0 100644
--- a/doc/charts/shared-secrets.md
+++ b/doc/charts/shared-secrets.md
@@ -26,7 +26,6 @@ the `helm install` command using the `--set` flag:
 | -------------------------- | ------------------- | ----------------------------------- |
 | `enabled`                  | `true`              | [See Below](#disable-functionality) |
 | `env`                      | `production`        | Rails environment                   |
-| `common.labels`            | `{}`                | Supplemental labels that are applied to all objects created by this chart.  |
 | `podLabels`                |                     | Supplemental Pod labels. Will not be used for selectors. |
 | `annotations`              |                     | Supplemental Pod annotations.       |
 | `image.pullPolicy`         | `Always`            | Gitaly image pull policy            |
diff --git a/templates/_application.tpl b/templates/_application.tpl
index 33181fd40a..9528235c76 100644
--- a/templates/_application.tpl
+++ b/templates/_application.tpl
@@ -25,7 +25,7 @@ heritage: {{ .Release.Service }}
 {{- end -}}
 
 {{- define "gitlab.commonLabels" -}}
-{{- $commonLabels := (merge .Values.common.labels .Values.global.common.labels) }}
+{{- $commonLabels := merge (pluck "labels" (default (dict) .Values.common) | first) .Values.global.common.labels}}
 {{- if $commonLabels }}
 {{-   range $key, $value := $commonLabels }}
 {{ $key }}: {{ $value }}
diff --git a/templates/shared-secrets/_rbac-role.yaml b/templates/shared-secrets/_rbac-role.yaml
index 9e6faad487..08e140dcc5 100644
--- a/templates/shared-secrets/_rbac-role.yaml
+++ b/templates/shared-secrets/_rbac-role.yaml
@@ -9,6 +9,7 @@ metadata:
     chart: shared-secrets-{{ .Chart.Version | replace "+" "_" }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
+    {{- include "gitlab.commonLabels" . | nindent 4 }}
 {{- if and $sharedSecretValues.enabled (not .Values.global.operator.enabled) }}
   annotations:
     "helm.sh/hook": pre-install,pre-upgrade
diff --git a/templates/shared-secrets/_rbac-rolebinding.yaml b/templates/shared-secrets/_rbac-rolebinding.yaml
index 2fef4444e5..cfae6c9f35 100644
--- a/templates/shared-secrets/_rbac-rolebinding.yaml
+++ b/templates/shared-secrets/_rbac-rolebinding.yaml
@@ -9,6 +9,7 @@ metadata:
     chart: shared-secrets-{{ .Chart.Version | replace "+" "_" }}
     release: {{ .Release.Name }}
     heritage: {{ .Release.Service }}
+    {{- include "gitlab.commonLabels" . | nindent 4 }}
 {{- if and $sharedSecretValues.enabled (not .Values.global.operator.enabled) }}
   annotations:
     "helm.sh/hook": pre-install,pre-upgrade
diff --git a/values.yaml b/values.yaml
index 7e8b7b07ab..d61f78a749 100644
--- a/values.yaml
+++ b/values.yaml
@@ -1056,7 +1056,3 @@ gitlab:
 #     enabled: false
 ## https://docs.gitlab.com/charts/charts/gitlab/gitlab-grafana
 #   gitlab-grafana:
-
-# Common Labels for the main application resources
-common:
-  labels: {}
\ No newline at end of file
-- 
GitLab


From bcdb196a46416689a8cbe664edbde4283d5c5466 Mon Sep 17 00:00:00 2001
From: Silvester <swainaina@gitlab.com>
Date: Mon, 14 Jun 2021 09:26:42 +0300
Subject: [PATCH 3/4] Update fork.md

---
 doc/charts/nginx/fork.md | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/charts/nginx/fork.md b/doc/charts/nginx/fork.md
index 820b50c05c..2a6539df31 100644
--- a/doc/charts/nginx/fork.md
+++ b/doc/charts/nginx/fork.md
@@ -21,3 +21,4 @@ The following adjustments were made to the NGINX fork:
   - `controller-deployment.yaml`: `.spec.template.spec.containers[0].args` uses `ingress-nginx.controller.ingress-class`
   - `role.yaml`: rule for editing leader ConfigMap uses `ingress-nginx.controller.ingress-class`
 - Replace `controller.service.loadBalancerIP` with `global.hosts.externalIP`
+- Added support to add common labels through `common.labels` configuration option
-- 
GitLab


From eac56c766bd31fe4be01a9a82e327f1721d2a79f Mon Sep 17 00:00:00 2001
From: Jason Plum <jplum@gitlab.com>
Date: Tue, 15 Jun 2021 18:02:46 +0000
Subject: [PATCH 4/4] Apply 1 suggestion(s) to 1 file(s)

---
 charts/certmanager-issuer/templates/_issuer.yaml | 1 -
 1 file changed, 1 deletion(-)

diff --git a/charts/certmanager-issuer/templates/_issuer.yaml b/charts/certmanager-issuer/templates/_issuer.yaml
index ac0b159c05..e24cfff0ea 100644
--- a/charts/certmanager-issuer/templates/_issuer.yaml
+++ b/charts/certmanager-issuer/templates/_issuer.yaml
@@ -5,7 +5,6 @@ metadata:
   name: {{ .Release.Name }}-issuer
   namespace: {{ $.Release.Namespace }}
   labels:
-  {{- include "gitlab.standardLabels" . | nindent 4 }}
     {{- include "gitlab.standardLabels" . | nindent 4 }}
     {{- include "gitlab.commonLabels" . | nindent 4 }}
 spec:
-- 
GitLab