Fix/controller tests (#41)

* chore: reenable tests * fix: Wrap get in eventually * Fix: Found the culprits Eventually * chore: Add empty readme * chore: fix issues with golangcilint Signed-off-by: Lennard Eijsackers <lennardeijsackers92@gmail.com> * fix: Manually install kubebuilder from correct URL. see: kubernetes-sigs/kubebuilder#2311 Signed-off-by: Lennard Eijsackers <lennardeijsackers92@gmail.com>
DataWorkz-NL · Aug 23, 2021 · f1f8875 · f1f8875
1 parent 2be54e5
commit f1f8875
Show file tree

Hide file tree

Showing 4 changed files with 75 additions and 65 deletions.
diff --git a/.github/workflows/branch.yml b/.github/workflows/branch.yml
@@ -28,8 +28,10 @@ jobs:
       - name: Setup GO
         uses: actions/setup-go@v2
       - name: Install Kubebuilder
-        uses: RyanSiu1995/kubebuilder-action@v1.2
-        with:
-          version: 2.3.1
+        run: |
+          os=$(go env GOOS)
+          arch=$(go env GOARCH)
+          curl -L https://github.com/kubernetes-sigs/kubebuilder/releases/download/v2.3.1/kubebuilder_2.3.1_${os}_${arch}.tar.gz | tar -xz -C /tmp/
+          sudo mv /tmp/kubebuilder_2.3.1_${os}_${arch} /usr/local/kubebuilder
       - name: Run Tests
         run: make test
diff --git a/README.md b/README.md
@@ -0,0 +1 @@
+# KubeETL
diff --git a/controllers/dataset_controller_test.go b/controllers/dataset_controller_test.go
@@ -18,56 +18,6 @@ import (
 var _ = Describe("DataSetReconciler", func() {
 	const timeout = time.Second * 5
 	const interval = time.Second * 1
-	var wfKey types.NamespacedName
-	var argoWfKey types.NamespacedName
-	var argoWf wfv1.Workflow
-
-	BeforeEach(func() {
-		ctx := context.Background()
-
-		wfKey = types.NamespacedName{
-			Name:      "default-workflow",
-			Namespace: "default",
-		}
-
-		wfSpec := api.WorkflowSpec{
-			ArgoWorkflowSpec: wfv1.WorkflowSpec{},
-		}
-
-		wf := api.Workflow{
-			ObjectMeta: metav1.ObjectMeta{
-				Name:      wfKey.Name,
-				Namespace: wfKey.Namespace,
-			},
-			Spec: wfSpec,
-		}
-
-		Expect(k8sClient.Create(ctx, &wf)).Should(Succeed())
-
-		argoWfKey = types.NamespacedName{
-			Name:      "default-argo-workflow",
-			Namespace: "default",
-		}
-		argoWfSpec := wfv1.WorkflowSpec{}
-
-		argoWf = wfv1.Workflow{
-			ObjectMeta: metav1.ObjectMeta{
-				Name:      argoWfKey.Name,
-				Namespace: argoWfKey.Namespace,
-			},
-			Spec: argoWfSpec,
-		}
-		Expect(k8sClient.Create(ctx, &argoWf)).Should(Succeed())
-	})
-
-	AfterEach(func() {
-		var wf api.Workflow
-		ctx := context.Background()
-		Expect(k8sClient.Get(ctx, wfKey, &wf)).Should(Succeed())
-		Expect(k8sClient.Delete(ctx, &wf)).Should(Succeed())
-		Expect(k8sClient.Get(ctx, argoWfKey, &argoWf)).Should(Succeed())
-		Expect(k8sClient.Delete(ctx, &argoWf)).Should(Succeed())
-	})
 
 	Context("DataSet with Unknown HealthCheck", func() {
 		It("Should set DataSet health to Unknown for a unknown Workflow", func() {
@@ -111,6 +61,57 @@ var _ = Describe("DataSetReconciler", func() {
 	})
 
 	Context("Dataset with Known HealthCheck", func() {
+		var wfKey types.NamespacedName
+		var argoWfKey types.NamespacedName
+		var argoWf wfv1.Workflow
+
+		BeforeEach(func() {
+			ctx := context.Background()
+
+			wfKey = types.NamespacedName{
+				Name:      "default-workflow",
+				Namespace: "default",
+			}
+
+			wfSpec := api.WorkflowSpec{
+				ArgoWorkflowSpec: wfv1.WorkflowSpec{},
+			}
+
+			wf := api.Workflow{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      wfKey.Name,
+					Namespace: wfKey.Namespace,
+				},
+				Spec: wfSpec,
+			}
+
+			Expect(k8sClient.Create(ctx, &wf)).Should(Succeed())
+
+			argoWfKey = types.NamespacedName{
+				Name:      "default-argo-workflow",
+				Namespace: "default",
+			}
+			argoWfSpec := wfv1.WorkflowSpec{}
+
+			argoWf = wfv1.Workflow{
+				ObjectMeta: metav1.ObjectMeta{
+					Name:      argoWfKey.Name,
+					Namespace: argoWfKey.Namespace,
+				},
+				Spec: argoWfSpec,
+			}
+			Expect(k8sClient.Create(ctx, &argoWf)).Should(Succeed())
+		})
+
+		AfterEach(func() {
+			var wf api.Workflow
+			ctx := context.Background()
+			Expect(k8sClient.Get(ctx, wfKey, &wf)).Should(Succeed())
+			Expect(k8sClient.Delete(ctx, &wf)).Should(Succeed())
+			Expect(k8sClient.Get(ctx, argoWfKey, &argoWf)).Should(Succeed())
+			Expect(k8sClient.Delete(ctx, &argoWf)).Should(Succeed())
+		})
+
 		It("Should use an existing Workflow as DataSet healthcheck indicator", func() {
 			ctx := context.Background()
 			key := types.NamespacedName{
@@ -138,22 +139,26 @@ var _ = Describe("DataSetReconciler", func() {
 			Expect(k8sClient.Create(ctx, &created)).Should(Succeed())
 
 			By("Setting the DataSet Healthcheck label on the WorkFlow")
-			EventuallyWithOffset(5, func() bool {
+			Eventually(func() bool {
 				res := &api.Workflow{}
 				err := k8sClient.Get(ctx, wfKey, res)
 				if err != nil {
 					return false
 				}
 
 				return labels.HasLabel(res.Labels, healthcheckLabel)
-			}, timeout, interval)
+			}, timeout, interval).Should(BeTrue())
 
 			By("Updating the status if the workflow executed")
 			// First fake Workflow controller behaviour
 			argoWf.Status.Phase = wfv1.NodeFailed
 			wf := &api.Workflow{}
 			Expect(k8sClient.Update(ctx, &argoWf)).Should(Succeed())
-			Expect(k8sClient.Get(ctx, wfKey, wf)).Should(Succeed())
+
+			Eventually(func() bool {
+				err := k8sClient.Get(ctx, wfKey, wf)
+				return err == nil
+			}).Should(BeTrue())
 			wf.Status.ArgoWorkflowRef = &corev1.ObjectReference{
 				Name:      argoWfKey.Name,
 				Namespace: argoWfKey.Namespace,

diff --git a/controllers/suite_test.go b/controllers/suite_test.go
@@ -13,15 +13,18 @@ limitations under the License.
 package controllers
 
 import (
+	"path/filepath"
+	"testing"
+
 	wfv1 "github.com/argoproj/argo/v2/pkg/apis/workflow/v1alpha1"
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
 	"k8s.io/client-go/kubernetes/scheme"
 	"k8s.io/client-go/rest"
-	"path/filepath"
 	ctrl "sigs.k8s.io/controller-runtime"
 	"sigs.k8s.io/controller-runtime/pkg/client"
 	"sigs.k8s.io/controller-runtime/pkg/envtest"
+	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
 	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 
 	apiv1alpha1 "github.com/dataworkz/kubeetl/api/v1alpha1"
@@ -35,14 +38,13 @@ var cfg *rest.Config
 var k8sClient client.Client
 var testEnv *envtest.Environment
 
-// TODO: commented because test are failing
-//func TestAPIs(t *testing.T) {
-//	RegisterFailHandler(Fail)
-//
-//	RunSpecsWithDefaultAndCustomReporters(t,
-//		"Controller Suite",
-//		[]Reporter{printer.NewlineReporter{}})
-//}
+func TestAPIs(t *testing.T) {
+	RegisterFailHandler(Fail)
+
+	RunSpecsWithDefaultAndCustomReporters(t,
+		"Controller Suite",
+		[]Reporter{printer.NewlineReporter{}})
+}
 
 var _ = BeforeSuite(func(done Done) {
 	ctrl.SetLogger(zap.New(zap.UseDevMode(true), zap.WriteTo(GinkgoWriter)))