From 21d9da3a94f770c5b2e5bf51bad80799ece3aeb8 Mon Sep 17 00:00:00 2001
From: helm-charts-win-ci <jplum@gitlab.com>
Date: Mon, 16 Apr 2018 15:56:33 -0400
Subject: [PATCH] Set LANG for all ruby containers

Somehow, despite `https://gitlab.com/gitlab-org/build/CNG/merge_requests/63/diffs`
setting `ENV LANG=C.UTF-8` for the Ruby based containers used in this chart, that does not appear to be in effect for the running containers.

This change explicitly sets the `env:` items for `LANG: "C.UTF-8"` across all charts that make use of a Ruby container from the CNG registry.
- migrations
- shared-secrets
- unicorn
- sidekiq
---
 charts/gitlab/charts/migrations/templates/job.yaml     | 2 ++
 charts/gitlab/charts/shared-secrets/templates/job.yaml | 3 +++
 charts/gitlab/charts/sidekiq/templates/deployment.yaml | 4 ++++
 charts/gitlab/charts/unicorn/templates/deployment.yaml | 4 ++++
 4 files changed, 13 insertions(+)

diff --git a/charts/gitlab/charts/migrations/templates/job.yaml b/charts/gitlab/charts/migrations/templates/job.yaml
index f4106d1ec9..aba21ec991 100644
--- a/charts/gitlab/charts/migrations/templates/job.yaml
+++ b/charts/gitlab/charts/migrations/templates/job.yaml
@@ -41,6 +41,8 @@ spec:
             - /scripts/db-migrate
           imagePullPolicy: {{ .Values.image.pullPolicy }}
           env:
+            - name: LANG
+              value: "C.UTF-8"
             - name: GITLAB_SHARED_RUNNERS_REGISTRATION_TOKEN
               valueFrom:
                 secretKeyRef:
diff --git a/charts/gitlab/charts/shared-secrets/templates/job.yaml b/charts/gitlab/charts/shared-secrets/templates/job.yaml
index 2703e3f28c..5185bb1a68 100644
--- a/charts/gitlab/charts/shared-secrets/templates/job.yaml
+++ b/charts/gitlab/charts/shared-secrets/templates/job.yaml
@@ -24,6 +24,9 @@ spec:
           image: "{{ .Values.image.repository }}:{{ .Values.image.tag }}"
           command: ['/bin/bash', '/scripts/generate-secrets']
           imagePullPolicy: {{ .Values.image.pullPolicy }}
+          env:
+            - name: LANG
+              value: "C.UTF-8"
           volumeMounts:
             - name: scripts
               mountPath: /scripts
diff --git a/charts/gitlab/charts/sidekiq/templates/deployment.yaml b/charts/gitlab/charts/sidekiq/templates/deployment.yaml
index 9577fe25ed..27b8519128 100644
--- a/charts/gitlab/charts/sidekiq/templates/deployment.yaml
+++ b/charts/gitlab/charts/sidekiq/templates/deployment.yaml
@@ -76,6 +76,8 @@ spec:
           args:
             - /scripts/wait-for-deps
           env:
+            - name: LANG
+              value: "C.UTF-8"
             - name: GITALY_FEATURE_DEFAULT_ON
               value: "1"
             - name: CONFIG_TEMPLATE_DIRECTORY
@@ -98,6 +100,8 @@ spec:
           image: "{{ $image }}"
           imagePullPolicy: {{ $imagePullPolicy }}
           env:
+            - name: LANG
+              value: "C.UTF-8"
             - name: GITALY_FEATURE_DEFAULT_ON
               value: "1"
             - name: CONFIG_TEMPLATE_DIRECTORY
diff --git a/charts/gitlab/charts/unicorn/templates/deployment.yaml b/charts/gitlab/charts/unicorn/templates/deployment.yaml
index 6bc4ff5ac1..0eb92bfe43 100644
--- a/charts/gitlab/charts/unicorn/templates/deployment.yaml
+++ b/charts/gitlab/charts/unicorn/templates/deployment.yaml
@@ -41,6 +41,8 @@ spec:
           args:
             - /scripts/wait-for-deps
           env:
+            - name: LANG
+              value: "C.UTF-8"
             - name: GITALY_FEATURE_DEFAULT_ON
               value: "1"
             - name: CONFIG_TEMPLATE_DIRECTORY
@@ -65,6 +67,8 @@ spec:
             - containerPort: {{ .Values.service.workhorseInternalPort }}
               name: workhorse
           env:
+            - name: LANG
+              value: "C.UTF-8"
             - name: GITALY_FEATURE_DEFAULT_ON
               value: "1"
             - name: CONFIG_TEMPLATE_DIRECTORY
-- 
GitLab