From 1068a628b46ef7e245ee003d7aa135430da58e2f Mon Sep 17 00:00:00 2001 From: Mike Zupan Date: Wed, 30 Oct 2019 02:50:53 -0600 Subject: [PATCH] [stable/atlantis] fix the mount collision between repos.yaml and atlantis.yaml (#18434) * stable/atlantis: fix mount collision when mounting configmap Fixes a mount collision if both `repoConfig` and `config` are set in the values.yaml Kubernetes mounts `config` which contains atlantis.yaml first then in the same dir (/etc/atlantis) mounts repos.yaml over it. So the server will not start since it's looking for `/etc/atlantis/atlantis.yaml` Signed-off-by: Mike Zupan * bump the chart version Signed-off-by: Mike Zupan --- stable/atlantis/Chart.yaml | 2 +- stable/atlantis/templates/statefulset.yaml | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/stable/atlantis/Chart.yaml b/stable/atlantis/Chart.yaml index 64df3220da..d472a762fe 100644 --- a/stable/atlantis/Chart.yaml +++ b/stable/atlantis/Chart.yaml @@ -2,7 +2,7 @@ apiVersion: v1 appVersion: "v0.8.2" description: A Helm chart for Atlantis https://www.runatlantis.io name: atlantis -version: 3.8.3 +version: 3.8.4 keywords: - terraform home: https://www.runatlantis.io diff --git a/stable/atlantis/templates/statefulset.yaml b/stable/atlantis/templates/statefulset.yaml index 9318955da1..0b877d846e 100644 --- a/stable/atlantis/templates/statefulset.yaml +++ b/stable/atlantis/templates/statefulset.yaml @@ -265,12 +265,14 @@ spec: {{- end }} {{- if .Values.repoConfig }} - name: repo-config - mountPath: /etc/atlantis + mountPath: /etc/atlantis/repos.yaml + subPath: repos.yaml readOnly: true {{- end }} {{- if .Values.config }} - name: config - mountPath: /etc/atlantis + mountPath: /etc/atlantis/atlantis.yaml + subPath: atlantis.yaml readOnly: true {{- end }} {{- if .Values.extraVolumeMounts }}