Use fakeclient instead of envtest (#44)

Author: jmrodri

Makefile

@@ -1,7 +1,5 @@
 SOURCES          := $(shell find . -name '*.go' -not -path "*/vendor/*" -not -path "*/.git/*")
 .DEFAULT_GOAL    := build
-ENVTEST_ASSETS_DIR = $(shell pwd)/testbin
-SHELL = /bin/bash
 
 build: $(SOURCES) ## Build Test
 	go build -i -ldflags="-s -w" ./...
@@ -18,11 +16,7 @@ fmt: ## Run go fmt
 fmtcheck: ## Check go formatting
 	@gofmt -l $(SOURCES) | grep ".*\.go"; if [ "$$?" = "0" ]; then exit 1; fi
 
-export KUBEBUILDER_ASSETS := $(ENVTEST_ASSETS_DIR)/bin
 test: ## Run unit tests
-	mkdir -p $(ENVTEST_ASSETS_DIR)
-	test -f $(ENVTEST_ASSETS_DIR)/setup-envtest.sh || curl -sSLo $(ENVTEST_ASSETS_DIR)/setup-envtest.sh https://raw.githubusercontent.com/kubernetes-sigs/controller-runtime/v0.6.3/hack/setup-envtest.sh
-	. $(ENVTEST_ASSETS_DIR)/setup-envtest.sh; fetch_envtest_tools $(ENVTEST_ASSETS_DIR); setup_envtest_env $(ENVTEST_ASSETS_DIR)
 	@go test -race -covermode atomic -coverprofile cover.out ./...
 
 vet: ## Run go vet

conditions/conditions_suite_test.go

@@ -15,101 +15,15 @@
 package conditions
 
 import (
-	"fmt"
-	"os"
-	"os/exec"
-	"path/filepath"
 	"testing"
 
 	. "github.com/onsi/ginkgo"
 	. "github.com/onsi/gomega"
-	apiv1 "github.com/operator-framework/api/pkg/operators/v1"
-	"k8s.io/apimachinery/pkg/runtime"
-	"k8s.io/apimachinery/pkg/util/rand"
-	"k8s.io/client-go/rest"
-	"sigs.k8s.io/controller-runtime/pkg/envtest"
+
 	"sigs.k8s.io/controller-runtime/pkg/envtest/printer"
-	logf "sigs.k8s.io/controller-runtime/pkg/log"
-	"sigs.k8s.io/controller-runtime/pkg/log/zap"
 )
 
 func TestSource(t *testing.T) {
 	RegisterFailHandler(Fail)
 	RunSpecsWithDefaultAndCustomReporters(t, "Conditions Suite", []Reporter{printer.NewlineReporter{}, printer.NewProwReporter("Conditions Suite")})
 }
-
-var testenv *envtest.Environment
-var cfg *rest.Config
-var sch = runtime.NewScheme()
-var err error
-var tempDir = fmt.Sprintf("%s_%d", "temp", rand.Int63nRange(0, 1000000))
-
-const (
-	olmYAMLURL  = "https://github.com/operator-framework/operator-lifecycle-manager/releases/download/v0.17.0/olm.yaml"
-	crdsYAMLURL = "https://github.com/operator-framework/operator-lifecycle-manager/releases/download/v0.17.0/crds.yaml"
-
-	// TODO: Remove this once OLM releases operator conditions CRD set
-	condCRDYAML = "https://raw.githubusercontent.com/dinhxuanvu/operator-lifecycle-manager/create-operatorconditions-for-operator/deploy/chart/crds/0000_50_olm_00-operatorconditions.crd.yaml"
-)
-
-var _ = BeforeSuite(func(done Done) {
-	logf.SetLogger(zap.New(zap.WriteTo(GinkgoWriter), zap.UseDevMode(true)))
-
-	err = getOLMManifests()
-	Expect(err).NotTo(HaveOccurred())
-	// Add operator apiv1 to scheme
-	err = apiv1.AddToScheme(sch)
-	Expect(err).NotTo(HaveOccurred())
-
-	testenv = &envtest.Environment{}
-	testenv.CRDInstallOptions = envtest.CRDInstallOptions{
-		Paths: []string{tempDir},
-	}
-
-	cfg, err = testenv.Start()
-	Expect(err).NotTo(HaveOccurred())
-
-	close(done)
-}, 60)
-
-var _ = AfterSuite(func() {
-	// remove tmp folder
-	os.RemoveAll(tempDir)
-	Expect(err).NotTo(HaveOccurred())
-	Expect(testenv.Stop()).To(Succeed())
-})
-
-func getOLMManifests() error {
-	// create a directory
-	cmd := exec.Command("mkdir", tempDir)
-	err := cmd.Run()
-	if err != nil {
-		return err
-	}
-
-	// fetch manifests to install olm
-	err = getYAML(filepath.Join(tempDir, "olm.yaml"), olmYAMLURL)
-	if err != nil {
-		return fmt.Errorf("error fetching olm.yaml %v", err)
-	}
-
-	err = getYAML(filepath.Join(tempDir, "crds.yaml"), crdsYAMLURL)
-	if err != nil {
-		return fmt.Errorf("error fetching crds.yaml %v", err)
-	}
-
-	err = getYAML(filepath.Join(tempDir, "operatorconditions.crd.yaml"), condCRDYAML)
-	if err != nil {
-		return fmt.Errorf("error fetching operator conditions crd %v", err)
-	}
-	return nil
-}
-
-func getYAML(file, url string) error {
-	cmd := exec.Command("curl", "-sSLo", file, url)
-	err := cmd.Run()
-	if err != nil {
-		return err
-	}
-	return nil
-}

conditions/conditions_test.go

@@ -24,9 +24,11 @@ import (
 	apiv1 "github.com/operator-framework/api/pkg/operators/v1"
 	"k8s.io/apimachinery/pkg/api/meta"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
+	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
 	kubeclock "k8s.io/apimachinery/pkg/util/clock"
 	"sigs.k8s.io/controller-runtime/pkg/client"
+	"sigs.k8s.io/controller-runtime/pkg/client/fake"
 )
 
 const (
@@ -43,8 +45,10 @@ var _ = Describe("Condition", func() {
 	var err error
 
 	BeforeEach(func() {
-		cl, err = client.New(cfg, client.Options{})
+		sch := runtime.NewScheme()
+		err = apiv1.AddToScheme(sch)
 		Expect(err).NotTo(HaveOccurred())
+		cl = fake.NewFakeClientWithScheme(sch)
 	})
 
 	Describe("NewCondition", func() {
@@ -102,8 +106,10 @@ var _ = Describe("Condition", func() {
 			}
 
 			// create a new client
-			cl, err = client.New(cfg, client.Options{Scheme: sch})
+			sch := runtime.NewScheme()
+			err = apiv1.AddToScheme(sch)
 			Expect(err).NotTo(HaveOccurred())
+			cl = fake.NewFakeClientWithScheme(sch)
 
 			// create an operator Condition resource
 			err = cl.Create(ctx, operatorCond)