mirror of
https://github.com/cozystack/cozystack.git
synced 2026-11-21 12:13:55 +09:00
test(clickhouse): delete the round-trip's TLS Secret in its own step's cleanup
Chainsaw applied the Certificate, so the scripted delete of it in the run step's finally was hand-rolled teardown of a resource Chainsaw already reclaims. Chainsaw deletes a step's applied resources, waiting for them to go, before it runs that step's cleanup operations, which puts the Secret's delete after the Certificate's without any ordering written into a script. Assisted-by: LLM Signed-off-by: Alexey Artamonov <aleksei.artamonov@aenix.io>
This commit is contained in:
1 parent
6e23bd5629
commit
28f3613450
2 files changed
+29
-24
No files matched your search
@@ -181,24 +181,24 @@ STUBEOF
|
||||
}
|
||||
|
||||
# cert-manager issues the Secret of a Certificate that still exists again as
|
||||
# soon as it is deleted, so the Certificate has to go first or its Secret
|
||||
# outlives the run.
|
||||
@test "the round-trip cleanup deletes the Certificate before its Secret" {
|
||||
script=$(yq 'select(.metadata.name == "clickhouse-3-system-bucket-roundtrip") | .spec.steps[]
|
||||
| select(.name == "run") | .finally[]
|
||||
| select(.description == "system-bucket round-trip cleanup") | .script.content' \
|
||||
hack/e2e-chainsaw/clickhouse/chainsaw-test.yaml)
|
||||
[ -n "$script" ] || { echo "the run step has no system-bucket round-trip cleanup" >&2; false; }
|
||||
cat >"$STUB/kubectl" <<'STUBEOF'
|
||||
#!/bin/bash
|
||||
echo "$*" >>"$STUB/calls"
|
||||
STUBEOF
|
||||
PATH="$STUB:$PATH" NAMESPACE=tenant-root sh -c "$script"
|
||||
cert=$(grep -nE '^-n tenant-root delete certificate e2e-system-bucket-s3( |$)' "$STUB/calls" | cut -d: -f1)
|
||||
secret=$(grep -nE '^-n tenant-root delete secret e2e-system-bucket-s3-tls( |$)' "$STUB/calls" | cut -d: -f1)
|
||||
[ -n "$cert" ] && [ -n "$secret" ] && [ "$cert" -lt "$secret" ] || {
|
||||
echo "the cleanup does not delete Certificate e2e-system-bucket-s3 before Secret e2e-system-bucket-s3-tls; kubectl calls:" >&2
|
||||
cat "$STUB/calls" >&2
|
||||
# soon as it is deleted. Chainsaw deletes the Certificate it applied, and waits
|
||||
# for it, before it runs the cleanup ops of the same step, so the Secret is
|
||||
# deleted there and nowhere earlier.
|
||||
@test "the Certificate's Secret is deleted after Chainsaw deletes the Certificate" {
|
||||
test='select(.metadata.name == "clickhouse-3-system-bucket-roundtrip") | .spec.steps[]'
|
||||
suite=hack/e2e-chainsaw/clickhouse/chainsaw-test.yaml
|
||||
applies=$(yq "$test | select(.name == \"create-certificate-and-probe\") | .try[] | select(has(\"apply\")) | .apply.file" "$suite")
|
||||
[ "$applies" = system-bucket-tls.yaml ] || {
|
||||
echo "step create-certificate-and-probe no longer applies system-bucket-tls.yaml alone: $applies" >&2
|
||||
false
|
||||
}
|
||||
deletes=$(yq -o=json -I=0 "$test | select(.name == \"create-certificate-and-probe\") | .cleanup" "$suite")
|
||||
[ "$deletes" = '[{"delete":{"ref":{"apiVersion":"v1","kind":"Secret","name":"e2e-system-bucket-s3-tls"}}}]' ] || {
|
||||
echo "the cleanup of step create-certificate-and-probe is not the one delete of Secret e2e-system-bucket-s3-tls: $deletes" >&2
|
||||
false
|
||||
}
|
||||
if yq "$test | (.try[], .finally[]?) | .script.content // \"\"" "$suite" | grep -qE 'delete +(secret +e2e-system-bucket-s3-tls|certificate +e2e-system-bucket-s3)( |$)'; then
|
||||
echo "a step script deletes the Certificate or its Secret while Chainsaw still holds the Certificate" >&2
|
||||
false
|
||||
fi
|
||||
}
|
||||
@@ -485,6 +485,16 @@ spec:
|
||||
status:
|
||||
(conditions[?type == 'Ready']):
|
||||
- status: "True"
|
||||
# The Certificate's Secret carries no owner reference, so it outlives the
|
||||
# Certificate, and cert-manager issues it again while the Certificate
|
||||
# exists. Chainsaw runs a step's cleanup ops after this step's cleaner has
|
||||
# deleted the Certificate and waited for it.
|
||||
cleanup:
|
||||
- delete:
|
||||
ref:
|
||||
apiVersion: v1
|
||||
kind: Secret
|
||||
name: e2e-system-bucket-s3-tls
|
||||
|
||||
- name: create-clickhouse
|
||||
try:
|
||||
@@ -559,12 +569,9 @@ spec:
|
||||
'
|
||||
# Chainsaw did not apply these: the jobs come from the script and the
|
||||
# Backup from the controller, and deleting a BackupJob reclaims no Backup.
|
||||
# The Certificate's Secret outlives the Certificate, and cert-manager
|
||||
# issues it again while the Certificate exists, so the Certificate goes
|
||||
# first rather than at Chainsaw's cleanup after this finally.
|
||||
- description: system-bucket round-trip cleanup
|
||||
script:
|
||||
timeout: 4m
|
||||
timeout: 3m
|
||||
content: |
|
||||
set -eu
|
||||
kubectl -n "$NAMESPACE" delete restorejob sysbucket-restore --ignore-not-found --wait=true --timeout=30s
|
||||
@@ -572,5 +579,3 @@ spec:
|
||||
# The driver names the Backup after the BackupJob; by name it is
|
||||
# found even when status.backupRef was never written.
|
||||
kubectl -n "$NAMESPACE" delete backup sysbucket-backup --ignore-not-found --wait=true --timeout=60s
|
||||
kubectl -n "$NAMESPACE" delete certificate e2e-system-bucket-s3 --ignore-not-found --wait=true --timeout=30s
|
||||
kubectl -n "$NAMESPACE" delete secret e2e-system-bucket-s3-tls --ignore-not-found --wait=true --timeout=30s
|
||||
Reference in new issue
Block a user