intermediate commit

pkg/controller/gitopsconfig/gitopsconfig_controller.go

@@ -259,7 +259,7 @@ func (r *ReconcileGitOpsConfig) manageDeletion(instance *gitopsv1alpha1.GitOpsCo
 			LabelSelector: selector,
 		}, jobList)
 		if err != nil {
-			log.Error(err, "unable to list jobs ")
+			log.Error(err, "unable to list jobs")
 			return reconcile.Result{}, err
 		}
 		applicableJobList := []batchv1.Job{}

scripts/unit-tests.sh

@@ -17,5 +17,5 @@ set -e
 export JOB_TEMPLATE=$GOPATH/src/github.com/KohlsTechnology/eunomia/templates/job.yaml
 export CRONJOB_TEMPLATE=$GOPATH/src/github.com/KohlsTechnology/eunomia/templates/cronjob.yaml
 export WATCH_NAMESPACE=""
-export OPERATOR_NAME=eunomia-operator
-go test ./pkg/...
+export OPERATOR_NAME=gitops-operator
+go test ./test/...

test/e2e/simple_test.go

@@ -22,7 +22,6 @@ import (
 
 	"github.com/KohlsTechnology/eunomia/pkg/apis/eunomia/v1alpha1"
 	gitopsv1alpha1 "github.com/KohlsTechnology/eunomia/pkg/apis/eunomia/v1alpha1"
-
 	test "github.com/KohlsTechnology/eunomia/test"
 	framework "github.com/operator-framework/operator-sdk/pkg/test"
 	"github.com/stretchr/testify/assert"
@@ -46,7 +45,7 @@ func simpleTestDeploy(t *testing.T, f *framework.Framework, ctx *framework.TestC
 	err = f.Client.Get(goctx.TODO(), types.NamespacedName{Name: "gitops-simple", Namespace: namespace}, crd)
 	assert.Error(t, err)
 
-	gitops := &v1alpha1.GitOpsConfig{
+	gitops := &gitopsv1alpha1.GitOpsConfig{
 		TypeMeta: metav1.TypeMeta{
 			Kind:       "GitOpsConfig",
 			APIVersion: "eunomia.kohls.io/v1alpha1",

test/init.go

@@ -23,7 +23,7 @@ import (
 
 	"github.com/KohlsTechnology/eunomia/pkg/apis"
 	v1alpha1 "github.com/KohlsTechnology/eunomia/pkg/apis/eunomia/v1alpha1"
-	"github.com/KohlsTechnology/eunomia/pkg/util"
+	util "github.com/KohlsTechnology/eunomia/pkg/controller/gitopsconfig"
 	"github.com/operator-framework/operator-sdk/pkg/log/zap"
 	framework "github.com/operator-framework/operator-sdk/pkg/test"
 	"github.com/spf13/pflag"