build: incorporate condition changes in e2e

Signed-off-by: Hidde Beydals <[email protected]>

.github/workflows/e2e.yaml

@@ -169,7 +169,7 @@ jobs:
           kubectl -n helm-system apply -f config/testdata/$test_name
           echo -n ">>> Waiting for expected conditions"
           count=0
-          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
+          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
             echo -n '.'
             sleep 5
             count=$((count + 1))
@@ -213,7 +213,7 @@ jobs:
           fi
 
           kubectl -n helm-system delete -f config/testdata/$test_name
-      - name: Run install fail with remedition test
+      - name: Run install fail with remediation test
         run: |
           test_name=install-fail-remediate
           kubectl -n helm-system apply -f config/testdata/$test_name
@@ -230,10 +230,10 @@ jobs:
           done
           echo ' done'
 
-          # Ensure release does not exist (was uninstalled).
-          HISTORY=$(helm -n helm-system history $test_name 2>&1; exit 0)
-          if [ "$HISTORY" != 'Error: release: not found' ]; then
-            echo -e "Unexpected release history: $HISTORY"
+          # Ensure release was uninstalled.
+          RELEASE_STATUS=$(helm -n helm-system history $test_name -o json | jq -r 'if length == 1 then .[0].status else empty end')
+          if [ "$RELEASE_STATUS" != "uninstalled" ]; then
+            echo -e "Unexpected release status: $RELEASE_STATUS"
             exit 1
           fi
 
@@ -244,7 +244,7 @@ jobs:
           kubectl -n helm-system apply -f config/testdata/$test_name
           echo -n ">>> Waiting for expected conditions"
           count=0
-          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
+          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 .Remediated=and .Ready=="False" )' )" ]; do
             echo -n '.'
             sleep 5
             count=$((count + 1))

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

@@ -3,18 +3,20 @@ kind: HelmRelease
 metadata:
   name: install-fail-remediate
 spec:
-  interval: 5m
+  interval: 30s
   chart:
     spec:
       chart: podinfo
       version: '>=6.0.0 <7.0.0'
       sourceRef:
         kind: HelmRepository
         name: podinfo
-      interval: 1m
+      interval: 10m
   install:
     remediation:
       remediateLastFailure: true
+  uninstall:
+    keepHistory: true
   values:
     resources:
       requests:

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

@@ -3,15 +3,15 @@ kind: HelmRelease
 metadata:
   name: install-fail-retry
 spec:
-  interval: 5m
+  interval: 30s
   chart:
     spec:
       chart: podinfo
       version: '>=6.0.0 <7.0.0'
       sourceRef:
         kind: HelmRepository
         name: podinfo
-      interval: 1m
+      interval: 10m
   install:
     remediation:
       retries: 1

config/testdata/install-fail/helmrelease.yaml

@@ -3,15 +3,15 @@ kind: HelmRelease
 metadata:
   name: install-fail
 spec:
-  interval: 5m
+  interval: 30s
   chart:
     spec:
       chart: podinfo
       version: '>=6.0.0 <7.0.0'
       sourceRef:
         kind: HelmRepository
         name: podinfo
-      interval: 1m
+      interval: 10m
   values:
     resources:
       requests:

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

@@ -3,15 +3,15 @@ kind: HelmRelease
 metadata:
   name: install-test-fail-ignore
 spec:
-  interval: 5m
+  interval: 30s
   chart:
     spec:
       chart: podinfo
       version: '>=6.0.0 <7.0.0'
       sourceRef:
         kind: HelmRepository
         name: podinfo
-      interval: 1m
+      interval: 10m
   test:
     enable: true
     ignoreFailures: true

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

@@ -3,15 +3,15 @@ kind: HelmRelease
 metadata:
   name: install-test-fail
 spec:
-  interval: 5m
+  interval: 30s
   chart:
     spec:
       chart: podinfo
       version: '>=6.0.0 <7.0.0'
       sourceRef:
         kind: HelmRepository
         name: podinfo
-      interval: 1m
+      interval: 10m
   test:
     enable: true
   values:

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

@@ -3,15 +3,15 @@ kind: HelmRelease
 metadata:
   name: upgrade-fail-remediate-uninstall
 spec:
-  interval: 5m
+  interval: 30s
   chart:
     spec:
       chart: podinfo
       version: '>=6.0.0 <7.0.0'
       sourceRef:
         kind: HelmRepository
         name: podinfo
-      interval: 1m
+      interval: 10m
   values:
     resources:
       requests:

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

@@ -3,15 +3,15 @@ kind: HelmRelease
 metadata:
   name: upgrade-fail-remediate-uninstall
 spec:
-  interval: 5m
+  interval: 30s
   chart:
     spec:
       chart: podinfo
       version: '>=6.0.0 <7.0.0'
       sourceRef:
         kind: HelmRepository
         name: podinfo
-      interval: 1m
+      interval: 10m
   upgrade:
     remediation:
       remediateLastFailure: true

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

@@ -3,15 +3,15 @@ kind: HelmRelease
 metadata:
   name: upgrade-fail-remediate
 spec:
-  interval: 5m
+  interval: 30s
   chart:
     spec:
       chart: podinfo
       version: '>=6.0.0 <7.0.0'
       sourceRef:
         kind: HelmRepository
         name: podinfo
-      interval: 1m
+      interval: 10m
   values:
     resources:
       requests:

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

@@ -3,15 +3,15 @@ kind: HelmRelease
 metadata:
   name: upgrade-fail-remediate
 spec:
-  interval: 5m
+  interval: 30s
   chart:
     spec:
       chart: podinfo
       version: '>=6.0.0 <7.0.0'
       sourceRef:
         kind: HelmRepository
         name: podinfo
-      interval: 1m
+      interval: 10m
   upgrade:
     remediation:
       remediateLastFailure: true

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

@@ -3,15 +3,15 @@ kind: HelmRelease
 metadata:
   name: upgrade-fail-retry
 spec:
-  interval: 5m
+  interval: 30s
   chart:
     spec:
       chart: podinfo
       version: '>=6.0.0 <7.0.0'
       sourceRef:
         kind: HelmRepository
         name: podinfo
-      interval: 1m
+      interval: 10m
   values:
     resources:
       requests:

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

@@ -3,15 +3,15 @@ kind: HelmRelease
 metadata:
   name: upgrade-fail-retry
 spec:
-  interval: 5m
+  interval: 30s
   chart:
     spec:
       chart: podinfo
       version: '>=6.0.0 <7.0.0'
       sourceRef:
         kind: HelmRepository
         name: podinfo
-      interval: 1m
+      interval: 10m
   upgrade:
     remediation:
       retries: 1

config/testdata/upgrade-fail/install.yaml

@@ -3,15 +3,15 @@ kind: HelmRelease
 metadata:
   name: upgrade-fail
 spec:
-  interval: 5m
+  interval: 30s
   chart:
     spec:
       chart: podinfo
       version: '>=6.0.0 <7.0.0'
       sourceRef:
         kind: HelmRepository
         name: podinfo
-      interval: 1m
+      interval: 10m
   values:
     resources:
       requests:

config/testdata/upgrade-fail/upgrade.yaml

@@ -3,15 +3,15 @@ kind: HelmRelease
 metadata:
   name: upgrade-fail
 spec:
-  interval: 5m
+  interval: 30s
   chart:
     spec:
       chart: podinfo
       version: '>=6.0.0 <7.0.0'
       sourceRef:
         kind: HelmRepository
         name: podinfo
-      interval: 1m
+      interval: 10m
   values:
     resources:
       requests:

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

@@ -3,15 +3,15 @@ kind: HelmRelease
 metadata:
   name: upgrade-test-fail
 spec:
-  interval: 5m
+  interval: 30s
   chart:
     spec:
       chart: podinfo
       version: '>=6.0.0 <7.0.0'
       sourceRef:
         kind: HelmRepository
         name: podinfo
-      interval: 1m
+      interval: 10m
   values:
     resources:
       requests:

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

@@ -3,15 +3,15 @@ kind: HelmRelease
 metadata:
   name: upgrade-test-fail
 spec:
-  interval: 5m
+  interval: 30s
   chart:
     spec:
       chart: podinfo
       version: '>=6.0.0 <7.0.0'
       sourceRef:
         kind: HelmRepository
         name: podinfo
-      interval: 1m
+      interval: 10m
   test:
     enable: true
   values:

config/testdata/valuesfrom/helmrelease.yaml

@@ -11,7 +11,7 @@ spec:
       sourceRef:
         kind: HelmRepository
         name: podinfo
-      interval: 1m
+      interval: 10m
   valuesFrom:
     - kind: ConfigMap
       name: valuesfrom-config