helm: remove duplicate client_max_body_size (#8497)

* helm: remove duplicate client_max_body_size 7960 added this in two places in the nginx config. The top-level config is not necessary and is invalid. Signed-off-by: Dimitar Dimitrov <[email protected]> * Update CHANGELOG.md Signed-off-by: Dimitar Dimitrov <[email protected]> * Update operations/helm/charts/mimir-distributed/CHANGELOG.md Co-authored-by: George Krajcsovits <[email protected]> --------- Signed-off-by: Dimitar Dimitrov <[email protected]> Co-authored-by: George Krajcsovits <[email protected]>
grafana · Jun 24, 2024 · 1a5af4a · 1a5af4a
1 parent 0b95a7e
commit 1a5af4a
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 5 deletions.
diff --git a/operations/helm/charts/mimir-distributed/CHANGELOG.md b/operations/helm/charts/mimir-distributed/CHANGELOG.md
@@ -52,7 +52,7 @@ Entries should include a reference to the Pull Request that introduced the chang
 * [ENHANCEMENT] The new values `global.extraVolumes` and `global.extraVolumeMounts` adds volumes and volumeMounts to all pods directly managed by mimir-distributed. #7922
 * [ENHANCEMENT] Smoke-test: Parameterized `backoffLimit` for smoke tests in Helm chart to accommodate slower startup environments like k3d. #8025
 * [ENHANCEMENT] Add a volumeClaimTemplates section to the `chunks-cache`, `index-cache`, `metadata-cache`, and `results-cache` components. #8016
-* [ENHANCEMENT] Add 'gateway.gateway.config.clientMaxBodySize' to the `gateway` to allow setting the maximum allowed size of the client request body. #7960
+* [ENHANCEMENT] Add 'gateway.nginx.config.clientMaxBodySize' to the `gateway` to allow setting the maximum allowed size of the client request body. #7960 #8497
 * [ENHANCEMENT] Update rollout-operator to `v0.17.0`. #8399
 * [ENHANCEMENT] Omit rendering empty `subPath`, `args`, `env`, and `envFrom` in resource manifests. #7587
 * [BUGFIX] Helm: Allowed setting static NodePort for nginx gateway via `gateway.service.nodePort`. #6966

diff --git a/operations/helm/charts/mimir-distributed/values.yaml b/operations/helm/charts/mimir-distributed/values.yaml
@@ -3290,9 +3290,6 @@ gateway:
         error_log  /dev/stderr {{ .Values.gateway.nginx.config.errorLogLevel }};
         pid        /tmp/nginx.pid;
         worker_rlimit_nofile 8192;
-        {{- if .Values.gateway.nginx.config.clientMaxBodySize }}
-        client_max_body_size {{ .Values.gateway.nginx.config.clientMaxBodySize }};
-        {{- end }}
 
         events {
           worker_connections  4096;  ## Default: 1024

diff --git a/...s/gateway-nginx-values-generated/mimir-distributed/templates/gateway/nginx-configmap.yaml b/...s/gateway-nginx-values-generated/mimir-distributed/templates/gateway/nginx-configmap.yaml
@@ -16,7 +16,6 @@ data:
     error_log  /dev/stderr error;
     pid        /tmp/nginx.pid;
     worker_rlimit_nofile 8192;
-    client_max_body_size 540M;
     
     events {
       worker_connections  4096;  ## Default: 1024