Added operator-sdk support to the e2e workflow

Signed-off-by: jubittajohn <[email protected]>

Refractored the plain bundle and registry bundle interactions; Updated the comments and README

Signed-off-by: jubittajohn <[email protected]>

Added make target to install operator-sdk; Added make target to deploy a local registry server; Changed test to use the local registry server

Signed-off-by: jubittajohn <[email protected]>

Author: jubittajohn

…ub/workflows/operator-framework-e2e.yaml …ub/workflows/operator-developer-e2e.yaml.github/workflows/operator-framework-e2e.yaml renamed to .github/workflows/operator-developer-e2e.yaml .github/workflows/operator-framework-e2e.yaml renamed to .github/workflows/operator-developer-e2e.yaml

@@ -1,14 +1,14 @@
-name: operator-framework-e2e
+name: operator-developer-e2e
 
 on:
   workflow_dispatch:
   pull_request:
   push:
    branches:
-   - operator-framework-e2e
+   - main
 
 jobs:
-  e2e-kind:
+  operator-developer-e2e:
     runs-on: ubuntu-latest
     steps:
 
@@ -20,4 +20,4 @@ jobs:
 
     - name: Run the operator framework e2e test 
       run: |
-        make operator-framework-e2e
+        make operator-developer-e2e

Makefile

@@ -97,8 +97,8 @@ E2E_FLAGS ?= ""
 test-e2e: $(GINKGO) ## Run the e2e tests
 	$(GINKGO) --tags $(GO_BUILD_TAGS) $(E2E_FLAGS) -trace -progress $(FOCUS) test/e2e
 
-test-operator-framework-e2e: $(GINKGO) ## Run operator create, upgrade and delete tests
-	$(GINKGO) --tags $(GO_BUILD_TAGS) $(E2E_FLAGS) -trace -progress test/operator-e2e
+test-operator-developer-e2e: $(GINKGO) ## Run operator create, upgrade and delete tests
+	$(GINKGO) --tags $(GO_BUILD_TAGS) $(E2E_FLAGS) -trace -progress test/operator-framework-e2e
 
 ENVTEST_VERSION = $(shell go list -m k8s.io/client-go | cut -d" " -f2 | sed 's/^v0\.\([[:digit:]]\{1,\}\)\.[[:digit:]]\{1,\}$$/1.\1.x/')
 UNIT_TEST_DIRS=$(shell go list ./... | grep -v /test/)
@@ -108,8 +108,8 @@ test-unit: $(SETUP_ENVTEST) ## Run the unit tests
 e2e: KIND_CLUSTER_NAME=operator-controller-e2e
 e2e: run kind-load-test-artifacts test-e2e kind-cluster-cleanup ## Run e2e test suite on local kind cluster
 
-operator-framework-e2e: KIND_CLUSTER_NAME=operator-controller-e2e  ## Run operator-framework e2e on local kind cluster
-operator-framework-e2e: run opm test-operator-framework-e2e kind-cluster-cleanup
+operator-developer-e2e: KIND_CLUSTER_NAME=operator-controller-e2e  ## Run operator-developer e2e on local kind cluster
+operator-developer-e2e: run opm install-operator-sdk deploy-local-registry test-operator-developer-e2e stop-local-registry kind-cluster-cleanup
 
 kind-load: $(KIND) ## Loads the currently constructed image onto the cluster
 	$(KIND) load docker-image $(IMG) --name $(KIND_CLUSTER_NAME)
@@ -147,6 +147,25 @@ OPM = $(shell which opm)
 endif
 endif
 
+.PHONY: install-operator-sdk
+OPERATOR_SDK_DL_URL=https://github.com/operator-framework/operator-sdk/releases/download/v1.30.0
+export OS=$(shell go env GOOS)
+export ARCH=$(shell go env GOARCH) 
+install-operator-sdk:  ## Install operator-sdk
+	if [ ! -f ~/bin/operator-sdk ]; then \
+		curl -LO $(OPERATOR_SDK_DL_URL)/operator-sdk_${OS}_${ARCH} ; \
+		chmod +x operator-sdk_${OS}_${ARCH} ; \
+		mv operator-sdk_$(OS)_$(ARCH) /usr/local/bin/operator-sdk ; \
+	fi
+
+.PHONY: deploy-local-registry
+deploy-local-registry: ## Deploy local docker registry
+	docker run -d -p 5000:5000 --restart=always --name local-registry registry:2
+
+.PHONY: stop-local-registry
+stop-local-registry: ## Stop and remove local registry
+	docker container stop local-registry && docker container rm -v local-registry
+
 ##@ Build
 
 export VERSION           ?= $(shell git describe --tags --always --dirty)

go.mod

@@ -72,6 +72,8 @@ require (
 	github.com/google/gofuzz v1.2.0 // indirect
 	github.com/google/pprof v0.0.0-20210720184732-4bb14d4b1be1 // indirect
 	github.com/google/uuid v1.3.0 // indirect
+	github.com/gorilla/mux v1.8.0 // indirect
+	github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0 // indirect
 	github.com/h2non/filetype v1.1.1 // indirect
 	github.com/h2non/go-is-svg v0.0.0-20160927212452-35e8c4b0612c // indirect
 	github.com/imdario/mergo v0.3.13 // indirect
@@ -91,7 +93,10 @@ require (
 	github.com/modern-go/reflect2 v1.0.2 // indirect
 	github.com/morikuni/aec v1.0.0 // indirect
 	github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
-	github.com/operator-framework/api v0.17.3 // indirect
+	github.com/opencontainers/go-digest v1.0.0 // indirect
+	github.com/opencontainers/image-spec v1.1.0-rc2 // indirect
+	github.com/operator-framework/api v0.17.4-0.20230223191600-0131a6301e42 // indirect
+	github.com/otiai10/copy v1.2.0 // indirect
 	github.com/pkg/errors v0.9.1 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
 	github.com/prometheus/client_golang v1.14.0 // indirect