From 6404b2181c2a53703e07793aa16b05e2fc0a3f11 Mon Sep 17 00:00:00 2001
From: Brian Jackson <bjackson@fullvisibility.com>
Date: Thu, 27 Feb 2025 17:44:10 +0000
Subject: [PATCH] Deprecate nginx for gateway

---
 CHANGELOG.md      | 15 ++++++++++-----
 README.md         |  2 +-
 chart/Chart.yaml  |  2 +-
 chart/values.yaml |  4 ++++
 4 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 6270ad3..934f12a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,12 +3,17 @@
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
 ---
-## [5.5.1-bb.5] 2025-02-14
+## [5.5.1-bb.6] - 2025-02-20
+### Changed
+
+- Set `.Values.nginx.enabled` to `false` as this is deprecated in favor of `gateway`
+
+## [5.5.1-bb.5] - 2025-02-14
 ### Changed
 
 - MinIO Tenant Pool from 4 to 1 server
 
-## [5.5.1-bb.4] 2025-01-31
+## [5.5.1-bb.4] - 2025-01-31
 ### Added
 
 - Added `app: minio` and `app.kubernetes.io/name: minio` labels to MinIO Tenant
@@ -45,13 +50,13 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 - Added Istio monitoring auth policy, auth policy template, sidecar, and service entry
 
 ## [5.5.0-bb.7] - 2024-12-11
-### Added 
+### Added
 
 - Network Policy for Grafana ingress
 - Changed the index pattern for network policies
 
 ## [5.5.0-bb.6] - 2024-12-11
-### Added 
+### Added
 
 - Added higher Mimir ingester limits to values.yaml
 - Added grpc and http ports to values.yaml instead of importing from upstream
@@ -76,7 +81,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 ### Changed
 
 - Modified chart.yaml details to accurately match upstream 5.5.0 tag
-- Updated mimir image to use Ironbank equivalent 
+- Updated mimir image to use Ironbank equivalent
 - Updated nginx image to use Ironbank equivalent
 - Updated memcached image to use Ironbank equivalent
 
diff --git a/README.md b/README.md
index 1688fae..b855641 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,7 @@
 <!-- Warning: Do not manually edit this file. See notes on gluon + helm-docs at the end of this file for more information. -->
 # mimir
 
-![Version: 5.5.1-bb.5](https://img.shields.io/badge/Version-5.5.1--bb.5-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.14.2](https://img.shields.io/badge/AppVersion-2.14.2-informational?style=flat-square) ![Maintenance Track: unknown](https://img.shields.io/badge/Maintenance_Track-unknown-red?style=flat-square)
+![Version: 5.5.1-bb.6](https://img.shields.io/badge/Version-5.5.1--bb.6-informational?style=flat-square) ![Type: application](https://img.shields.io/badge/Type-application-informational?style=flat-square) ![AppVersion: 2.14.2](https://img.shields.io/badge/AppVersion-2.14.2-informational?style=flat-square) ![Maintenance Track: unknown](https://img.shields.io/badge/Maintenance_Track-unknown-red?style=flat-square)
 
 Grafana Mimir
 
diff --git a/chart/Chart.yaml b/chart/Chart.yaml
index 25c2440..3a2aeae 100644
--- a/chart/Chart.yaml
+++ b/chart/Chart.yaml
@@ -2,7 +2,7 @@ apiVersion: v2
 name: mimir
 description: Grafana Mimir
 type: application
-version: 5.5.1-bb.5
+version: 5.5.1-bb.6
 appVersion: 2.14.2
 icon: https://raw.githubusercontent.com/grafana/grafana/main/public/img/grafana_icon.svg
 sources:
diff --git a/chart/values.yaml b/chart/values.yaml
index a903e22..748ae09 100644
--- a/chart/values.yaml
+++ b/chart/values.yaml
@@ -73,7 +73,10 @@ mimir-distributed:
   grafanaAgent:
     enabled: false
 
+# -- DEPRECATED: use the 'gateway' section instead. For a migration guide refer to
+# https://grafana.com/docs/helm-charts/mimir-distributed/latest/migration-guides/migrate-to-unified-proxy-deployment/
   nginx: 
+    enabled: false
     image:
       registry: registry1.dso.mil
       repository: ironbank/opensource/nginx/nginx
@@ -88,6 +91,7 @@ mimir-distributed:
   #     pullPolicy:
   
   gateway:
+    enabled: true
     enabledNonEnterprise: true
     nginx:
       image:
-- 
GitLab