Merge branch 'main' into feat/add-atlantis-envs

runatlantis · Nov 15, 2023 · 76f497e · 76f497e
2 parents 1c2caa3 + 592bff7
commit 76f497e
Show file tree

Hide file tree

Showing 11 changed files with 2,562 additions and 145 deletions.
diff --git a/.github/workflows/lint-test.yaml b/.github/workflows/lint-test.yaml
@@ -11,7 +11,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -26,7 +26,7 @@ jobs:
           check-latest: true
 
       - name: Set up chart-testing
-        uses: helm/chart-testing-action@v2.4.0
+        uses: helm/chart-testing-action@v2.6.1
 
       - name: Run chart-testing (list-changed)
         id: list-changed
@@ -48,7 +48,7 @@ jobs:
 
       - name: Create kind cluster
         if: steps.list-changed.outputs.changed == 'true'
-        uses: helm/kind-action@v1.4.0
+        uses: helm/kind-action@v1.8.0
 
       - name: Run chart-testing (install)
         if: steps.list-changed.outputs.changed == 'true'

diff --git a/.github/workflows/linter.yaml b/.github/workflows/linter.yaml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout Code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
       - name: Lint Code Base

diff --git a/.github/workflows/release.yaml b/.github/workflows/release.yaml
@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
         with:
           fetch-depth: 0
 
@@ -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/.github/workflows/sync-readme.yaml b/.github/workflows/sync-readme.yaml
@@ -8,10 +8,10 @@ jobs:
   build:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - run: |
           cp -f README.md ${{ runner.temp }}/README.md
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
         with:
           ref: gh-pages
       - run: |

diff --git a/README.md b/README.md
diff --git a/charts/atlantis/Chart.yaml b/charts/atlantis/Chart.yaml
@@ -1,9 +1,9 @@
 apiVersion: v1
 # renovate datasource=docker depName=ghcr.io/runatlantis/atlantis
-appVersion: v0.24.4
+appVersion: v0.26.0
 description: A Helm chart for Atlantis https://www.runatlantis.io
 name: atlantis
-version: 4.14.2
+version: 4.17.2
 keywords:
   - terraform
 home: https://www.runatlantis.io

diff --git a/charts/atlantis/ci/ci-values.yaml b/charts/atlantis/ci/ci-values.yaml
@@ -12,7 +12,7 @@ ingress:
   ingressClassName: nginx
   host: atlantis.localdev.me
   path: /
-secondary_ingress:
+webhook_ingress:
   enabled: true
   ingressClassName: nginx
   host: atlantis-webook.localdev.me

diff --git a/charts/atlantis/templates/servicemonitor.yaml b/charts/atlantis/templates/servicemonitor.yaml
@@ -8,7 +8,7 @@ metadata:
   {{- with .Values.service.annotations }}
   annotations:
 {{ toYaml . | indent 4 }}
-  {{- end }}  
+  {{- end }}
 spec:
   selector:
     matchLabels:
@@ -19,7 +19,7 @@ spec:
   endpoints:
   - port: atlantis
     interval: {{ .Values.servicemonitor.interval }}
-    path: {{ .Values.servicemonitor.path | default "/metrics" }}
+    path: {{ .Values.servicemonitor.path }}
 {{- if .Values.servicemonitor.auth.basicAuth.enabled }}
     basicAuth:
       username:

diff --git a/charts/atlantis/templates/statefulset.yaml b/charts/atlantis/templates/statefulset.yaml
@@ -41,6 +41,7 @@ spec:
           ip: {{ .ip }}
       {{- end }}
       {{- end }}
+      hostNetwork: {{ .Values.hostNetwork }}
       serviceAccountName: {{ template "atlantis.serviceAccountName" . }}
       shareProcessNamespace: {{ .Values.statefulSet.shareProcessNamespace }}
       automountServiceAccountToken: {{ .Values.serviceAccount.mount }}
@@ -244,7 +245,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
@@ -442,7 +443,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