Merge pull request runatlantis#343 from runatlantis/helm

Fix helm chart.
jml · Nov 1, 2018 · d52b3fd · d52b3fd
2 parents 2fbfeab + 374b26f
commit d52b3fd
Show file tree

Hide file tree

Showing 15 changed files with 62 additions and 60 deletions.
diff --git a/helm/atlantis/templates/statefulset.yaml b/helm/atlantis/templates/statefulset.yaml
@@ -19,6 +19,8 @@ spec:
         app: {{ template "atlantis.name" . }}
         release: {{ .Release.Name }}
     spec:
+      securityContext:
+        fsGroup: 1000
       volumes:
       {{- range $name, $_ := .Values.serviceAccountSecrets }}
       - name: {{ $name }}-volume
@@ -187,4 +189,4 @@ spec:
         requests:
           # The biggest thing Atlantis stores is the Git repo when it checks it out.
           # It deletes the repo after the pull request is merged.
-          storage: 5Gi
+          storage: 5Gi
diff --git a/helm/atlantis/values.yaml b/helm/atlantis/values.yaml
@@ -73,7 +73,7 @@ serviceAccountSecrets:
 
 image:
   repository: runatlantis/atlantis
-  tag: v0.4.5
+  tag: v0.4.11
   pullPolicy: IfNotPresent
 
 ## enable using atlantis.yaml file
@@ -115,10 +115,10 @@ ingress:
 
 resources:
   requests:
-    memory: 1Gi
+    memory: 256Mi
     cpu: 100m
   limits:
-    memory: 1Gi
+    memory: 256Mi
     cpu: 100m
 
 replicaCount: 1

diff --git a/server/events_controller_e2e_test.go b/server/events_controller_e2e_test.go
@@ -486,10 +486,10 @@ func assertCommentEquals(t *testing.T, expFile string, act string, repoDir strin
 	idRegex := regexp.MustCompile(`Creation complete after [0-9]+s \(ID: [0-9]+\)`)
 	act = idRegex.ReplaceAllString(act, "Creation complete after *s (ID: ******************)")
 
-	// Replace all null_resource.simple{n} with null_resource.simple because with
-	// multiple resources they might be created at different times and so the
-	// output is unordered.
-	resourceRegex := regexp.MustCompile(`null_resource\.simple\d:`)
+	// Replace all null_resource.simple{n}: .* with null_resource.simple: because
+	// with multiple resources being created the logs are all out of order which
+	// makes comparison impossible.
+	resourceRegex := regexp.MustCompile(`null_resource\.simple\d?:.*`)
 	act = resourceRegex.ReplaceAllString(act, "null_resource.simple:")
 
 	if string(exp) != act {

diff --git a/server/testfixtures/test-repos/simple-yaml/exp-output-apply-all.txt b/server/testfixtures/test-repos/simple-yaml/exp-output-apply-all.txt
@@ -4,8 +4,8 @@ Ran Apply for 2 projects:
 
 ### 1. workspace: `default` dir: `.`
 ```diff
-null_resource.simple: Creating...
-null_resource.simple: Creation complete after *s (ID: ******************)
+null_resource.simple:
+null_resource.simple:
 
 Apply complete! Resources: 1 added, 0 changed, 0 destroyed.
 
@@ -19,8 +19,8 @@ workspace = default
 ---
 ### 2. workspace: `staging` dir: `.`
 ```diff
-null_resource.simple: Creating...
-null_resource.simple: Creation complete after *s (ID: ******************)
+null_resource.simple:
+null_resource.simple:
 
 Apply complete! Resources: 1 added, 0 changed, 0 destroyed.
 

diff --git a/server/testfixtures/test-repos/simple-yaml/exp-output-apply-default.txt b/server/testfixtures/test-repos/simple-yaml/exp-output-apply-default.txt
@@ -1,8 +1,8 @@
 Ran Apply in dir: `.` workspace: `default`
 
 ```diff
-null_resource.simple: Creating...
-null_resource.simple: Creation complete after *s (ID: ******************)
+null_resource.simple:
+null_resource.simple:
 
 Apply complete! Resources: 1 added, 0 changed, 0 destroyed.
 

diff --git a/server/testfixtures/test-repos/simple-yaml/exp-output-apply-staging.txt b/server/testfixtures/test-repos/simple-yaml/exp-output-apply-staging.txt
@@ -1,8 +1,8 @@
 Ran Apply in dir: `.` workspace: `staging`
 
 ```diff
-null_resource.simple: Creating...
-null_resource.simple: Creation complete after *s (ID: ******************)
+null_resource.simple:
+null_resource.simple:
 
 Apply complete! Resources: 1 added, 0 changed, 0 destroyed.
 

diff --git a/server/testfixtures/test-repos/simple/exp-output-apply-var-all.txt b/server/testfixtures/test-repos/simple/exp-output-apply-var-all.txt
@@ -6,12 +6,12 @@ Ran Apply for 2 projects:
 <details><summary>Show Output</summary>
 
 ```diff
-null_resource.simple: Creating...
-null_resource.simple: Creating...
-null_resource.simple: Creating...
-null_resource.simple: Creation complete after *s (ID: ******************)
-null_resource.simple: Creation complete after *s (ID: ******************)
-null_resource.simple: Creation complete after *s (ID: ******************)
+null_resource.simple:
+null_resource.simple:
+null_resource.simple:
+null_resource.simple:
+null_resource.simple:
+null_resource.simple:
 
 Apply complete! Resources: 3 added, 0 changed, 0 destroyed.
 
@@ -28,12 +28,12 @@ workspace = default
 <details><summary>Show Output</summary>
 
 ```diff
-null_resource.simple: Creating...
-null_resource.simple: Creating...
-null_resource.simple: Creating...
-null_resource.simple: Creation complete after *s (ID: ******************)
-null_resource.simple: Creation complete after *s (ID: ******************)
-null_resource.simple: Creation complete after *s (ID: ******************)
+null_resource.simple:
+null_resource.simple:
+null_resource.simple:
+null_resource.simple:
+null_resource.simple:
+null_resource.simple:
 
 Apply complete! Resources: 3 added, 0 changed, 0 destroyed.
 

diff --git a/server/testfixtures/test-repos/simple/exp-output-apply-var-default-workspace.txt b/server/testfixtures/test-repos/simple/exp-output-apply-var-default-workspace.txt
@@ -3,12 +3,12 @@ Ran Apply in dir: `.` workspace: `default`
 <details><summary>Show Output</summary>
 
 ```diff
-null_resource.simple: Creating...
-null_resource.simple: Creating...
-null_resource.simple: Creating...
-null_resource.simple: Creation complete after *s (ID: ******************)
-null_resource.simple: Creation complete after *s (ID: ******************)
-null_resource.simple: Creation complete after *s (ID: ******************)
+null_resource.simple:
+null_resource.simple:
+null_resource.simple:
+null_resource.simple:
+null_resource.simple:
+null_resource.simple:
 
 Apply complete! Resources: 3 added, 0 changed, 0 destroyed.
 

diff --git a/server/testfixtures/test-repos/simple/exp-output-apply-var-new-workspace.txt b/server/testfixtures/test-repos/simple/exp-output-apply-var-new-workspace.txt
@@ -3,12 +3,12 @@ Ran Apply in dir: `.` workspace: `new_workspace`
 <details><summary>Show Output</summary>
 
 ```diff
-null_resource.simple: Creating...
-null_resource.simple: Creating...
-null_resource.simple: Creating...
-null_resource.simple: Creation complete after *s (ID: ******************)
-null_resource.simple: Creation complete after *s (ID: ******************)
-null_resource.simple: Creation complete after *s (ID: ******************)
+null_resource.simple:
+null_resource.simple:
+null_resource.simple:
+null_resource.simple:
+null_resource.simple:
+null_resource.simple:
 
 Apply complete! Resources: 3 added, 0 changed, 0 destroyed.
 

diff --git a/server/testfixtures/test-repos/simple/exp-output-apply-var.txt b/server/testfixtures/test-repos/simple/exp-output-apply-var.txt
@@ -3,12 +3,12 @@ Ran Apply in dir: `.` workspace: `default`
 <details><summary>Show Output</summary>
 
 ```diff
-null_resource.simple: Creating...
-null_resource.simple: Creating...
-null_resource.simple: Creating...
-null_resource.simple: Creation complete after *s (ID: ******************)
-null_resource.simple: Creation complete after *s (ID: ******************)
-null_resource.simple: Creation complete after *s (ID: ******************)
+null_resource.simple:
+null_resource.simple:
+null_resource.simple:
+null_resource.simple:
+null_resource.simple:
+null_resource.simple:
 
 Apply complete! Resources: 3 added, 0 changed, 0 destroyed.
 

diff --git a/server/testfixtures/test-repos/simple/exp-output-apply.txt b/server/testfixtures/test-repos/simple/exp-output-apply.txt
@@ -3,12 +3,12 @@ Ran Apply in dir: `.` workspace: `default`
 <details><summary>Show Output</summary>
 
 ```diff
-null_resource.simple: Creating...
-null_resource.simple: Creating...
-null_resource.simple: Creating...
-null_resource.simple: Creation complete after *s (ID: ******************)
-null_resource.simple: Creation complete after *s (ID: ******************)
-null_resource.simple: Creation complete after *s (ID: ******************)
+null_resource.simple:
+null_resource.simple:
+null_resource.simple:
+null_resource.simple:
+null_resource.simple:
+null_resource.simple:
 
 Apply complete! Resources: 3 added, 0 changed, 0 destroyed.
 

diff --git a/server/testfixtures/test-repos/tfvars-yaml-no-autoplan/exp-output-apply-default.txt b/server/testfixtures/test-repos/tfvars-yaml-no-autoplan/exp-output-apply-default.txt
@@ -3,8 +3,8 @@ Ran Apply in dir: `.` workspace: `default`
 <details><summary>Show Output</summary>
 
 ```diff
-null_resource.simple: Creating...
-null_resource.simple: Creation complete after *s (ID: ******************)
+null_resource.simple:
+null_resource.simple:
 
 Apply complete! Resources: 1 added, 0 changed, 0 destroyed.
 

diff --git a/server/testfixtures/test-repos/tfvars-yaml-no-autoplan/exp-output-apply-staging.txt b/server/testfixtures/test-repos/tfvars-yaml-no-autoplan/exp-output-apply-staging.txt
@@ -3,8 +3,8 @@ Ran Apply in dir: `.` workspace: `default`
 <details><summary>Show Output</summary>
 
 ```diff
-null_resource.simple: Creating...
-null_resource.simple: Creation complete after *s (ID: ******************)
+null_resource.simple:
+null_resource.simple:
 
 Apply complete! Resources: 1 added, 0 changed, 0 destroyed.
 

diff --git a/server/testfixtures/test-repos/tfvars-yaml/exp-output-apply-default.txt b/server/testfixtures/test-repos/tfvars-yaml/exp-output-apply-default.txt
@@ -3,8 +3,8 @@ Ran Apply in dir: `.` workspace: `default`
 <details><summary>Show Output</summary>
 
 ```diff
-null_resource.simple: Creating...
-null_resource.simple: Creation complete after *s (ID: ******************)
+null_resource.simple:
+null_resource.simple:
 
 Apply complete! Resources: 1 added, 0 changed, 0 destroyed.
 

diff --git a/server/testfixtures/test-repos/tfvars-yaml/exp-output-apply-staging.txt b/server/testfixtures/test-repos/tfvars-yaml/exp-output-apply-staging.txt
@@ -3,8 +3,8 @@ Ran Apply in dir: `.` workspace: `default`
 <details><summary>Show Output</summary>
 
 ```diff
-null_resource.simple: Creating...
-null_resource.simple: Creation complete after *s (ID: ******************)
+null_resource.simple:
+null_resource.simple:
 
 Apply complete! Resources: 1 added, 0 changed, 0 destroyed.