From 6faa83c856fb6e4683aebcb27329308bc945944e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Javier=20J=2E=20Salmer=C3=B3n-Garc=C3=ADa?= Date: Tue, 24 Oct 2023 13:44:30 +0200 Subject: [PATCH] [bitnami/*] test: :white_check_mark: Fix race condition in ginkgo utils (#20376) * [bitnami/*] test: :white_check_mark: Fix race condition in ginkgo utils Signed-off-by: Javier Salmeron Garcia * fix: :bug: Add missing test in dplScale Signed-off-by: Javier Salmeron Garcia --------- Signed-off-by: Javier Salmeron Garcia --- .vib/common-tests/ginkgo-utils/k8s.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.vib/common-tests/ginkgo-utils/k8s.go b/.vib/common-tests/ginkgo-utils/k8s.go index ddb5ae2ebe..0849dab6ca 100644 --- a/.vib/common-tests/ginkgo-utils/k8s.go +++ b/.vib/common-tests/ginkgo-utils/k8s.go @@ -48,7 +48,7 @@ func StsScale(ctx context.Context, c kubernetes.Interface, ss *appsv1.StatefulSe if err != nil { return nil, fmt.Errorf("failed to get statefulset %q: %v", name, err) } - if ss.Status.Replicas == count { + if ss.Status.Replicas == count && ss.Status.AvailableReplicas == count { return ss, nil } *(ss.Spec.Replicas) = count @@ -89,7 +89,7 @@ func DplScale(ctx context.Context, c kubernetes.Interface, dpl *appsv1.Deploymen if err != nil { return nil, fmt.Errorf("failed to get deployment %q: %v", name, err) } - if currentDpl.Status.Replicas == count { + if currentDpl.Status.Replicas == count && currentDpl.Status.AvailableReplicas == count { return currentDpl, nil } *(currentDpl.Spec.Replicas) = count