From 90e483080606f1d93cc4f1520de7fc607efb0b2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Axel=20Garc=C3=ADa?= <agarcia@gitlab.com>
Date: Thu, 14 Oct 2021 18:06:48 -0300
Subject: [PATCH] Add one_trust_id config

---
 charts/gitlab/charts/webservice/values.yaml | 1 +
 charts/gitlab/templates/_gitlab.yaml.tpl    | 3 +++
 doc/charts/globals.md                       | 2 ++
 values.yaml                                 | 1 +
 4 files changed, 7 insertions(+)

diff --git a/charts/gitlab/charts/webservice/values.yaml b/charts/gitlab/charts/webservice/values.yaml
index c12414b90e..8eb9e38941 100644
--- a/charts/gitlab/charts/webservice/values.yaml
+++ b/charts/gitlab/charts/webservice/values.yaml
@@ -326,6 +326,7 @@ extra: {}
   # matomo_url: '_your_matomo_url'
   # matomo_site_id: '_your_matomo_site_id'
   # matomo_disable_cookies: false
+  # one_trust_id: '_your_one_trust_id'
 rack_attack:
   git_basic_auth:
     enabled: false
diff --git a/charts/gitlab/templates/_gitlab.yaml.tpl b/charts/gitlab/templates/_gitlab.yaml.tpl
index c0093d0b20..7bdce3ccbe 100644
--- a/charts/gitlab/templates/_gitlab.yaml.tpl
+++ b/charts/gitlab/templates/_gitlab.yaml.tpl
@@ -66,6 +66,9 @@ extra:
   {{- if .extra.matomoDisableCookies }}
   matomo_disable_cookies: {{ eq true .extra.matomoDisableCookies }}
   {{- end }}
+  {{ if .extra.oneTrustId }}
+  one_trust_id: {{ .extra.oneTrustId | quote }}
+  {{- end }}
 {{- end -}}
 
 {{- define "gitlab.appConfig.rackAttack" -}}
diff --git a/doc/charts/globals.md b/doc/charts/globals.md
index a51fa6a258..6ddaafa5e9 100644
--- a/doc/charts/globals.md
+++ b/doc/charts/globals.md
@@ -800,6 +800,7 @@ global:
       matomoUrl:
       matomoSiteId:
       matomoDisableCookies:
+      oneTrustId:
     object_store:
       enabled: false
       proxy_download: true
@@ -977,6 +978,7 @@ under the `extra` key below `appConfig`:
 | `extra.matomoSiteId`       | String | (empty) | Matomo Site ID. |
 | `extra.matomoUrl`          | String | (empty) | Matomo URL. |
 | `extra.matomoDisableCookies`| Boolean | (empty) | Disable Matomo cookies (corresponds to `disableCookies` in the Matomo script) |
+| `extra.oneTrustId`         | String | (empty) | OneTrust ID. |
 
 ### Consolidated object storage
 
diff --git a/values.yaml b/values.yaml
index f53b8a6524..0d94201c73 100644
--- a/values.yaml
+++ b/values.yaml
@@ -277,6 +277,7 @@ global:
       matomoUrl:
       matomoSiteId:
       matomoDisableCookies:
+      oneTrustId:
 
     ## https://docs.gitlab.com/charts/charts/globals#lfs-artifacts-uploads-packages-external-mr-diffs-and-dependency-proxy
     object_store:
-- 
GitLab