Merge branch 'main' into 'mimir-tenant-upgrade'

# Conflicts:
#   CHANGELOG.md

CHANGELOG.md

@@ -3,17 +3,19 @@
 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).
 
 ---
+<<<<<<< CHANGELOG.md
 ## [5.5.1-bb.6] 2025-02-26
-### Added
+### Changed
 
 - Added pre-upgrade job to remove MinIO Tenant Pool prior to upgrade
+- Set `.Values.nginx.enabled` to `false` as this is deprecated in favor of `gateway`
 
-## [5.5.1-bb.5] 2025-02-14
+## [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
@@ -50,13 +52,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
@@ -81,7 +83,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
 

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: