[Backport release-1.3] fix(kafka): remove ZooKeeper PVCs on uninstall (#2706)

# Description
Backport of #2679 to `release-1.3`.
This commit is contained in:
myasnikovdaniil authored and GitHub committed 2026-05-21 11:38:49 +05:00
commit a7ce0cf53a
2 files changed
+9 -4

No files matched your search

+8 -3
View File
@@ -44,10 +44,15 @@ EOF
kubectl wait kafkas -n tenant-test test --timeout=300s --for=condition=ready
timeout 60 sh -ec "until kubectl -n tenant-test get pvc data-kafka-$name-zookeeper-0; do sleep 10; done"
kubectl -n tenant-test wait pvc data-kafka-$name-zookeeper-0 --timeout=50s --for=jsonpath='{.status.phase}'=Bound
timeout 60 sh -ec "until kubectl -n tenant-test get pvc data-kafka-$name-zookeeper-1 >/dev/null 2>&1; do sleep 2; done"
kubectl -n tenant-test wait pvc data-kafka-$name-zookeeper-1 --timeout=50s --for=jsonpath='{.status.phase}'=Bound
timeout 40 sh -ec "until kubectl -n tenant-test get svc kafka-$name-zookeeper-client -o jsonpath='{.spec.ports[0].port}' | grep -q '2181'; do sleep 10; done"
timeout 40 sh -ec "until kubectl -n tenant-test get svc kafka-$name-zookeeper-nodes -o jsonpath='{.spec.ports[*].port}' | grep -q '2181 2888 3888'; do sleep 10; done"
timeout 80 sh -ec "until kubectl -n tenant-test get endpoints kafka-$name-zookeeper-nodes -o jsonpath='{.subsets[*].addresses[0].ip}' | grep -q '[0-9]'; do sleep 10; done"
kubectl -n tenant-test delete kafka.apps.cozystack.io $name
kubectl -n tenant-test delete pvc data-kafka-$name-zookeeper-0
kubectl -n tenant-test delete pvc data-kafka-$name-zookeeper-1
kubectl -n tenant-test delete kafka.apps.cozystack.io $name --timeout=2m
# Strimzi reclaims ZooKeeper PVCs automatically when deleteClaim is true on
# the persistent-claim storage. Verify they disappear instead of issuing a
# manual kubectl delete, which would mask a regression in the operator.
timeout 60 sh -ec "while kubectl -n tenant-test get pvc data-kafka-$name-zookeeper-0 >/dev/null 2>&1; do sleep 2; done"
timeout 60 sh -ec "while kubectl -n tenant-test get pvc data-kafka-$name-zookeeper-1 >/dev/null 2>&1; do sleep 2; done"
}
+1 -1
View File
@@ -73,7 +73,7 @@ spec:
{{- with .Values.kafka.storageClass }}
class: {{ . }}
{{- end }}
deleteClaim: false
deleteClaim: true
metricsConfig:
type: jmxPrometheusExporter
valueFrom: