[BUGFIX] Update nginx deployment to mount nginx.conf as file (#7150)

Signed-off-by: Hannes Blut (external expert on behalf of InfraGO) <[email protected]>
grafana · Jan 17, 2024 · f8708c0 · f8708c0
1 parent a56442d
commit f8708c0
Show file tree

Hide file tree

Showing 13 changed files with 26 additions and 13 deletions.
diff --git a/operations/helm/charts/mimir-distributed/templates/gateway/gateway-dep.yaml b/operations/helm/charts/mimir-distributed/templates/gateway/gateway-dep.yaml
@@ -88,7 +88,8 @@ spec:
             {{ toYaml .extraVolumeMounts | nindent 12 }}
             {{- end }}
             - name: nginx-config
-              mountPath: /etc/nginx
+              mountPath: /etc/nginx/nginx.conf
+              subPath: nginx.conf
             {{- if .nginx.basicAuth.enabled }}
             - name: auth
               mountPath: /etc/nginx/secrets

diff --git a/operations/helm/charts/mimir-distributed/templates/nginx/nginx-dep.yaml b/operations/helm/charts/mimir-distributed/templates/nginx/nginx-dep.yaml
@@ -81,7 +81,8 @@ spec:
             {{- toYaml .Values.nginx.containerSecurityContext | nindent 12 }}
           volumeMounts:
             - name: config
-              mountPath: /etc/nginx
+              mountPath: /etc/nginx/nginx.conf
+              subPath: nginx.conf
             {{- if .Values.nginx.basicAuth.enabled }}
             - name: auth
               mountPath: /etc/nginx/secrets

diff --git a/...tests/gateway-nginx-values-generated/mimir-distributed/templates/gateway/gateway-dep.yaml b/...tests/gateway-nginx-values-generated/mimir-distributed/templates/gateway/gateway-dep.yaml
@@ -50,7 +50,8 @@ spec:
           args:
           volumeMounts:
             - name: nginx-config
-              mountPath: /etc/nginx
+              mountPath: /etc/nginx/nginx.conf
+              subPath: nginx.conf
             - name: tmp
               mountPath: /tmp
             - name: docker-entrypoint-d-override

diff --git a/...ations/helm/tests/large-values-generated/mimir-distributed/templates/nginx/nginx-dep.yaml b/...ations/helm/tests/large-values-generated/mimir-distributed/templates/nginx/nginx-dep.yaml
@@ -67,7 +67,8 @@ spec:
             readOnlyRootFilesystem: true
           volumeMounts:
             - name: config
-              mountPath: /etc/nginx
+              mountPath: /etc/nginx/nginx.conf
+              subPath: nginx.conf
             - name: tmp
               mountPath: /tmp
             - name: docker-entrypoint-d-override

diff --git a/...lm/tests/metamonitoring-values-generated/mimir-distributed/templates/nginx/nginx-dep.yaml b/...lm/tests/metamonitoring-values-generated/mimir-distributed/templates/nginx/nginx-dep.yaml
@@ -67,7 +67,8 @@ spec:
             readOnlyRootFilesystem: true
           volumeMounts:
             - name: config
-              mountPath: /etc/nginx
+              mountPath: /etc/nginx/nginx.conf
+              subPath: nginx.conf
             - name: tmp
               mountPath: /tmp
             - name: docker-entrypoint-d-override

diff --git a/...lm/tests/scheduler-name-values-generated/mimir-distributed/templates/nginx/nginx-dep.yaml b/...lm/tests/scheduler-name-values-generated/mimir-distributed/templates/nginx/nginx-dep.yaml
@@ -67,7 +67,8 @@ spec:
             readOnlyRootFilesystem: true
           volumeMounts:
             - name: config
-              mountPath: /etc/nginx
+              mountPath: /etc/nginx/nginx.conf
+              subPath: nginx.conf
             - name: tmp
               mountPath: /tmp
             - name: docker-entrypoint-d-override

diff --git a/...ations/helm/tests/small-values-generated/mimir-distributed/templates/nginx/nginx-dep.yaml b/...ations/helm/tests/small-values-generated/mimir-distributed/templates/nginx/nginx-dep.yaml
@@ -67,7 +67,8 @@ spec:
             readOnlyRootFilesystem: true
           volumeMounts:
             - name: config
-              mountPath: /etc/nginx
+              mountPath: /etc/nginx/nginx.conf
+              subPath: nginx.conf
             - name: tmp
               mountPath: /tmp
             - name: docker-entrypoint-d-override

diff --git a/...helm/tests/test-ingress-values-generated/mimir-distributed/templates/nginx/nginx-dep.yaml b/...helm/tests/test-ingress-values-generated/mimir-distributed/templates/nginx/nginx-dep.yaml
@@ -67,7 +67,8 @@ spec:
             readOnlyRootFilesystem: true
           volumeMounts:
             - name: config
-              mountPath: /etc/nginx
+              mountPath: /etc/nginx/nginx.conf
+              subPath: nginx.conf
             - name: tmp
               mountPath: /tmp
             - name: docker-entrypoint-d-override

diff --git a/...tests/test-oss-k8s-1.25-values-generated/mimir-distributed/templates/nginx/nginx-dep.yaml b/...tests/test-oss-k8s-1.25-values-generated/mimir-distributed/templates/nginx/nginx-dep.yaml
@@ -66,7 +66,8 @@ spec:
             readOnlyRootFilesystem: true
           volumeMounts:
             - name: config
-              mountPath: /etc/nginx
+              mountPath: /etc/nginx/nginx.conf
+              subPath: nginx.conf
             - name: tmp
               mountPath: /tmp
             - name: docker-entrypoint-d-override

diff --git a/...t-oss-logical-multizone-values-generated/mimir-distributed/templates/nginx/nginx-dep.yaml b/...t-oss-logical-multizone-values-generated/mimir-distributed/templates/nginx/nginx-dep.yaml
@@ -67,7 +67,8 @@ spec:
             readOnlyRootFilesystem: true
           volumeMounts:
             - name: config
-              mountPath: /etc/nginx
+              mountPath: /etc/nginx/nginx.conf
+              subPath: nginx.conf
             - name: tmp
               mountPath: /tmp
             - name: docker-entrypoint-d-override

diff --git a/...ests/test-oss-multizone-values-generated/mimir-distributed/templates/nginx/nginx-dep.yaml b/...ests/test-oss-multizone-values-generated/mimir-distributed/templates/nginx/nginx-dep.yaml
@@ -67,7 +67,8 @@ spec:
             readOnlyRootFilesystem: true
           volumeMounts:
             - name: config
-              mountPath: /etc/nginx
+              mountPath: /etc/nginx/nginx.conf
+              subPath: nginx.conf
             - name: tmp
               mountPath: /tmp
             - name: docker-entrypoint-d-override

diff --git a/...ons/helm/tests/test-oss-values-generated/mimir-distributed/templates/nginx/nginx-dep.yaml b/...ons/helm/tests/test-oss-values-generated/mimir-distributed/templates/nginx/nginx-dep.yaml
@@ -70,7 +70,8 @@ spec:
             readOnlyRootFilesystem: true
           volumeMounts:
             - name: config
-              mountPath: /etc/nginx
+              mountPath: /etc/nginx/nginx.conf
+              subPath: nginx.conf
             - name: tmp
               mountPath: /tmp
             - name: docker-entrypoint-d-override

diff --git a/.../tests/test-vault-agent-values-generated/mimir-distributed/templates/nginx/nginx-dep.yaml b/.../tests/test-vault-agent-values-generated/mimir-distributed/templates/nginx/nginx-dep.yaml
@@ -67,7 +67,8 @@ spec:
             readOnlyRootFilesystem: true
           volumeMounts:
             - name: config
-              mountPath: /etc/nginx
+              mountPath: /etc/nginx/nginx.conf
+              subPath: nginx.conf
             - name: tmp
               mountPath: /tmp
             - name: docker-entrypoint-d-override