dnix/make-deploy
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Compare commits

base: dnix:master
Branches Tags
dnix:master
dnix:avoid_unneeded_error_messages
dnix:helm-kubeconfig
dnix:helm_debug
dnix:more-tests
dnix:kubectl_apply
dnix:SYS-6285
dnix:dpkg
..
compare: dnix:helm-kubeconfig
Branches Tags
dnix:master
dnix:avoid_unneeded_error_messages
dnix:helm-kubeconfig
dnix:helm_debug
dnix:more-tests
dnix:kubectl_apply
dnix:SYS-6285
dnix:dpkg

1 commit
master ... helm-kubec

Author SHA1 Message Date
Andreas Neue
e75e70efc8 helm.mk: building the helm command and params is now hopefully smarter 2025-06-25 09:51:49 +02:00
10 changed files with 67 additions and 117 deletions
Download patch file Download diff file Expand all files Collapse all files

43
Makefile
View file

@ -39,19 +39,17 @@ prerequisites:
ifdef DEPLOY_CLEANUP
cleanup:
@- echo "\n### cleanup ..."
@ $(foreach host,$(DEPLOY_HOSTS), \
echo "#host: $(host)"; \
@- $(foreach host,$(DEPLOY_HOSTS), \
scp cleanup.sh $(SSH_USER)@$(host):/$(DEPLOY_PATH)/$(DEPLOY_NAME); \
if [ -e cleanup.sh ]; then ssh $(SSH_USER)@$(host) "cd $(DEPLOY_PATH)/$(DEPLOY_NAME); sh cleanup.sh $(host)"; fi; \
ssh $(SSH_USER)@$(host) "cd $(DEPLOY_PATH)/$(DEPLOY_NAME); sh cleanup.sh $(host)"; \
)
endif
prepare:
@- echo "\n### preparing ..."
@- chmod 600 secrets.mk
@ $(foreach host,$(DEPLOY_HOSTS), \
echo "#host: $(host)"; \
ssh $(SSH_USER)@$(host) "cd $(DEPLOY_PATH); if [ ! -d $(DEPLOY_NAME) ] ; then mkdir $(DEPLOY_NAME); fi"; \
@- $(foreach host,$(DEPLOY_HOSTS), \
ssh $(SSH_USER)@$(host) "cd $(DEPLOY_PATH); mkdir $(DEPLOY_NAME)"; \
)
build:
@ -73,28 +71,23 @@ endif
pre-deploy:
ifdef DEPLOY_HOSTS
@- echo "\n### running pre-deploy script(s)"
@ $(foreach host,$(DEPLOY_HOSTS), \
echo "#host: $(host)"; \
if [ -e pre-deploy.sh ]; then ssh $(SSH_USER)@$(host) "cd $(DEPLOY_PATH)/$(DEPLOY_NAME); sh pre-deploy.sh $(host)"; fi; \
if [ -e pre-deploy_$(host).sh ]; then ssh $(SSH_USER)@$(host) "cd $(DEPLOY_PATH)/$(DEPLOY_NAME); sh pre-deploy_$(host).sh"; fi; \
@- $(foreach host,$(DEPLOY_HOSTS), \
ssh $(SSH_USER)@$(host) "cd $(DEPLOY_PATH)/$(DEPLOY_NAME); sh pre-deploy.sh $(host); sh pre-deploy_$(host).sh"; \
)
endif
post-deploy:
ifdef DEPLOY_HOSTS
@- echo "\n### running post-deploy script(s)"
@ $(foreach host,$(DEPLOY_HOSTS), \
echo "#host: $(host)"; \
if [ -e post-deploy.sh ]; then ssh $(SSH_USER)@$(host) "cd $(DEPLOY_PATH)/$(DEPLOY_NAME); sh post-deploy.sh $(host)"; fi; \
if [ -e post-deploy_$(host).sh ]; then ssh $(SSH_USER)@$(host) "cd $(DEPLOY_PATH)/$(DEPLOY_NAME); sh post-deploy_$(host).sh"; fi; \
@- $(foreach host,$(DEPLOY_HOSTS), \
ssh $(SSH_USER)@$(host) "cd $(DEPLOY_PATH)/$(DEPLOY_NAME); sh post-deploy.sh $(host); sh post-deploy_$(host).sh"; \
)
endif
pre-local:
ifneq (,$(wildcard pre-local.sh))
@- echo "\n### running pre-local script"
@ $(foreach host,$(DEPLOY_HOSTS), \
echo "#host: $(host)"; \
@- $(foreach host,$(DEPLOY_HOSTS), \
./pre-local.sh $(host); \
)
else
@ -104,8 +97,7 @@ endif
post-local:
ifneq (,$(wildcard post-local.sh))
@- echo "\n### running post-local script"
@ $(foreach host,$(DEPLOY_HOSTS), \
echo "#host: $(host)"; \
@- $(foreach host,$(DEPLOY_HOSTS), \
./post-local.sh $(host); \
)
else
@ -115,17 +107,16 @@ endif
upload:
ifdef DEPLOY_HOSTS
@- echo "\n### uploading files"
@$(foreach host,$(DEPLOY_HOSTS), \
echo "#host: $(host)"; \
ssh $(SSH_USER)@$(host) "if [ ! -d $(DEPLOY_PATH)/$(DEPLOY_NAME) ]; then mkdir -p $(DEPLOY_PATH)/$(DEPLOY_NAME); fi"; \
if [ -r .rsync ] ; then rsync_xtra=`cat .rsync`; fi; \
if [ -r .rsync_$(host) ] ; then rsync_xtra_host=`cat .rsync_$(host)`; fi; \
@- $(foreach host,$(DEPLOY_HOSTS), \
ssh $(SSH_USER)@$(host) "mkdir -p $(DEPLOY_PATH)/$(DEPLOY_NAME)"; \
rsync_xtra=`cat .rsync`; \
rsync_xtra_host=`cat .rsync_$(host)`; \
param="-ravv"; \
param="$$param $$rsync_xtra"; \
param="$$param $$rsync_xtra_host"; \
param="$$param --exclude '*~' --exclude '.git*' --exclude '*.swp' . $(SSH_USER)@$(host):$(DEPLOY_PATH)/$(DEPLOY_NAME)"; \
eval rsync $$param; \
ssh $(SSH_USER)@$(host) "cd $(DEPLOY_PATH)/$(DEPLOY_NAME); if [ -e .env ]; then chmod o-r .env ; fi; if [ -e secrets.mk ]; then chmod o-r secrets.mk; fi; if [ -e secrets.yaml ]; then chmod o-r secrets.yaml; fi"; \
ssh $(SSH_USER)@$(host) "cd $(DEPLOY_PATH)/$(DEPLOY_NAME) && chmod o-r .env secrets*"; \
)
endif
@ -152,9 +143,9 @@ restart: restart-$(DEPLOY_TYPE)
reload:
ifneq (,$(wildcard reload.sh))
@- echo "\n### reloading ..."
@ $(foreach host,$(DEPLOY_HOSTS), \
@- $(foreach host,$(DEPLOY_HOSTS), \
echo "### reloading service on $(host)"; \
if [ -e reload.sh ]; then ssh $(SSH_USER)@$(host) "cd $(DEPLOY_PATH)/$(DEPLOY_NAME); ./reload.sh"; fi; \
ssh $(SSH_USER)@$(host) "cd $(DEPLOY_PATH)/$(DEPLOY_NAME); ./reload.sh"; \
)
else
@- echo "\n### no reload script found"

2
README.md
View file

@ -8,7 +8,7 @@ A simple Makefile based deployment system.
1. Clone **make-deploy** as a submodule into your repository:
$ git submodule add https://git.dnix.de/dnix/make-deploy
$ git submodule add https://git.chefkoch.net/pub/make-deploy
2. Create a symlink to the Makefile:

9
apt.mk
View file

@ -5,11 +5,8 @@ pull-apt:
start-apt:
@- echo "\n### start"
@ $(foreach host,$(DEPLOY_HOSTS), \
echo "#host: $(host)"; \
set -e; \
ssh $(SSH_USER)@$(host) "sudo apt install -y $(APT_PACKAGES)"; \
if [ -e start.sh ]; then ssh $(SSH_USER)@$(host) "sh start.sh"; fi; \
@- $(foreach host,$(DEPLOY_HOSTS), \
echo "$(host)"; \
ssh $(SSH_USER)@$(host) "sudo apt install -y $(APT_PACKAGES); sh start.sh"; \
sleep $(DEPLOY_START_DELAY); \
set +e; \
)

38
compose-file.mk
View file

@ -5,13 +5,13 @@ DOCKER_LOGIN = 0
endif
pull-compose-file:
@ echo "\n### pulling image(s)"
@$(foreach host,$(DEPLOY_HOSTS), \
echo "#host: $(host)"; \
if test "$(DOCKER_LOGIN)" -eq 1 ; \
@- echo "\n### pulling image(s)"
@- $(foreach host,$(DEPLOY_HOSTS), \
echo "$(host)"; \
if test $(DOCKER_LOGIN) -eq 1 ; \
then \
echo "\n#### perform docker login with user $(DOCKER_USER) on $(DOCKER_REGISTRY)"; \
ssh $(SSH_USER)@$(host) "echo $(DOCKER_PASS) | docker login -u $(DOCKER_USER) --password-stdin $(DOCKER_REGISTRY)"; \
echo "\n#### perfom docker login with user $(DOCKER_USER) on $(DOCKER_REGISTRY)"; \
ssh $(SSH_USER)@$(host) "docker login -u $(DOCKER_USER) -p $(DOCKER_PASS) $(DOCKER_REGISTRY)"; \
fi; \
if test -n "$(DOCKER_IMAGE)" ; \
then \
@ -20,33 +20,27 @@ pull-compose-file:
)
start-compose-file:
@ echo "\n### starting service(s)"
@$(foreach host,$(DEPLOY_HOSTS), \
set -e; \
echo "#host: $(host)"; \
@- echo "\n### starting service(s)"
@- $(foreach host,$(DEPLOY_HOSTS), \
echo "$(host)"; \
ssh $(SSH_USER)@$(host) "cd $(DEPLOY_PATH)/$(DEPLOY_NAME); docker-compose -f $(DEPLOY_COMPOSE_FILE) -p $(DEPLOY_COMPOSE_PROJECT) up -d"; \
sleep $(DEPLOY_START_DELAY); \
set +e; \
)
stop-compose-file:
@echo "\n### stopping service(s)"
@$(foreach host,$(DEPLOY_HOSTS), \
set -e; \
echo "#host: $(host)"; \
@- echo "\n### stopping service(s)"
@- $(foreach host,$(DEPLOY_HOSTS), \
echo "$(host)"; \
ssh $(SSH_USER)@$(host) "cd $(DEPLOY_PATH)/$(DEPLOY_NAME); docker-compose -f $(DEPLOY_COMPOSE_FILE) -p $(DEPLOY_COMPOSE_PROJECT) down"; \
set +e; \
)
logs-compose-file:
@ echo "\n### logs"
@ ssh $(SSH_USER)@$(host) "cd $(DEPLOY_PATH)/$(DEPLOY_NAME); docker-compose -f $(DEPLOY_COMPOSE_FILE) -p $(DEPLOY_COMPOSE_PROJECT) logs -f $(service)"
@- echo "\n### logs"
@- ssh $(SSH_USER)@$(host) "cd $(DEPLOY_PATH)/$(DEPLOY_NAME); docker-compose -f $(DEPLOY_COMPOSE_FILE) -p $(DEPLOY_COMPOSE_PROJECT) logs -f $(service)"
restart-compose-file:
@$(foreach host,$(DEPLOY_HOSTS), \
set -e; \
echo "#host: $(host)"; \
@- $(foreach host,$(DEPLOY_HOSTS), \
echo "$(host)"; \
ssh $(SSH_USER)@$(host) "cd $(DEPLOY_PATH)/$(DEPLOY_NAME); docker-compose -f $(DEPLOY_COMPOSE_FILE) -p $(DEPLOY_COMPOSE_PROJECT) restart"; \
sleep $(DEPLOY_START_DELAY); \
set +e; \
)

44
compose.mk
View file

@ -6,18 +6,14 @@ ifndef DOCKER_LOGIN
DOCKER_LOGIN = 0
endif
ifndef COMPOSE_CMD
COMPOSE_CMD = 'docker-compose'
endif
pull-compose:
@echo "\n### pulling image(s)"
@$(foreach host,$(DEPLOY_HOSTS), \
echo "#host: $(host)"; \
if test "$(DOCKER_LOGIN)" -eq 1 ; \
@- echo "\n### pulling image(s)"
@- $(foreach host,$(DEPLOY_HOSTS), \
echo "$(host)"; \
if test "$(DOCKER_LOGIN)" = "1" ; \
then \
echo "\n#### perform docker login with user $(DOCKER_USER) on $(DOCKER_REGISTRY)"; \
ssh $(SSH_USER)@$(host) "echo $(DOCKER_PASS) | docker login -u $(DOCKER_USER) --password-stdin $(DOCKER_REGISTRY)"; \
ssh $(SSH_USER)@$(host) "docker login -u $(DOCKER_USER) -p $(DOCKER_PASS) $(DOCKER_REGISTRY)"; \
fi; \
if test -n "$(DOCKER_IMAGE)" ; \
then \
@ -26,30 +22,24 @@ pull-compose:
)
start-compose:
@echo "\n### starting service(s)"
@$(foreach host,$(DEPLOY_HOSTS), \
set -e; \
echo "#host: $(host)"; \
ssh $(SSH_USER)@$(host) "cd $(project_dir); $(COMPOSE_CMD) up -d"; \
@- echo "\n### starting service(s)"
@- $(foreach host,$(DEPLOY_HOSTS), \
echo "$(host)"; \
ssh $(SSH_USER)@$(host) "cd $(project_dir); docker-compose up -d"; \
sleep $(DEPLOY_START_DELAY); \
set +e; \
)
logs-compose:
@echo "\n### logs"
@$(foreach host,$(DEPLOY_HOSTS), \
set -e; \
echo "#host: $(host)"; \
ssh $(SSH_USER)@$(host) "cd $(project_dir); $(COMPOSE_CMD) logs -f $(service)"; \
set +e; \
@- echo "\n### logs"
@- $(foreach host,$(DEPLOY_HOSTS), \
echo "$(host)"; \
ssh $(SSH_USER)@$(host) "cd $(project_dir); docker-compose logs -f $(service)"; \
)
restart-compose:
@echo "\n### restarting service(s)"
@$(foreach host,$(DEPLOY_HOSTS), \
set -e; \
echo "#host: $(host)"; \
ssh $(SSH_USER)@$(host) "cd $(project_dir); $(COMPOSE_CMD) restart"; \
@- echo "\n### restarting service(s)"
@- $(foreach host,$(DEPLOY_HOSTS), \
echo "$(host)"; \
ssh $(SSH_USER)@$(host) "cd $(project_dir); docker-compose restart"; \
sleep $(DEPLOY_START_DELAY); \
set +e; \
)

4
cron.mk
View file

@ -4,19 +4,15 @@ start-cron:
@- echo "\n### starting..."
@- $(foreach host,$(DEPLOY_HOSTS), \
echo "$(host)"; \
set -e; \
ssh $(SSH_USER)@$(host) "sudo -u $(CRON_USER) sh -c 'crontab -l | sed \"/^#make-deploy-cron:$(DEPLOY_NAME)/,+1 d\" | { cat; echo \"#make-deploy-cron:$(DEPLOY_NAME)\"; cat \"$(DEPLOY_PATH)/$(DEPLOY_NAME)/crontab\"; } | crontab -'"; \
sleep $(DEPLOY_START_DELAY); \
set +e; \
)
stop-cron:
@- echo "\n### stopping ..."
@- $(foreach host,$(DEPLOY_HOSTS), \
echo "$(host)"; \
set -e; \
ssh $(SSH_USER)@$(host) "sudo -u $(CRON_USER) sh -c 'crontab -l | sed \"/^#make-deploy-cron:$(DEPLOY_NAME)/,+1 d\" | crontab -'"; \
set +e; \
)
pull-cron:

25
helm.mk
View file

@ -23,20 +23,14 @@ ifdef HELM_REPO_URL
@- helm repo update $(HELM_CHART_NAME)
endif
@ $(eval helm_params = $(HELM_CHART_NAME) $(HELM_CHART_PATH) -n $(K8S_NAMESPACE) --install --wait --values)
ifdef DEBUG_MODE
@- echo "\n### deploying helm chart with --debug flag"
@- echo "-- DEBUG DEPLOYMENT --------------------"
@- echo " "
@- echo "Namespace: $(K8S_NAMESPACE)"
@- echo "Helm Chart: $(HELM_CHART_PATH)"
@- echo "Helm Version (use latest if empty): $(HELM_CHART_VERSION)"
@- echo "Values File: $(HELM_VALUES_FILE)"
@- echo " "
@- echo "----------------------------------"
@ envsubst < $(HELM_VALUES_FILE) | helm upgrade $(HELM_CHART_NAME) $(HELM_CHART_PATH) -n $(K8S_NAMESPACE) --install --debug --wait --values - --version "$(HELM_CHART_VERSION)"
else
@ $(eval helm_params = $(helm_params) --debug)
endif
ifdef K8S_KUBECONFIG
@ $(eval helm_params = $(helm_params) --kubeconfig $(K8S_KUBECONFIG))
endif
@ $(eval helm_params = $(helm_params) - --version $(HELM_CHART_VERSION))
@- echo "\n### deploying helm chart"
@- echo "-- DEPLOYMENT --------------------"
@ -48,10 +42,7 @@ else
@- echo " "
@- echo "----------------------------------"
@ envsubst < $(HELM_VALUES_FILE) | helm upgrade $(HELM_CHART_NAME) $(HELM_CHART_PATH) -n $(K8S_NAMESPACE) --install --wait --values - --version "$(HELM_CHART_VERSION)"
endif
envsubst < $(HELM_VALUES_FILE) | helm upgrade $(helm_params)
pull-helm:
# nop

9
k8s.mk
View file

@ -4,19 +4,14 @@
MANDATORY = $(shell printenv MANDATORY) K8S_CONTEXT
K8S_MANIFEST_FILENAME ?= kubernetes.yaml
ifneq ("$(wildcard secrets.yaml)","")
SECRETS="secrets.yaml"
else
SECRETS=""
endif
start-k8s:
@- echo "\n### starting deployment with k8s"
@- echo "\n### setting kubernetes context to $(K8S_CONTEXT)"
@ kubectl config use-context $(K8S_CONTEXT)
@- echo "\n### run kubectl apply -f $(K8S_MANIFEST_FILENAME) and if available secrets file $(SECRETS)"
@ cat $(K8S_MANIFEST_FILENAME) $(SECRETS) | envsubst | kubectl apply $(K8S_ADDITIONAL_PARAMS) -f -
@- echo "\n### run kubectl apply -f $(K8S_MANIFEST_FILENAME) and secrets.yaml"
@ cat $(K8S_MANIFEST_FILENAME) secrets.yaml | envsubst | kubectl apply $(K8S_ADDITIONAL_PARAMS) -f -
pull-k8s:
# nop

8
simple.mk
View file

@ -3,7 +3,7 @@
# this just rsyncs the stuff to the remote server(s) and runs
# build.sh, pre-/post-deploy, pre-/post-local, start.sh, etc.
ifndef DEPLOY_START_DELAY
ifndef DEPLOY_StART_DELAY
DEPLOY_START_DELAY = 0
endif
@ -13,9 +13,7 @@ pull-simple:
start-simple:
@- echo "\n### start"
@- $(foreach host,$(DEPLOY_HOSTS), \
echo "#host: $(host)"; \
set -e; \
if [ -e start.sh ] ; then ssh $(SSH_USER)@$(host) "cd $(DEPLOY_PATH)/$(DEPLOY_NAME); sh start.sh"; fi; \
echo "$(host)"; \
ssh $(SSH_USER)@$(host) "cd $(DEPLOY_PATH)/$(DEPLOY_NAME); sh start.sh"; \
sleep $(DEPLOY_START_DELAY); \
set +e; \
)

2
swarm.mk
View file

@ -4,9 +4,7 @@ start-swarm:
@- echo "\n### starting service(s)"
@- $(foreach host,$(DEPLOY_HOSTS), \
echo "$(host)"; \
set -e; \
ssh $(SSH_USER)@$(host) "cd $(DEPLOY_PATH)/$(DEPLOY_NAME); docker stack deploy -c stack.yml $(DEPLOY_NAME)"; \
set +e; \
)
stop-swarm: