[stage-3] fix values for simple-app and atlantis

k8s/helm/atlantis/templates/deployment.yaml

@@ -7,7 +7,7 @@ metadata:
     service: atlantis
   name: {{ .Chart.Name }}-{{ .Values.environment }}
 spec:
-  replicas: {{ .Values.atlantis.replicasCount }}
+  replicas: {{ .Values.replicasCount }}
   selector:
     matchLabels:
       app: {{ .Chart.Name }}-{{ .Values.environment }}
@@ -27,7 +27,7 @@ spec:
               containerPort: 4141
           env:
             - name: ATLANTIS_GH_USER
-              value: {{ .Values.atlantis.config.github.user }}
+              value: {{ .Values.config.github.user }}
             - name: ATLANTIS_GH_TOKEN
               valueFrom:
                 secretKeyRef:
@@ -39,11 +39,11 @@ spec:
                   name: {{ .Chart.Name }}-{{ .Values.environment }}
                   key: github_secret
             - name: ATLANTIS_REPO_ALLOWLIST
-              value: {{ toYaml (.Values.atlantis.config.orgAllowlist) }}
+              value: {{ toYaml (.Values.config.orgAllowlist) }}
             - name: ATLANTIS_ALLOW_COMMANDS
-              value: {{ .Values.atlantis.config.allowCommands }}
+              value: {{ .Values.config.allowCommands }}
           resources:
-            {{- toYaml .Values.atlantis.resources | nindent 12 }}
+            {{- toYaml .Values.resources | nindent 12 }}
           livenessProbe:
             httpGet:
               path: /healthz

k8s/helm/atlantis/templates/secret.yaml

@@ -4,5 +4,5 @@ kind: Secret
 metadata:
   name: {{ .Chart.Name }}-{{ .Values.environment }}
 data:
-  github_token: {{ .Values.atlantis.config.github.token | b64enc }}
-  github_secret: {{ .Values.atlantis.config.github.secret | b64enc }}
+  github_token: {{ .Values.config.github.token | b64enc }}
+  github_secret: {{ .Values.config.github.secret | b64enc }}

k8s/helm/atlantis/values.yaml

@@ -3,20 +3,20 @@ environment: production
 image:
   name: ghcr.io/runatlantis/atlantis
 
-atlantis:
-  config:
-    orgAllowlist: github.com/Dannecron/*
-    github:
-      user: personal-access-token-name
-      token: personal-access-token-secret
-      secret: webhook-secret
-    allowCommands: "version,plan,state"
+replicasCount: 1
 
-  replicasCount: 1
-  resources:
-    requests:
-      memory: 512Mi
-      cpu: 100m
-    limits:
-      memory: 1Gi
-      cpu: 100m
+resources:
+  requests:
+    memory: 512Mi
+    cpu: 100m
+  limits:
+    memory: 1Gi
+    cpu: 100m
+
+config:
+  orgAllowlist: github.com/Dannecron/*
+  github:
+    user: personal-access-token-name
+    token: personal-access-token-secret
+    secret: webhook-secret
+  allowCommands: "version,plan,state"