From 59a6918eeace2e862d5484cefc2a4d71d5601702 Mon Sep 17 00:00:00 2001 From: Lukasz Raczylo Date: Thu, 18 Dec 2025 01:46:18 +0000 Subject: [PATCH] fixup! fixup! fixup! fixup! fixup! More fixes, moving from python to golang worker. --- .../clusterimage_controller_test.go | 49 ++++++++++++++++--- .../clusterimageexport_controller_test.go | 18 ++++--- 2 files changed, 54 insertions(+), 13 deletions(-) diff --git a/internal/controller/raczylo.com/clusterimage_controller_test.go b/internal/controller/raczylo.com/clusterimage_controller_test.go index 1cae439..0acba9a 100644 --- a/internal/controller/raczylo.com/clusterimage_controller_test.go +++ b/internal/controller/raczylo.com/clusterimage_controller_test.go @@ -33,38 +33,73 @@ import ( var _ = Describe("ClusterImage Controller", func() { Context("When reconciling a resource", func() { const resourceName = "test-resource" + const exportName = "test-export" ctx := context.Background() typeNamespacedName := types.NamespacedName{ Name: resourceName, - Namespace: "default", // TODO(user):Modify as needed + Namespace: "default", + } + exportNamespacedName := types.NamespacedName{ + Name: exportName, + Namespace: "default", } clusterimage := &raczylocomv1.ClusterImage{} BeforeEach(func() { + By("creating the ClusterImageExport that the ClusterImage references") + export := &raczylocomv1.ClusterImageExport{} + err := k8sClient.Get(ctx, exportNamespacedName, export) + if err != nil && errors.IsNotFound(err) { + exportResource := &raczylocomv1.ClusterImageExport{ + ObjectMeta: metav1.ObjectMeta{ + Name: exportName, + Namespace: "default", + }, + Spec: raczylocomv1.ClusterImageExportSpec{ + Name: exportName, + BasePath: "/backups/test", + MaxConcurrentJobs: 1, + Storage: raczylocomv1.ClusterImageStorageSpec{ + StorageTarget: "FILE", + }, + }, + } + Expect(k8sClient.Create(ctx, exportResource)).To(Succeed()) + } + By("creating the custom resource for the Kind ClusterImage") - err := k8sClient.Get(ctx, typeNamespacedName, clusterimage) + err = k8sClient.Get(ctx, typeNamespacedName, clusterimage) if err != nil && errors.IsNotFound(err) { resource := &raczylocomv1.ClusterImage{ ObjectMeta: metav1.ObjectMeta{ Name: resourceName, Namespace: "default", }, - // TODO(user): Specify other spec details if needed. + Spec: raczylocomv1.ClusterImageSpec{ + ExportName: exportName, + Image: "nginx:latest", + }, } Expect(k8sClient.Create(ctx, resource)).To(Succeed()) } }) AfterEach(func() { - // TODO(user): Cleanup logic after each test, like removing the resource instance. + By("Cleanup the specific resource instance ClusterImage") resource := &raczylocomv1.ClusterImage{} err := k8sClient.Get(ctx, typeNamespacedName, resource) - Expect(err).NotTo(HaveOccurred()) + if err == nil { + Expect(k8sClient.Delete(ctx, resource)).To(Succeed()) + } - By("Cleanup the specific resource instance ClusterImage") - Expect(k8sClient.Delete(ctx, resource)).To(Succeed()) + By("Cleanup the ClusterImageExport") + export := &raczylocomv1.ClusterImageExport{} + err = k8sClient.Get(ctx, exportNamespacedName, export) + if err == nil { + Expect(k8sClient.Delete(ctx, export)).To(Succeed()) + } }) It("should successfully reconcile the resource", func() { By("Reconciling the created resource") diff --git a/internal/controller/raczylo.com/clusterimageexport_controller_test.go b/internal/controller/raczylo.com/clusterimageexport_controller_test.go index 433b14f..5ea9a49 100644 --- a/internal/controller/raczylo.com/clusterimageexport_controller_test.go +++ b/internal/controller/raczylo.com/clusterimageexport_controller_test.go @@ -51,20 +51,26 @@ var _ = Describe("ClusterImageExport Controller", func() { Name: resourceName, Namespace: "default", }, - // TODO(user): Specify other spec details if needed. + Spec: raczylocomv1.ClusterImageExportSpec{ + Name: resourceName, + BasePath: "/backups/test", + MaxConcurrentJobs: 1, + Storage: raczylocomv1.ClusterImageStorageSpec{ + StorageTarget: "FILE", + }, + }, } Expect(k8sClient.Create(ctx, resource)).To(Succeed()) } }) AfterEach(func() { - // TODO(user): Cleanup logic after each test, like removing the resource instance. + By("Cleanup the specific resource instance ClusterImageExport") resource := &raczylocomv1.ClusterImageExport{} err := k8sClient.Get(ctx, typeNamespacedName, resource) - Expect(err).NotTo(HaveOccurred()) - - By("Cleanup the specific resource instance ClusterImageExport") - Expect(k8sClient.Delete(ctx, resource)).To(Succeed()) + if err == nil { + Expect(k8sClient.Delete(ctx, resource)).To(Succeed()) + } }) It("should successfully reconcile the resource", func() { By("Reconciling the created resource")