From b0e92ed4908a0bead3d5318a8efb92d27e126f7c Mon Sep 17 00:00:00 2001
From: Mitchell Nielsen <mnielsen@gitlab.com>
Date: Wed, 3 Aug 2022 13:10:59 -0400
Subject: [PATCH] Override NGINX Controller image to v1.21.1

Overrides the NGINX Ingress Controller image to reference the v1.21.1
tag that is released by our fork in
https://gitlab.com/gitlab-org/charts/gitlab-ingress-nginx.
The digest was taken from the following job:
https://gitlab.com/gitlab-org/cloud-native/charts/gitlab-ingress-nginx/-/jobs/2736356091#L2049

This is intended as a temporary change until
https://gitlab.com/gitlab-org/distribution/team-tasks/-/issues/1090
is addressed, which will remove the in-chart NGINX chart in favor of
the true fork (to be ingested via `requirements.yaml`).

Note that the current in-chart NGINX chart expects v1.0.4 of the NGINX
Ingress Controller. While this change deviates from that version by two
minor versions, required functionality is in tact so far.

Closes https://gitlab.com/gitlab-org/charts/gitlab/-/issues/3403

Changelog: changed
---
 values.yaml | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/values.yaml b/values.yaml
index 990582e9a9..264c145751 100644
--- a/values.yaml
+++ b/values.yaml
@@ -787,6 +787,10 @@ nginx-ingress:
       server-tokens: "false"
     service:
       externalTrafficPolicy: "Local"
+    image:
+      repository: registry.gitlab.com/gitlab-org/cloud-native/charts/gitlab-ingress-nginx/controller
+      tag: v1.2.1
+      digest: sha256:ec5cded8516196f7f263919f632227fef1e346d5c1671ae6cfbe96f4223da775
     ingressClassByName: false
     ingressClassResource:
       name: '{{ include "ingress.class.name" $ }}'
-- 
GitLab