Skip to content

Commit 42faf54

Browse files
authored
test(e2e): drop readiness asserts that HelmRelease Ready already covers (#4652)
## What this PR does Removes e2e asserts that wait for something an earlier assert in the same test already proves. First step of [#2653](#2653), not the whole issue. qdrant and external-dns render the workload in a nested `-system` HelmRelease, and both suites already assert that HelmRelease Ready. The `readyReplicas: 1` on the StatefulSet and the Deployments goes, the instance-label pin stays because the catch collectors select on it. I checked on a dev cluster that a parent HelmRelease waits for its nested one (a Qdrant with a broken `storageClass` kept the parent in `Progressing` until its install timeout, then it failed naming the nested HelmRelease), details in [this comment](#2653 (comment)). vminstance: both PVC `Bound` asserts follow a DataVolume `Ready` assert, and a DataVolume is not Ready before its PVC is Bound. Left alone on purpose: the qdrant PVC assert (the reclaim-on-delete step only proves anything if the PVC was seen first, same in kafka), openbao sts and PVC (they run after unseal), operator-created workloads, and the Service and Endpoints shape checks. Chainsaw isn't installed on my machine, so the suites are checked by CI only. ### Screenshots No UI changes. ### Downstream repositories The diff only edits `hack/e2e-chainsaw/*/chainsaw-test.yaml`. The trigger map's `hack/` entry is for cozystack/ccp, whose skills anchor on `hack/package.mk`, `hack/common-envs.mk` and `make generate`, none of which change here. No box ticked. - [ ] No downstream repository is affected by this change - [ ] [cozystack/website](https://github.com/cozystack/website) - follow-up: - [ ] [cozystack/terraform-provider-cozystack](https://github.com/cozystack/terraform-provider-cozystack) - follow-up: - [ ] [cozystack/ansible-cozystack](https://github.com/cozystack/ansible-cozystack) - follow-up: - [ ] [cozystack/ccp](https://github.com/cozystack/ccp) - follow-up: - [ ] [cozystack/talm](https://github.com/cozystack/talm) - follow-up: - [ ] [cozystack/cozyhr](https://github.com/cozystack/cozyhr) - follow-up: - [ ] [cozystack/cozy-proxy](https://github.com/cozystack/cozy-proxy) - follow-up: - [ ] [cozystack/cozystack-telemetry-server](https://github.com/cozystack/cozystack-telemetry-server) - follow-up: - [ ] [cozystack/external-apps-example](https://github.com/cozystack/external-apps-example) - follow-up: - [ ] [cozystack/examples](https://github.com/cozystack/examples) - follow-up: - [ ] [cozystack/community](https://github.com/cozystack/community) - follow-up: ### Release note ```release-note test(e2e): the qdrant, external-dns and vminstance suites no longer repeat readiness checks that the HelmRelease Ready assert already covers. ``` <!-- This is an auto-generated comment: release notes by coderabbit.ai --> ## Summary by CodeRabbit * **Tests** * Updated end-to-end checks to use Helm release readiness for Deployment and StatefulSet scenarios, rather than separately asserting ready replica counts. * Removed the requirement for PersistentVolumeClaims to reach `Bound` in the VMDisk and VMInstance scenarios; DataVolume readiness checks remain. * Retained instance-label checks and clarified that PVC reclaim validation requires the claim to be observed first. <!-- end of auto-generated comment: release notes by coderabbit.ai -->
2 parents 89c7ea0 + 7fe7135 commit 42faf54

3 files changed

Lines changed: 8 additions & 25 deletions

File tree

‎hack/e2e-chainsaw/external-dns/chainsaw-test.yaml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -48,11 +48,11 @@ spec:
4848
resource:
4949
apiVersion: apps/v1
5050
kind: Deployment
51+
# Readiness is covered by the test-system HelmRelease above, so this only
52+
# checks the Deployment carries the nested release's instance label.
5153
metadata:
5254
labels:
5355
app.kubernetes.io/instance: test-system
54-
status:
55-
readyReplicas: 1
5656
---
5757
apiVersion: chainsaw.kyverno.io/v1alpha1
5858
kind: Test
@@ -100,8 +100,8 @@ spec:
100100
resource:
101101
apiVersion: apps/v1
102102
kind: Deployment
103+
# Readiness is covered by the test-prefix-system HelmRelease above, so this
104+
# only checks the Deployment carries the nested release's instance label.
103105
metadata:
104106
labels:
105107
app.kubernetes.io/instance: test-prefix-system
106-
status:
107-
readyReplicas: 1

‎hack/e2e-chainsaw/qdrant/chainsaw-test.yaml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,13 +105,14 @@ spec:
105105
name: qdrant-test
106106
# Pins the label the catch collector selects on. Asserts are subset
107107
# matches, so this costs nothing and turns a silent drift of the
108-
# instance label into a red step instead of an empty capture.
108+
# instance label into a red step instead of an empty capture. Readiness
109+
# is covered by the qdrant-test-system HelmRelease above.
109110
spec:
110111
selector:
111112
matchLabels:
112113
app.kubernetes.io/instance: qdrant-test-system
113-
status:
114-
readyReplicas: 1
114+
# Stays: the reclaim step below only proves the PVC was reclaimed if it was
115+
# seen here first, an `error` on a PVC that never existed passes as well.
115116
- assert:
116117
timeout: 2m
117118
resource:

‎hack/e2e-chainsaw/vminstance/chainsaw-test.yaml‎

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -40,15 +40,6 @@ spec:
4040
status:
4141
(conditions[?type == 'Ready']):
4242
- status: "True"
43-
- assert:
44-
timeout: 4m
45-
resource:
46-
apiVersion: v1
47-
kind: PersistentVolumeClaim
48-
metadata:
49-
name: vm-disk-test
50-
status:
51-
phase: Bound
5243
---
5344
apiVersion: chainsaw.kyverno.io/v1alpha1
5445
kind: Test
@@ -90,15 +81,6 @@ spec:
9081
status:
9182
(conditions[?type == 'Ready']):
9283
- status: "True"
93-
- assert:
94-
timeout: 4m
95-
resource:
96-
apiVersion: v1
97-
kind: PersistentVolumeClaim
98-
metadata:
99-
name: vm-disk-vmi-test
100-
status:
101-
phase: Bound
10284
- name: create-vminstance
10385
try:
10486
- apply:

0 commit comments

Comments
 (0)