From b9f92f78e41e60421b23405946e4496de9cc419e Mon Sep 17 00:00:00 2001 From: Tarun Pothulapati Date: Tue, 22 Oct 2024 12:27:55 +0530 Subject: [PATCH 1/2] feat(dragonfly): Bump version to v1.24.0 --- e2e/dragonfly_controller_test.go | 2 +- internal/resources/version.go | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/e2e/dragonfly_controller_test.go b/e2e/dragonfly_controller_test.go index 4b8d22f..1d6d60d 100644 --- a/e2e/dragonfly_controller_test.go +++ b/e2e/dragonfly_controller_test.go @@ -305,7 +305,7 @@ var _ = Describe("Dragonfly Lifecycle tests", Ordered, FlakeAttempts(3), func() }, &df) Expect(err).To(BeNil()) - df.Spec.Image = fmt.Sprintf("%s:%s", resources.DragonflyImage, "v1.21.2") + df.Spec.Image = fmt.Sprintf("%s:%s", resources.DragonflyImage, "v1.23.2") err = k8sClient.Update(ctx, &df) Expect(err).To(BeNil()) }) diff --git a/internal/resources/version.go b/internal/resources/version.go index 623d183..2836604 100644 --- a/internal/resources/version.go +++ b/internal/resources/version.go @@ -17,5 +17,5 @@ limitations under the License. package resources const ( - Version = "v1.21.2" + Version = "v1.24.0" ) From 3d4e576eecc557fde2f7f2d7b6fde95c5d7b8cf8 Mon Sep 17 00:00:00 2001 From: Abhradeep Chakraborty Date: Sat, 9 Nov 2024 20:19:23 +0530 Subject: [PATCH 2/2] fix test Signed-off-by: Abhradeep Chakraborty --- e2e/dragonfly_controller_test.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/e2e/dragonfly_controller_test.go b/e2e/dragonfly_controller_test.go index 1d6d60d..239775b 100644 --- a/e2e/dragonfly_controller_test.go +++ b/e2e/dragonfly_controller_test.go @@ -613,8 +613,8 @@ user john on #0c8e2b662f1c0f1 -@all +@string +hset Expect(err).To(BeNil()) Expect(result).To(HaveLen(2)) Expect(result).To(ContainElements( - "user default on nopass ~* +@all", - "user john on #0c8e2b662f1c0f -@all +@string +hset", + "user default on nopass ~* resetchannels +@all", + "user john on #0c8e2b662f1c0f resetchannels -@all +@string +hset", )) }) It("Cleanup", func() {