Merge pull request #68 from gabemontero/rm-deploy-assets-now-in-operator

BUILD-256: remove deploy dir and associated Makefile targets

Makefile

@@ -7,10 +7,6 @@ REPOSITORY ?= openshift
 # Allows overriding of the tag to generate for the image
 TAG ?= latest
 
-# allows overwrite of node registrar image
-NODE_REGISTRAR_IMAGE ?=
-# allows overwite of CSI driver image
-DRIVER_IMAGE ?=
 # when non-empty it enables "--refreshresource=false" deployment
 DEPLOY_MODE ?=
 
@@ -47,29 +43,23 @@ config: ## Overwrites the configuration ConfigMap with local settings
 	./hack/configmap.sh $(DEPLOY_MODE)
 .PHONY: config
 
-# TODO: update the CI steps to either rely on the operator, instead of using the configuration
-# ovewrite approach
-deploy: config ## Deploy the local build of the shared resource csi driver into the current cluster
-	NODE_REGISTRAR_IMAGE=$(NODE_REGISTRAR_IMAGE) DRIVER_IMAGE=$(DRIVER_IMAGE) ./deploy/deploy.sh
-.PHONY: deploy
-
 # overwrites the deployment mode variable to disable refresh-resources
 deploy-no-refreshresources: DEPLOY_MODE = "no-refreshresources"
-deploy-no-refreshresources: deploy
+deploy-no-refreshresources: config
 
 test-e2e-no-deploy:
 	TEST_SUITE=$(TEST_SUITE) TEST_TIMEOUT=$(TEST_TIMEOUT) DAEMONSET_PODS=$(DAEMONSET_PODS) ./hack/test-e2e.sh
 .PHONY: test-e2e-no-deploy
 
-test-e2e: deploy test-e2e-no-deploy
+test-e2e: test-e2e-no-deploy
 
 test-e2e-no-refreshresources: deploy-no-refreshresources test-e2e-no-deploy
 
 test-e2e-slow: TEST_SUITE = "slow"
-test-e2e-slow: deploy test-e2e
+test-e2e-slow: test-e2e
 
 test-e2e-disruptive: TEST_SUITE = "disruptive" 
-test-e2e-disruptive: deploy test-e2e
+test-e2e-disruptive: test-e2e
 
 verify: ## Run verifications. Example: make verify
 	go vet ./cmd/... ./pkg/... ./test/...
@@ -95,11 +85,6 @@ vendor: ## Vendor Go dependencies. Example: make vendor
 	go mod vendor
 .PHONY: vendor
 
-generate-release-yaml: ## Create single file with the relevant yaml from the deploy directory to facilitate deployment from the repository's release page
-	./hack/generate-release-yaml.sh
-
-.PHONY: generate-release-yaml
-
 help: ## Print this help. Example: make help
 	@awk 'BEGIN {FS = ":.*?## "} /^[a-zA-Z_-]+:.*?## / {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}' $(MAKEFILE_LIST)
 .PHONY: help