Skip to content

Commit d52b3fd

Browse files
lkysowlkysow
authored
Merge pull request runatlantis#343 from runatlantis/helm
Fix helm chart.
2 parents 2fbfeab + 374b26f commit d52b3fd

15 files changed

+62
-60
lines changed

‎helm/atlantis/templates/statefulset.yaml

+3-1
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,8 @@ spec:
1919
app: {{ template "atlantis.name" . }}
2020
release: {{ .Release.Name }}
2121
spec:
22+
securityContext:
23+
fsGroup: 1000
2224
volumes:
2325
{{- range $name, $_ := .Values.serviceAccountSecrets }}
2426
- name: {{ $name }}-volume
@@ -187,4 +189,4 @@ spec:
187189
requests:
188190
# The biggest thing Atlantis stores is the Git repo when it checks it out.
189191
# It deletes the repo after the pull request is merged.
190-
storage: 5Gi
192+
storage: 5Gi

‎helm/atlantis/values.yaml

+3-3
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ serviceAccountSecrets:
7373

7474
image:
7575
repository: runatlantis/atlantis
76-
tag: v0.4.5
76+
tag: v0.4.11
7777
pullPolicy: IfNotPresent
7878

7979
## enable using atlantis.yaml file
@@ -115,10 +115,10 @@ ingress:
115115

116116
resources:
117117
requests:
118-
memory: 1Gi
118+
memory: 256Mi
119119
cpu: 100m
120120
limits:
121-
memory: 1Gi
121+
memory: 256Mi
122122
cpu: 100m
123123

124124
replicaCount: 1

‎server/events_controller_e2e_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -486,10 +486,10 @@ func assertCommentEquals(t *testing.T, expFile string, act string, repoDir strin
486486
idRegex := regexp.MustCompile(`Creation complete after [0-9]+s \(ID: [0-9]+\)`)
487487
act = idRegex.ReplaceAllString(act, "Creation complete after *s (ID: ******************)")
488488

489-
// Replace all null_resource.simple{n} with null_resource.simple because with
490-
// multiple resources they might be created at different times and so the
491-
// output is unordered.
492-
resourceRegex := regexp.MustCompile(`null_resource\.simple\d:`)
489+
// Replace all null_resource.simple{n}: .* with null_resource.simple: because
490+
// with multiple resources being created the logs are all out of order which
491+
// makes comparison impossible.
492+
resourceRegex := regexp.MustCompile(`null_resource\.simple\d?:.*`)
493493
act = resourceRegex.ReplaceAllString(act, "null_resource.simple:")
494494

495495
if string(exp) != act {

‎server/testfixtures/test-repos/simple-yaml/exp-output-apply-all.txt

+4-4
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@ Ran Apply for 2 projects:
44

55
### 1. workspace: `default` dir: `.`
66
```diff
7-
null_resource.simple: Creating...
8-
null_resource.simple: Creation complete after *s (ID: ******************)
7+
null_resource.simple:
8+
null_resource.simple:
99

1010
Apply complete! Resources: 1 added, 0 changed, 0 destroyed.
1111

@@ -19,8 +19,8 @@ workspace = default
1919
---
2020
### 2. workspace: `staging` dir: `.`
2121
```diff
22-
null_resource.simple: Creating...
23-
null_resource.simple: Creation complete after *s (ID: ******************)
22+
null_resource.simple:
23+
null_resource.simple:
2424

2525
Apply complete! Resources: 1 added, 0 changed, 0 destroyed.
2626

‎server/testfixtures/test-repos/simple-yaml/exp-output-apply-default.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Ran Apply in dir: `.` workspace: `default`
22

33
```diff
4-
null_resource.simple: Creating...
5-
null_resource.simple: Creation complete after *s (ID: ******************)
4+
null_resource.simple:
5+
null_resource.simple:
66

77
Apply complete! Resources: 1 added, 0 changed, 0 destroyed.
88

‎server/testfixtures/test-repos/simple-yaml/exp-output-apply-staging.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
Ran Apply in dir: `.` workspace: `staging`
22

33
```diff
4-
null_resource.simple: Creating...
5-
null_resource.simple: Creation complete after *s (ID: ******************)
4+
null_resource.simple:
5+
null_resource.simple:
66

77
Apply complete! Resources: 1 added, 0 changed, 0 destroyed.
88

‎server/testfixtures/test-repos/simple/exp-output-apply-var-all.txt

+12-12
Original file line numberDiff line numberDiff line change
@@ -6,12 +6,12 @@ Ran Apply for 2 projects:
66
<details><summary>Show Output</summary>
77

88
```diff
9-
null_resource.simple: Creating...
10-
null_resource.simple: Creating...
11-
null_resource.simple: Creating...
12-
null_resource.simple: Creation complete after *s (ID: ******************)
13-
null_resource.simple: Creation complete after *s (ID: ******************)
14-
null_resource.simple: Creation complete after *s (ID: ******************)
9+
null_resource.simple:
10+
null_resource.simple:
11+
null_resource.simple:
12+
null_resource.simple:
13+
null_resource.simple:
14+
null_resource.simple:
1515

1616
Apply complete! Resources: 3 added, 0 changed, 0 destroyed.
1717

@@ -28,12 +28,12 @@ workspace = default
2828
<details><summary>Show Output</summary>
2929

3030
```diff
31-
null_resource.simple: Creating...
32-
null_resource.simple: Creating...
33-
null_resource.simple: Creating...
34-
null_resource.simple: Creation complete after *s (ID: ******************)
35-
null_resource.simple: Creation complete after *s (ID: ******************)
36-
null_resource.simple: Creation complete after *s (ID: ******************)
31+
null_resource.simple:
32+
null_resource.simple:
33+
null_resource.simple:
34+
null_resource.simple:
35+
null_resource.simple:
36+
null_resource.simple:
3737

3838
Apply complete! Resources: 3 added, 0 changed, 0 destroyed.
3939

‎server/testfixtures/test-repos/simple/exp-output-apply-var-default-workspace.txt

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ Ran Apply in dir: `.` workspace: `default`
33
<details><summary>Show Output</summary>
44

55
```diff
6-
null_resource.simple: Creating...
7-
null_resource.simple: Creating...
8-
null_resource.simple: Creating...
9-
null_resource.simple: Creation complete after *s (ID: ******************)
10-
null_resource.simple: Creation complete after *s (ID: ******************)
11-
null_resource.simple: Creation complete after *s (ID: ******************)
6+
null_resource.simple:
7+
null_resource.simple:
8+
null_resource.simple:
9+
null_resource.simple:
10+
null_resource.simple:
11+
null_resource.simple:
1212

1313
Apply complete! Resources: 3 added, 0 changed, 0 destroyed.
1414

‎server/testfixtures/test-repos/simple/exp-output-apply-var-new-workspace.txt

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ Ran Apply in dir: `.` workspace: `new_workspace`
33
<details><summary>Show Output</summary>
44

55
```diff
6-
null_resource.simple: Creating...
7-
null_resource.simple: Creating...
8-
null_resource.simple: Creating...
9-
null_resource.simple: Creation complete after *s (ID: ******************)
10-
null_resource.simple: Creation complete after *s (ID: ******************)
11-
null_resource.simple: Creation complete after *s (ID: ******************)
6+
null_resource.simple:
7+
null_resource.simple:
8+
null_resource.simple:
9+
null_resource.simple:
10+
null_resource.simple:
11+
null_resource.simple:
1212

1313
Apply complete! Resources: 3 added, 0 changed, 0 destroyed.
1414

‎server/testfixtures/test-repos/simple/exp-output-apply-var.txt

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ Ran Apply in dir: `.` workspace: `default`
33
<details><summary>Show Output</summary>
44

55
```diff
6-
null_resource.simple: Creating...
7-
null_resource.simple: Creating...
8-
null_resource.simple: Creating...
9-
null_resource.simple: Creation complete after *s (ID: ******************)
10-
null_resource.simple: Creation complete after *s (ID: ******************)
11-
null_resource.simple: Creation complete after *s (ID: ******************)
6+
null_resource.simple:
7+
null_resource.simple:
8+
null_resource.simple:
9+
null_resource.simple:
10+
null_resource.simple:
11+
null_resource.simple:
1212

1313
Apply complete! Resources: 3 added, 0 changed, 0 destroyed.
1414

‎server/testfixtures/test-repos/simple/exp-output-apply.txt

+6-6
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@ Ran Apply in dir: `.` workspace: `default`
33
<details><summary>Show Output</summary>
44

55
```diff
6-
null_resource.simple: Creating...
7-
null_resource.simple: Creating...
8-
null_resource.simple: Creating...
9-
null_resource.simple: Creation complete after *s (ID: ******************)
10-
null_resource.simple: Creation complete after *s (ID: ******************)
11-
null_resource.simple: Creation complete after *s (ID: ******************)
6+
null_resource.simple:
7+
null_resource.simple:
8+
null_resource.simple:
9+
null_resource.simple:
10+
null_resource.simple:
11+
null_resource.simple:
1212

1313
Apply complete! Resources: 3 added, 0 changed, 0 destroyed.
1414

‎server/testfixtures/test-repos/tfvars-yaml-no-autoplan/exp-output-apply-default.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ Ran Apply in dir: `.` workspace: `default`
33
<details><summary>Show Output</summary>
44

55
```diff
6-
null_resource.simple: Creating...
7-
null_resource.simple: Creation complete after *s (ID: ******************)
6+
null_resource.simple:
7+
null_resource.simple:
88

99
Apply complete! Resources: 1 added, 0 changed, 0 destroyed.
1010

‎server/testfixtures/test-repos/tfvars-yaml-no-autoplan/exp-output-apply-staging.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ Ran Apply in dir: `.` workspace: `default`
33
<details><summary>Show Output</summary>
44

55
```diff
6-
null_resource.simple: Creating...
7-
null_resource.simple: Creation complete after *s (ID: ******************)
6+
null_resource.simple:
7+
null_resource.simple:
88

99
Apply complete! Resources: 1 added, 0 changed, 0 destroyed.
1010

‎server/testfixtures/test-repos/tfvars-yaml/exp-output-apply-default.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ Ran Apply in dir: `.` workspace: `default`
33
<details><summary>Show Output</summary>
44

55
```diff
6-
null_resource.simple: Creating...
7-
null_resource.simple: Creation complete after *s (ID: ******************)
6+
null_resource.simple:
7+
null_resource.simple:
88

99
Apply complete! Resources: 1 added, 0 changed, 0 destroyed.
1010

‎server/testfixtures/test-repos/tfvars-yaml/exp-output-apply-staging.txt

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ Ran Apply in dir: `.` workspace: `default`
33
<details><summary>Show Output</summary>
44

55
```diff
6-
null_resource.simple: Creating...
7-
null_resource.simple: Creation complete after *s (ID: ******************)
6+
null_resource.simple:
7+
null_resource.simple:
88

99
Apply complete! Resources: 1 added, 0 changed, 0 destroyed.
1010

0 commit comments

Comments
 (0)