Merge pull request #1799 from gabrtv/new-devenv

Introduce deisctl and new cluster-aware development environment

Author: Gabriel Monroy

.gitignore

@@ -62,3 +62,7 @@ contrib/ec2/cloudformation.json
 
 # GCE generated user-data
 contrib/gce/gce-user-data
+
+# user-data backup file
+contrib/coreos/user-data.orig
+

Makefile

@@ -4,165 +4,52 @@
 
 include includes.mk
 
-define check_for_errors
-	@if $(FLEETCTL) list-units -no-legend | awk '($$4 == "failed")' | egrep -q "deis-.+service"; then \
-		echo "\033[0;31mOne or more services failed! Check which services by running 'make status'\033[0m" ; \
-		echo "\033[0;31mYou can get detailed output with 'fleetctl status deis-servicename.service'\033[0m" ; \
-		echo "\033[0;31mThis usually indicates an error with Deis - please open an issue on GitHub or ask for help in IRC\033[0m" ; \
-		exit 1 ; \
-	fi
-endef
-
-define deis_units
-	$(shell $(FLEETCTL) list-units -no-legend=true | \
-	  awk '($$4 ~ "$(1)")' | \
-	  sed -n 's/\(deis-.*\.service\).*/\1/p' | tr '\n' ' ')
-endef
-
-# TODO: re-evaluate the fragile start order
-COMPONENTS=builder cache controller database logger registry
-ALL_COMPONENTS=$(COMPONENTS) router
-START_COMPONENTS=logger cache database
-
-ALL_UNITS = $(foreach C,$(COMPONENTS),$(wildcard $(C)/systemd/*.service))
-START_UNITS = $(foreach C,$(START_COMPONENTS),$(wildcard $(C)/systemd/*.service))
-
-DATA_CONTAINER_TEMPLATES=builder/systemd/deis-builder-data.service database/systemd/deis-database-data.service logger/systemd/deis-logger-data.service registry/systemd/deis-registry-data.service
+COMPONENTS=builder cache controller database logger registry router
+START_ORDER=logger database cache registry controller builder router
 
 all: build run
 
-build: rsync
-	$(call ssh_all,'cd share && for c in $(ALL_COMPONENTS); do cd $$c && docker build -t deis/$$c . && cd ..; done')
-
-clean: uninstall
-	$(call ssh_all,'for c in $(ALL_COMPONENTS); do docker rm -f deis-$$c; done')
-
-full-clean: clean
-	$(call ssh_all,'for c in $(ALL_COMPONENTS); do docker rmi deis-$$c; done')
-
-install: check-fleet install-routers install-data-containers
-	$(FLEETCTL) load $(START_UNITS)
-	$(FLEETCTL) load registry/systemd/*.service
-	$(FLEETCTL) load controller/systemd/*.service
-	$(FLEETCTL) load builder/systemd/*.service
-
-install-data-containers: check-fleet
-	@$(foreach T, $(DATA_CONTAINER_TEMPLATES), \
-		UNIT=`basename $(T)` ; \
-		EXISTS=`$(FLEETCTL) list-units | grep $$UNIT` ; \
-		if [ "$$EXISTS" != "" ]; then \
-		  echo $$UNIT already loaded. Skipping... ; \
-		else \
-			cp $(T).template . ; \
-			NEW_FILENAME=`ls *.template | sed 's/\.template//g'`; \
-			mv *.template $$NEW_FILENAME ; \
-			MACHINE_ID=`$(FLEETCTL) list-machines --no-legend --full | awk 'BEGIN { OFS="\t"; srand() } { print rand(), $$1 }' | sort -n | cut -f2- | head -1` ; \
-			sed -e "s/CHANGEME/$$MACHINE_ID/" $$NEW_FILENAME > $$NEW_FILENAME.bak ; \
-			rm -f $$NEW_FILENAME ; \
-			mv $$NEW_FILENAME.bak $$NEW_FILENAME ; \
-			$(FLEETCTL) load $$NEW_FILENAME ; \
-			rm -f $$NEW_FILENAME ; \
-		fi ; \
-	)
-
-install-routers: check-fleet
-	@$(foreach R, $(ROUTER_UNITS), \
-		$(FLEETCTL) load router/systemd/$(R) ; \
-	)
-
-pull:
-	$(call ssh_all,'for c in $(ALL_COMPONENTS); do docker pull deis/$$c:latest; done')
-	$(call ssh_all,'docker pull deis/slugrunner:latest')
+dev-registry: check-docker
+	@docker run -d -p 5000:5000 --name registry registry:0.8.1
+	@echo
+	@echo "To configure the registry for local Deis development:"
+	@echo "    export DEIS_REGISTRY=`boot2docker ip 2>/dev/null`:5000"
 
-restart: stop start
+discovery-url:
+	sed -i .orig -e "s,# discovery: https://discovery.etcd.io/12345693838asdfasfadf13939923,discovery: $$(curl -q -w '\n' https://discovery.etcd.io/new)," contrib/coreos/user-data
+
+build: check-docker
+	@$(foreach C, $(COMPONENTS), $(MAKE) -C $(C) build || exit 1;)
+
+push: check-docker check-registry
+	@$(foreach C, $(COMPONENTS), $(MAKE) -C $(C) push || exit 1;)
+	
+full-clean:
+	@$(foreach C, $(COMPONENTS), $(MAKE) -C $(C) full-clean || exit 1;)
+
+install:
+	@$(foreach C, $(START_ORDER), $(MAKE) -C $(C) install || exit 1;)
+
+uninstall:
+	@$(foreach C, $(COMPONENTS), $(MAKE) -C $(C) uninstall || exit 1;)
 
-rsync:
-	$(call rsync_all)
+start:
+	@$(foreach C, $(START_ORDER), $(MAKE) -C $(C) start || exit 1;)
+
+stop:
+	@$(foreach C, $(COMPONENTS), $(MAKE) -C $(C) stop || exit 1;)
+
+restart: stop start
 
 run: install start
 
-start: check-fleet start-warning start-routers
-	@# logger cache database
-	$(call echo_yellow,"Waiting for deis-cache to start...")
-	$(FLEETCTL) start -no-block $(START_UNITS)
-	@until $(FLEETCTL) list-units | egrep -q "deis-cache\..+(running|failed)"; \
-		do sleep 2; \
-			printf "\033[0;33mStatus:\033[0m "; $(FLEETCTL) list-units | \
-			grep "deis-cache\." | awk '{printf "%-10s (%s)    \r", $$3, $$4}'; \
-			sleep 8; \
-		done
-	$(call check_for_errors)
-
-	@# registry
-	$(call echo_yellow,"Waiting for deis-registry to start...")
-	$(FLEETCTL) start -no-block registry/systemd/*.service
-	@until $(FLEETCTL) list-units | egrep -q "deis-registry\..+(running|failed)"; \
-		do sleep 2; \
-			printf "\033[0;33mStatus:\033[0m "; $(FLEETCTL) list-units | \
-			grep "deis-registry\." | awk '{printf "%-10s (%s)    \r", $$3, $$4}'; \
-			sleep 8; \
-		done
-	$(call check_for_errors)
-
-	@# controller
-	$(call echo_yellow,"Waiting for deis-controller to start...")
-	$(FLEETCTL) start -no-block controller/systemd/*.service
-	@until $(FLEETCTL) list-units | egrep -q "deis-controller\..+(running|failed)"; \
-		do sleep 2; \
-			printf "\033[0;33mStatus:\033[0m "; $(FLEETCTL) list-units | \
-			grep "deis-controller\." | awk '{printf "%-10s (%s)    \r", $$3, $$4}'; \
-			sleep 8; \
-		done
-	$(call check_for_errors)
-
-	@# builder
-	$(call echo_yellow,"Waiting for deis-builder to start...")
-	$(FLEETCTL) start -no-block builder/systemd/*.service
-	@until $(FLEETCTL) list-units | egrep -q "deis-builder\..+(running|failed)"; \
-		do sleep 2; \
-			printf "\033[0;33mStatus:\033[0m "; $(FLEETCTL) list-units | \
-			grep "deis-builder\." | awk '{printf "%-10s (%s)    \r", $$3, $$4}'; \
-			sleep 8; \
-		done
-	$(call check_for_errors)
-
-	$(call echo_yellow,"Your Deis cluster is ready to go! Continue following the README to login and use Deis.")
-
-start-routers: check-fleet start-warning
-	$(call echo_yellow,"Waiting for 1 of $(DEIS_NUM_ROUTERS) deis-routers to start...")
-	$(foreach R,$(ROUTER_UNITS),$(FLEETCTL) start -no-block $(R);)
-	@until $(FLEETCTL) list-units | egrep -q "deis-router.+(running)"; \
-		do sleep 2; \
-			printf "\033[0;33mStatus:\033[0m "; $(FLEETCTL) list-units | \
-			grep "deis-router" | head -n 1 | \
-			awk '{printf "%-10s (%s)    \r", $$3, $$4}'; \
-			sleep 8; \
-		done
-	$(call check_for_errors)
-
-start-warning:
-	$(call echo_cyan,"Deis components may take a long time to start the first time they are initialized.")
-
-status: check-fleet
-	$(FLEETCTL) list-units
-
-stop: check-fleet
-	$(FLEETCTL) stop -block-attempts=600 $(strip $(call deis_units,active))
-
-test: test-components test-integration
+test: test-components push test-integration
 
 test-components:
-	@$(foreach C,$(ALL_COMPONENTS), \
-		echo \\nTesting deis/$(C) ; \
-		$(MAKE) -C $(C) test ; \
-	)
+	@$(foreach C, $(COMPONENTS), $(MAKE) -C $(C) test || exit 1;)
 
 test-integration:
 	$(MAKE) -C tests/ test-full
 
 test-smoke:
 	$(MAKE) -C tests/ test-smoke
-
-uninstall: check-fleet stop
-	$(FLEETCTL) unload -block-attempts=600 $(call deis_units,.)
-	$(FLEETCTL) destroy $(strip $(call deis_units,.))