Merge branch 'main' into 227-plugins-init

runatlantis · Nov 5, 2023 · 8f779ee · 8f779ee
2 parents f3bb4af + 265d3f5
commit 8f779ee
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 8 deletions.
diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -27,7 +27,7 @@ jobs:
           version: v3.10.3 # renovate: datasource=github-releases depName=helm packageName=helm/helm
 
       - name: Run chart-releaser
-        uses: helm/chart-releaser-action@v1.5.0
+        uses: helm/chart-releaser-action@v1.6.0
         env:
           CR_TOKEN: "${{ secrets.GITHUB_TOKEN }}"
           CR_SKIP_EXISTING: true

diff --git a/charts/atlantis/Chart.yaml b/charts/atlantis/Chart.yaml
@@ -1,6 +1,6 @@
 apiVersion: v1
 # renovate datasource=docker depName=ghcr.io/runatlantis/atlantis
-appVersion: v0.25.0
+appVersion: v0.26.0
 description: A Helm chart for Atlantis https://www.runatlantis.io
 name: atlantis
 version: 4.16.0

diff --git a/charts/atlantis/templates/statefulset.yaml b/charts/atlantis/templates/statefulset.yaml
@@ -273,7 +273,7 @@ spec:
             value: /etc/tls/tls.key
           {{- end }}
           - name: ATLANTIS_DATA_DIR
-            value: /atlantis-data
+            value: {{ .Values.atlantisDataDirectory }}
           - name: ATLANTIS_REPO_ALLOWLIST
             value: {{ toYaml (coalesce .Values.orgWhitelist .Values.orgAllowlist) }}
           - name: ATLANTIS_PORT
@@ -477,7 +477,7 @@ spec:
           volumeMounts:
           {{- if or .Values.volumeClaim.enabled .Values.dataStorage  }}
           - name: atlantis-data
-            mountPath: /atlantis-data
+            mountPath: {{ .Values.atlantisDataDirectory }}
           {{- end }}
           {{- range $name, $_ := .Values.serviceAccountSecrets }}
           - name: {{ $name }}-volume

diff --git a/charts/atlantis/values.yaml b/charts/atlantis/values.yaml
@@ -321,6 +321,9 @@ resources: {}
   #   memory: 1Gi
   #   cpu: 100m
 
+## Path to the data directory for the volumeMount
+atlantisDataDirectory: /atlantis-data
+
 ## Embedded data volume & volumeMount (default working)
 volumeClaim:
   enabled: true
@@ -544,10 +547,10 @@ servicemonitor:
     externalSecret:
       # authentication based on an external secret
       enabled: false
-      name: atlantis-env
-      keys:
-        username: USERNAME
-        password: ATLANTIS_WEB_PASSWORD
+      # name: atlantis-env
+      # keys:
+      #   username: USERNAME
+      #   password: ATLANTIS_WEB_PASSWORD
 
 # Enable this if you're using Google Managed Prometheus
 podMonitor: