Merge pull request #8176 from upodroid/bump-atlantis

bump atlantis and reconcile manual changes

Author: k8s-ci-robot

kubernetes/gke-utility/atlantis/atlantis.yaml

@@ -3,6 +3,12 @@ gh-org: kubernetes
 repo-allowlist: github.com/kubernetes/k8s.io
 allow-fork-prs: true
 atlantis-url: https://atlantis.k8s.io
-gh-team-allowlist: "sig-k8s-infra:*"
+gh-team-allowlist: "sig-k8s-infra-leads:*"
 disable-global-apply-lock: true
 autodiscover-mode: auto
+gh-allow-mergeable-bypass-apply: true
+hide-prev-plan-comments: true
+hide-unchanged-plan-comments: true
+checkout-strategy: merge
+emoji-reaction: eyes
+# default-tf-distribution: opentofu # uncomment when we start using opentofu

kubernetes/gke-utility/atlantis/kustomization.yaml

@@ -3,48 +3,55 @@ kind: Kustomization
 namespace: atlantis
 
 resources:
-- github.com/runatlantis/atlantis//kustomize
-- extras.yaml
-- httproute.yaml
+  - github.com/runatlantis/atlantis//kustomize
+  - extras.yaml
+  - httproute.yaml
 
 images:
- - name: ghcr.io/runatlantis/atlantis
-   newTag: v0.30.0
+  - name: ghcr.io/runatlantis/atlantis
+    newTag: v0.34.0
 
 configMapGenerator:
-- name: atlantis-config
-  files:
-    - atlantis.yaml
+  - name: atlantis-config
+    files:
+      - atlantis.yaml
 
 patchesStrategicMerge:
-- |-
-  apiVersion: apps/v1
-  kind: StatefulSet
-  metadata:
-    name: atlantis
-  spec:
-    template:
-      spec:
-        serviceAccountName: atlantis
-        containers:
-        - name: atlantis
-          env:
-            - name: ATLANTIS_CONFIG
-              value: /config/atlantis.yaml
-            - name: ATLANTIS_GH_TOKEN
-              valueFrom:
-                secretKeyRef:
-                  name: atlantis-vcs
-                  key: token
-            - name: ATLANTIS_GH_WEBHOOK_SECRET
-              valueFrom:
-                secretKeyRef:
-                  name: atlantis-vcs
-                  key: webhook
-          volumeMounts:
+  - |-
+    apiVersion: apps/v1
+    kind: StatefulSet
+    metadata:
+      name: atlantis
+    spec:
+      template:
+        spec:
+          serviceAccountName: atlantis
+          containers:
+          - name: atlantis
+            env:
+              - name: ATLANTIS_CONFIG
+                value: /config/atlantis.yaml
+              - name: ATLANTIS_GH_TOKEN
+                valueFrom:
+                  secretKeyRef:
+                    name: atlantis-vcs
+                    key: token
+              - name: ATLANTIS_GH_WEBHOOK_SECRET
+                valueFrom:
+                  secretKeyRef:
+                    name: atlantis-vcs
+                    key: webhook
+            resources:
+              requests:
+                cpu: 500m
+                memory: 1Gi
+              limits:
+                cpu: 4
+                memory: 6Gi
+            volumeMounts:
+            - name: config
+              mountPath: /config
+          volumes:
           - name: config
-            mountPath: /config
-        volumes:
-        - name: config
-          configMap:
-            name: atlantis-config
+            configMap:
+              name: atlantis-config