diff --git a/.vib/mariadb/ginkgo/mariadb_test.go b/.vib/mariadb/ginkgo/mariadb_test.go index 714c0e66c4..2b7730899a 100644 --- a/.vib/mariadb/ginkgo/mariadb_test.go +++ b/.vib/mariadb/ginkgo/mariadb_test.go @@ -10,6 +10,7 @@ import ( . "github.com/onsi/gomega" appsv1 "k8s.io/api/apps/v1" batchv1 "k8s.io/api/batch/v1" + v1 "k8s.io/api/core/v1" metav1 "k8s.io/apimachinery/pkg/apis/meta/v1" "k8s.io/client-go/kubernetes" ) @@ -34,6 +35,7 @@ var _ = Describe("MariaDB", Ordered, func() { It("should have access to the created database", func() { getAvailableReplicas := func(ss *appsv1.StatefulSet) int32 { return ss.Status.AvailableReplicas } + getRestartedAtAnnotation := func(pod *v1.Pod) string { return pod.Annotations["kubectl.kubernetes.io/restartedAt"] } getSucceededJobs := func(j *batchv1.Job) int32 { return j.Status.Succeeded } getOpts := metav1.GetOptions{} @@ -70,18 +72,15 @@ var _ = Describe("MariaDB", Ordered, func() { return c.BatchV1().Jobs(namespace).Get(ctx, createDBJobName, getOpts) }, timeout, PollingInterval).Should(WithTransform(getSucceededJobs, Equal(int32(1)))) - By("scaling down to 0 replicas") - ss, err = utils.StsScale( - ctx, c, ss, 0) + By("rollout restart the statefulset") + _, err = utils.StsRolloutRestart(ctx, c, ss) Expect(err).NotTo(HaveOccurred()) - Eventually(func() (*appsv1.StatefulSet, error) { - return c.AppsV1().StatefulSets(namespace).Get(ctx, stsName, getOpts) - }, timeout, PollingInterval).Should(WithTransform(getAvailableReplicas, BeZero())) - - By("scaling up to the original replicas") - ss, err = utils.StsScale(ctx, c, ss, origReplicas) - Expect(err).NotTo(HaveOccurred()) + for i := int(origReplicas) - 1; i >= 0; i-- { + Eventually(func() (*v1.Pod, error) { + return c.CoreV1().Pods(namespace).Get(ctx, fmt.Sprintf("%s-%d", stsName, i), getOpts) + }, timeout, PollingInterval).Should(WithTransform(getRestartedAtAnnotation, Not(BeEmpty()))) + } Eventually(func() (*appsv1.StatefulSet, error) { return c.AppsV1().StatefulSets(namespace).Get(ctx, stsName, getOpts) diff --git a/bitnami/mariadb/CHANGELOG.md b/bitnami/mariadb/CHANGELOG.md index 17845b2354..77b5aabc72 100644 --- a/bitnami/mariadb/CHANGELOG.md +++ b/bitnami/mariadb/CHANGELOG.md @@ -1,8 +1,12 @@ # Changelog -## 19.0.5 (2024-08-26) +## 19.0.6 (2024-09-17) -* [bitnami/mariadb] Fix deprecation warnings in checks ([#29021](https://github.com/bitnami/charts/pull/29021)) +* [bitnami/mariadb] test: :white_check_mark: Improve reliability of ginkgo tests ([#29467](https://github.com/bitnami/charts/pull/29467)) + +## 19.0.5 (2024-08-27) + +* [bitnami/mariadb] Fix deprecation warnings in checks (#29021) ([213786f](https://github.com/bitnami/charts/commit/213786f3f87836b41e2e70fcedd007f08a4a012f)), closes [#29021](https://github.com/bitnami/charts/issues/29021) ## 19.0.4 (2024-08-14) diff --git a/bitnami/mariadb/Chart.yaml b/bitnami/mariadb/Chart.yaml index f4227c02d1..49c0207f37 100644 --- a/bitnami/mariadb/Chart.yaml +++ b/bitnami/mariadb/Chart.yaml @@ -34,4 +34,4 @@ maintainers: name: mariadb sources: - https://github.com/bitnami/charts/tree/main/bitnami/mariadb -version: 19.0.5 +version: 19.0.6