Skip to content

Commit 412bb6c

Browse files
authored
Merge pull request #9 from cwilson21/adjusting
Adjusting test
2 parents 2dc8d40 + 4e19d80 commit 412bb6c

File tree

2 files changed

+42
-38
lines changed

2 files changed

+42
-38
lines changed

templates/_helpers.tpl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -223,7 +223,7 @@ define this here as well to simplify comparison with packs-volume-mounts
223223
{{- if .Values.st2.overrides }}
224224
- name: st2-overrides-vol
225225
configMap:
226-
name: {{ .Release.Name }}-st2-override-configs
226+
name: {{ .Release.Name }}-st2-overrides-configs
227227
{{- end }}
228228
{{- end -}}
229229

tests/unit/overrides_test.yaml

Lines changed: 41 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -57,23 +57,27 @@ tests:
5757
path: spec.template.spec.containers[0].volumeMounts
5858
content:
5959
name: st2-overrides-vol
60-
mountPath: /opt/stackstorm/overrides
60+
mountPath: /opt/stackstorm/overrides/
6161
documentIndex: 3 # register_content
62+
63+
- contains: *overrides_mnt
64+
documentIndex: 4 #Extra_jobs
65+
- contains: *overrides_volume
66+
documentIndex: 4 #extra_jobs
6267

63-
- notContains: *override_volume
68+
- notContains: *overrides_volume
6469
documentIndex: 0
65-
- notContains: *override_mnt
70+
- notContains: *overrides_mnt
6671
documentIndex: 0
67-
68-
- notContains: *override_volume
72+
- notContains: *overrides_volume
6973
documentIndex: 1
70-
- notContains: *override_mnt
74+
- notContains: *overrides_mnt
7175
documentIndex: 1
72-
73-
- notContains: *override_volume
76+
- notContains: *overrides_volume
7477
documentIndex: 2
75-
- notContains: *override_mnt
78+
- notContains: *overrides_mnt
7679
documentIndex: 2
80+
7781

7882
- it: Deployments with overrides
7983
template: deployments.yaml
@@ -100,61 +104,61 @@ tests:
100104
count: 14
101105

102106

103-
- contains: *override_volume # always included
107+
- contains: *overrides_volume # always included
104108
documentIndex: 12 # st2client
105-
- contains: *override_mnt # always included
109+
- contains: *overrides_mnt # always included
106110
documentIndex: 12 # st2client
107111

108112

109-
- notContains: *override_volume
113+
- notContains: *overrides_volume
110114
documentIndex: 1
111-
- notContains: *override_mnt
115+
- notContains: *overrides_mnt
112116
documentIndex: 1 # st2api
113-
- notContains: *override_volume # only contains if volumes.enabled
117+
- notContains: *overrides_volume # only contains if volumes.enabled
114118
documentIndex: 10 # st2actionrunner
115-
- notContains: *override_mnt # only contains if volumes.enabled
119+
- notContains: *overrides_mnt # only contains if volumes.enabled
116120
documentIndex: 10 # st2actionrunner
117-
- notContains: *override_volume
121+
- notContains: *overrides_volume
118122
documentIndex: 0
119-
- notContains: *override_mnt
123+
- notContains: *overrides_mnt
120124
documentIndex: 0
121-
- notContains: *override_volume
125+
- notContains: *overrides_volume
122126
documentIndex: 2
123-
- notContains: *override_mnt
127+
- notContains: *overrides_mnt
124128
documentIndex: 2
125-
- notContains: *override_volume
129+
- notContains: *overrides_volume
126130
documentIndex: 3
127-
- notContains: *override_mnt
131+
- notContains: *overrides_mnt
128132
documentIndex: 3
129-
- notContains: *override_volume
133+
- notContains: *overrides_volume
130134
documentIndex: 4
131-
- notContains: *override_mnt
135+
- notContains: *overrides_mnt
132136
documentIndex: 4
133-
- notContains: *override_volume
137+
- notContains: *overrides_volume
134138
documentIndex: 5
135-
- notContains: *override_mnt
139+
- notContains: *overrides_mnt
136140
documentIndex: 5
137-
- notContains: *override_volume
141+
- notContains: *overrides_volume
138142
documentIndex: 6
139-
- notContains: *override_mnt
143+
- notContains: *overrides_mnt
140144
documentIndex: 6
141-
- notContains: *override_volume
145+
- notContains: *overrides_volume
142146
documentIndex: 7
143-
- notContains: *override_mnt
147+
- notContains: *overrides_mnt
144148
documentIndex: 7
145-
- notContains: *override_volume
149+
- notContains: *overrides_volume
146150
documentIndex: 8
147-
- notContains: *override_mnt
151+
- notContains: *overrides_mnt
148152
documentIndex: 8
149-
- notContains: *override_volume # never
153+
- notContains: *overrides_volume # never
150154
documentIndex: 9 # st2sensorcontainer
151-
- notContains: *override_mnt # never
155+
- notContains: *overrides_mnt # never
152156
documentIndex: 9 # st2sensorcontainer
153-
- notContains: *override_volume
157+
- notContains: *overrides_volume
154158
documentIndex: 11
155-
- notContains: *override_mnt
159+
- notContains: *overrides_mnt
156160
documentIndex: 11
157-
- notContains: *override_volume
161+
- notContains: *overrides_volume
158162
documentIndex: 13
159-
- notContains: *override_mnt
163+
- notContains: *overrides_mnt
160164
documentIndex: 13

0 commit comments

Comments
 (0)