Skip to content

Commit 7e7f7d0

Browse files
hiddecohiddeco
committed
build: incorporate condition changes in e2e
Signed-off-by: Hidde Beydals <hidde@hhh.computer>
1 parent c12b8c8 commit 7e7f7d0

File tree

17 files changed

+43
-40
lines changed

17 files changed

+43
-40
lines changed

‎.github/workflows/e2e.yaml

+10-9
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ jobs:
169169
kubectl -n helm-system apply -f config/testdata/$test_name
170170
echo -n ">>> Waiting for expected conditions"
171171
count=0
172-
until [ 'true' == "$( kubectl -n helm-system get helmrelease/$test_name -o json | jq '.status.conditions | map( { (.type): .status } ) | add | .Released=="False" and .TestSuccess=="False" and .Ready=="False"' )" ]; do
172+
until [ 'true' == "$( kubectl -n helm-system get helmrelease/$test_name -o json | jq '.status.conditions | map( { (.type): .status } ) | add | .Released=="True" and .TestSuccess=="False" and .Ready=="False"' )" ]; do
173173
echo -n '.'
174174
sleep 5
175175
count=$((count + 1))
@@ -213,7 +213,7 @@ jobs:
213213
fi
214214
215215
kubectl -n helm-system delete -f config/testdata/$test_name
216-
- name: Run install fail with remedition test
216+
- name: Run install fail with remediation test
217217
run: |
218218
test_name=install-fail-remediate
219219
kubectl -n helm-system apply -f config/testdata/$test_name
@@ -230,21 +230,22 @@ jobs:
230230
done
231231
echo ' done'
232232
233-
# Ensure release does not exist (was uninstalled).
234-
HISTORY=$(helm -n helm-system history $test_name 2>&1; exit 0)
235-
if [ "$HISTORY" != 'Error: release: not found' ]; then
236-
echo -e "Unexpected release history: $HISTORY"
233+
# Ensure release was uninstalled.
234+
RELEASE_STATUS=$(helm -n helm-system history $test_name -o json | jq -r 'if length == 1 then .[0].status else empty end')
235+
if [ "$RELEASE_STATUS" != "uninstalled" ]; then
236+
echo -e "Unexpected release status: $RELEASE_STATUS"
237237
exit 1
238238
fi
239239
240240
kubectl -n helm-system delete -f config/testdata/$test_name
241+
helm -n helm-system delete $test_name
241242
- name: Run install fail with retry test
242243
run: |
243244
test_name=install-fail-retry
244245
kubectl -n helm-system apply -f config/testdata/$test_name
245246
echo -n ">>> Waiting for expected conditions"
246247
count=0
247-
until [ 'true' == "$( kubectl -n helm-system get helmrelease/$test_name -o json | jq '.status.installFailures == 2 and ( .status.conditions | map( { (.type): .status } ) | add | .Released=="False" and .Ready=="False" )' )" ]; do
248+
until [ 'true' == "$( kubectl -n helm-system get helmrelease/$test_name -o json | jq '.status.installFailures == 2 and ( .status.conditions | map( { (.type): .status } ) | add | .Released=="False" and .Ready=="False" and .Stalled=="True" )' )" ]; do
248249
echo -n '.'
249250
sleep 5
250251
count=$((count + 1))
@@ -290,7 +291,7 @@ jobs:
290291
kubectl -n helm-system apply -f config/testdata/$test_name/upgrade.yaml
291292
echo -n ">>> Waiting for expected conditions"
292293
count=0
293-
until [ 'true' == "$( kubectl -n helm-system get helmrelease/$test_name -o json | jq '.status.conditions | map( { (.type): .status } ) | add | .Released=="False" and .Ready=="False"' )" ]; do
294+
until [ 'true' == "$( kubectl -n helm-system get helmrelease/$test_name -o json | jq '.status.conditions | map( { (.type): .status } ) | add | .Released=="False" and .Ready=="False" and .Stalled=="True"' )" ]; do
294295
echo -n '.'
295296
sleep 5
296297
count=$((count + 1))
@@ -336,7 +337,7 @@ jobs:
336337
kubectl -n helm-system apply -f config/testdata/$test_name/upgrade.yaml
337338
echo -n ">>> Waiting for expected conditions"
338339
count=0
339-
until [ 'true' == "$( kubectl -n helm-system get helmrelease/$test_name -o json | jq '.status.conditions | map( { (.type): .status } ) | add | .Released=="False" and .TestSuccess=="False" and .Ready=="False"' )" ]; do
340+
until [ 'true' == "$( kubectl -n helm-system get helmrelease/$test_name -o json | jq '.status.conditions | map( { (.type): .status } ) | add | .Released=="True" and .TestSuccess=="False" and .Ready=="False" and .Stalled=="True"' )" ]; do
340341
echo -n '.'
341342
sleep 5
342343
count=$((count + 1))

‎config/testdata/install-fail-remediate/helmrelease.yaml

+4-2
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,20 @@ kind: HelmRelease
33
metadata:
44
name: install-fail-remediate
55
spec:
6-
interval: 5m
6+
interval: 30s
77
chart:
88
spec:
99
chart: podinfo
1010
version: '>=6.0.0 <7.0.0'
1111
sourceRef:
1212
kind: HelmRepository
1313
name: podinfo
14-
interval: 1m
14+
interval: 10m
1515
install:
1616
remediation:
1717
remediateLastFailure: true
18+
uninstall:
19+
keepHistory: true
1820
values:
1921
resources:
2022
requests:

‎config/testdata/install-fail-retry/helmrelease.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ kind: HelmRelease
33
metadata:
44
name: install-fail-retry
55
spec:
6-
interval: 5m
6+
interval: 30s
77
chart:
88
spec:
99
chart: podinfo
1010
version: '>=6.0.0 <7.0.0'
1111
sourceRef:
1212
kind: HelmRepository
1313
name: podinfo
14-
interval: 1m
14+
interval: 10m
1515
install:
1616
remediation:
1717
retries: 1

‎config/testdata/install-fail/helmrelease.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ kind: HelmRelease
33
metadata:
44
name: install-fail
55
spec:
6-
interval: 5m
6+
interval: 30s
77
chart:
88
spec:
99
chart: podinfo
1010
version: '>=6.0.0 <7.0.0'
1111
sourceRef:
1212
kind: HelmRepository
1313
name: podinfo
14-
interval: 1m
14+
interval: 10m
1515
values:
1616
resources:
1717
requests:

‎config/testdata/install-test-fail-ignore/helmrelease.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ kind: HelmRelease
33
metadata:
44
name: install-test-fail-ignore
55
spec:
6-
interval: 5m
6+
interval: 30s
77
chart:
88
spec:
99
chart: podinfo
1010
version: '>=6.0.0 <7.0.0'
1111
sourceRef:
1212
kind: HelmRepository
1313
name: podinfo
14-
interval: 1m
14+
interval: 10m
1515
test:
1616
enable: true
1717
ignoreFailures: true

‎config/testdata/install-test-fail/helmrelease.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ kind: HelmRelease
33
metadata:
44
name: install-test-fail
55
spec:
6-
interval: 5m
6+
interval: 30s
77
chart:
88
spec:
99
chart: podinfo
1010
version: '>=6.0.0 <7.0.0'
1111
sourceRef:
1212
kind: HelmRepository
1313
name: podinfo
14-
interval: 1m
14+
interval: 10m
1515
test:
1616
enable: true
1717
values:

‎config/testdata/upgrade-fail-remediate-uninstall/install.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ kind: HelmRelease
33
metadata:
44
name: upgrade-fail-remediate-uninstall
55
spec:
6-
interval: 5m
6+
interval: 30s
77
chart:
88
spec:
99
chart: podinfo
1010
version: '>=6.0.0 <7.0.0'
1111
sourceRef:
1212
kind: HelmRepository
1313
name: podinfo
14-
interval: 1m
14+
interval: 10m
1515
values:
1616
resources:
1717
requests:

‎config/testdata/upgrade-fail-remediate-uninstall/upgrade.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ kind: HelmRelease
33
metadata:
44
name: upgrade-fail-remediate-uninstall
55
spec:
6-
interval: 5m
6+
interval: 30s
77
chart:
88
spec:
99
chart: podinfo
1010
version: '>=6.0.0 <7.0.0'
1111
sourceRef:
1212
kind: HelmRepository
1313
name: podinfo
14-
interval: 1m
14+
interval: 10m
1515
upgrade:
1616
remediation:
1717
remediateLastFailure: true

‎config/testdata/upgrade-fail-remediate/install.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ kind: HelmRelease
33
metadata:
44
name: upgrade-fail-remediate
55
spec:
6-
interval: 5m
6+
interval: 30s
77
chart:
88
spec:
99
chart: podinfo
1010
version: '>=6.0.0 <7.0.0'
1111
sourceRef:
1212
kind: HelmRepository
1313
name: podinfo
14-
interval: 1m
14+
interval: 10m
1515
values:
1616
resources:
1717
requests:

‎config/testdata/upgrade-fail-remediate/upgrade.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ kind: HelmRelease
33
metadata:
44
name: upgrade-fail-remediate
55
spec:
6-
interval: 5m
6+
interval: 30s
77
chart:
88
spec:
99
chart: podinfo
1010
version: '>=6.0.0 <7.0.0'
1111
sourceRef:
1212
kind: HelmRepository
1313
name: podinfo
14-
interval: 1m
14+
interval: 10m
1515
upgrade:
1616
remediation:
1717
remediateLastFailure: true

‎config/testdata/upgrade-fail-retry/install.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ kind: HelmRelease
33
metadata:
44
name: upgrade-fail-retry
55
spec:
6-
interval: 5m
6+
interval: 30s
77
chart:
88
spec:
99
chart: podinfo
1010
version: '>=6.0.0 <7.0.0'
1111
sourceRef:
1212
kind: HelmRepository
1313
name: podinfo
14-
interval: 1m
14+
interval: 10m
1515
values:
1616
resources:
1717
requests:

‎config/testdata/upgrade-fail-retry/upgrade.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ kind: HelmRelease
33
metadata:
44
name: upgrade-fail-retry
55
spec:
6-
interval: 5m
6+
interval: 30s
77
chart:
88
spec:
99
chart: podinfo
1010
version: '>=6.0.0 <7.0.0'
1111
sourceRef:
1212
kind: HelmRepository
1313
name: podinfo
14-
interval: 1m
14+
interval: 10m
1515
upgrade:
1616
remediation:
1717
retries: 1

‎config/testdata/upgrade-fail/install.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ kind: HelmRelease
33
metadata:
44
name: upgrade-fail
55
spec:
6-
interval: 5m
6+
interval: 30s
77
chart:
88
spec:
99
chart: podinfo
1010
version: '>=6.0.0 <7.0.0'
1111
sourceRef:
1212
kind: HelmRepository
1313
name: podinfo
14-
interval: 1m
14+
interval: 10m
1515
values:
1616
resources:
1717
requests:

‎config/testdata/upgrade-fail/upgrade.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ kind: HelmRelease
33
metadata:
44
name: upgrade-fail
55
spec:
6-
interval: 5m
6+
interval: 30s
77
chart:
88
spec:
99
chart: podinfo
1010
version: '>=6.0.0 <7.0.0'
1111
sourceRef:
1212
kind: HelmRepository
1313
name: podinfo
14-
interval: 1m
14+
interval: 10m
1515
values:
1616
resources:
1717
requests:

‎config/testdata/upgrade-test-fail/install.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ kind: HelmRelease
33
metadata:
44
name: upgrade-test-fail
55
spec:
6-
interval: 5m
6+
interval: 30s
77
chart:
88
spec:
99
chart: podinfo
1010
version: '>=6.0.0 <7.0.0'
1111
sourceRef:
1212
kind: HelmRepository
1313
name: podinfo
14-
interval: 1m
14+
interval: 10m
1515
values:
1616
resources:
1717
requests:

‎config/testdata/upgrade-test-fail/upgrade.yaml

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,15 @@ kind: HelmRelease
33
metadata:
44
name: upgrade-test-fail
55
spec:
6-
interval: 5m
6+
interval: 30s
77
chart:
88
spec:
99
chart: podinfo
1010
version: '>=6.0.0 <7.0.0'
1111
sourceRef:
1212
kind: HelmRepository
1313
name: podinfo
14-
interval: 1m
14+
interval: 10m
1515
test:
1616
enable: true
1717
values:

‎config/testdata/valuesfrom/helmrelease.yaml

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ spec:
1111
sourceRef:
1212
kind: HelmRepository
1313
name: podinfo
14-
interval: 1m
14+
interval: 10m
1515
valuesFrom:
1616
- kind: ConfigMap
1717
name: valuesfrom-config

0 commit comments

Comments
 (0)