test: skip image polling test if running in a kind cluster (#2445)

Signed-off-by: Daniel Sover <[email protected]>

Co-authored-by: Daniel Sover <[email protected]>

Upstream-repository: operator-lifecycle-manager
Upstream-commit: d36949bb3b7353a43d8e8fc02033e0f09b7252bb

Author: timflannagan

staging/operator-lifecycle-manager/test/e2e/README.md

@@ -54,4 +54,14 @@ make file and use `-dryRun` with `-focus` and see if the regex would trigger you
 
 ## Build infrastructure
 
-Note that the make file target `e2e-local` is executed by the github workflow `.github/workflows/e2e-tests.yml` and uses two parallel `go test` processes.
+Note that the make file target `e2e-local` is executed by the github workflow `.github/workflows/e2e-tests.yml` and uses two parallel `go test` processes.
+
+## Running on minikube
+
+The e2e suite is also runnable on a minikube cluster. First spin up the minikube cluster manually with the desired provisioner, 
+then run `make run-local` to deploy OLM onto the cluster. Tests can be run by invoking ginkgo and passing the required command line
+arguments to the test suite. For example to run a specific test:
+
+```bash
+GO111MODULE=on GOFLAGS="-mod=vendor" go run github.com/onsi/ginkgo/ginkgo -focus "static provider" -v --progress ./test/e2e -- -namespace=operators -olmNamespace=olm -dummyImage=bitnami/nginx:latest
+```

staging/operator-lifecycle-manager/test/e2e/catalog_e2e_test.go

@@ -6,7 +6,6 @@ import (
 	"context"
 	"fmt"
 	"net"
-	"os"
 	"strconv"
 	"strings"
 	"time"
@@ -641,8 +640,10 @@ var _ = Describe("Catalog represents a store of bundles which OLM can use to ins
 	})
 
 	It("image update", func() {
-		if os.Getenv("GITHUB_ACTIONS") == "true" {
-			Skip("This spec fails when run using KIND cluster. See https://github.com/operator-framework/operator-lifecycle-manager/issues/1380 for more details")
+		if ok, err := inKind(c); ok && err == nil {
+			Skip("This spec fails when run using KIND cluster. See https://github.com/operator-framework/operator-lifecycle-manager/issues/2420 for more details")
+		} else if err != nil {
+			Skip("Could not determine whether running in a kind cluster. Skipping.")
 		}
 		// Create an image based catalog source from public Quay image
 		// Use a unique tag as identifier

staging/operator-lifecycle-manager/test/e2e/util_test.go

@@ -953,3 +953,21 @@ func TeardownNamespace(ns string) {
 		return ctx.Ctx().KubeClient().KubernetesInterface().CoreV1().Namespaces().Delete(context.Background(), ns, metav1.DeleteOptions{})
 	}).Should(Succeed())
 }
+
+func inKind(client operatorclient.ClientInterface) (bool, error) {
+	nodes, err := client.KubernetesInterface().CoreV1().Nodes().List(context.TODO(), metav1.ListOptions{})
+	if err != nil {
+		// error finding nodes
+		return false, err
+	}
+	for _, node := range nodes.Items {
+		if !strings.HasPrefix(node.GetName(), "kind-") {
+			continue
+		}
+		if !strings.HasSuffix(node.GetName(), "-control-plane") {
+			continue
+		}
+		return true, nil
+	}
+	return false, nil
+}