From 03ae424a274c7de491de4cb31ad2649c071db444 Mon Sep 17 00:00:00 2001 From: Jose Diaz-Gonzalez Date: Wed, 7 Feb 2024 00:01:57 -0500 Subject: [PATCH] fix: ensure map keys are unique --- .../templates/helm-config/ingress-nginx.yaml | 46 +++++++++---------- 1 file changed, 22 insertions(+), 24 deletions(-) diff --git a/plugins/scheduler-k3s/templates/helm-config/ingress-nginx.yaml b/plugins/scheduler-k3s/templates/helm-config/ingress-nginx.yaml index 0e317922e..8263f6d42 100644 --- a/plugins/scheduler-k3s/templates/helm-config/ingress-nginx.yaml +++ b/plugins/scheduler-k3s/templates/helm-config/ingress-nginx.yaml @@ -1,11 +1,10 @@ +--- controller: metrics: enabled: true config: - # Print access log to file instead of stdout - # Separating acces logs from the rest - access-log-path: "/var/log/nginx/access.log" - error-log-path: "/var/log/nginx/error.log" + access-log-path: /var/log/nginx/access.log + error-log-path: /var/log/nginx/error.log log-format-escape-json: "true" extraVolumeMounts: - name: data @@ -17,30 +16,29 @@ controller: - name: stream-accesslog image: busybox args: - - /bin/sh - - -c - - tail -n+1 -F /var/log/nginx/access.log + - /bin/sh + - -c + - tail -n+1 -F /var/log/nginx/access.log imagePullPolicy: Always resources: {} terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: - - mountPath: /var/log/nginx - name: data - extraContainers: + - mountPath: /var/log/nginx + name: data - name: stream-errorlog image: busybox args: - - /bin/sh - - -c - - tail -n+1 -F /var/log/nginx/error.log + - /bin/sh + - -c + - tail -n+1 -F /var/log/nginx/error.log imagePullPolicy: Always resources: {} terminationMessagePath: /dev/termination-log terminationMessagePolicy: File volumeMounts: - - mountPath: /var/log/nginx - name: data + - mountPath: /var/log/nginx + name: data allowSnippetAnnotations: true podAnnotations: prometheus.io/path: /metrics @@ -48,12 +46,12 @@ controller: prometheus.io/scheme: http prometheus.io/scrape: "true" tolerations: - - key: "CriticalAddonsOnly" - operator: "Exists" - - key: "node-role.kubernetes.io/control-plane" - operator: "Exists" - effect: "NoSchedule" - - key: "node-role.kubernetes.io/master" - operator: "Exists" - effect: "NoSchedule" - priorityClassName: "system-cluster-critical" + - key: CriticalAddonsOnly + operator: Exists + - key: node-role.kubernetes.io/control-plane + operator: Exists + effect: NoSchedule + - key: node-role.kubernetes.io/master + operator: Exists + effect: NoSchedule + priorityClassName: system-cluster-critical