From 07748a702516ff46881e4f793f6740bfc72cccf8 Mon Sep 17 00:00:00 2001 From: Jp Date: Thu, 26 Feb 2026 11:25:54 +0800 Subject: [PATCH] chore(Makefile): update server config and improve deployment scripts - Update default server user, IP, and deployment path to match current environment - Redirect podman kube down output to /dev/null to reduce noise - Use /tmp directory for temporary YAML files to avoid WSL permission issues - Consolidate deployment steps to reduce password prompts during remote deployment --- Makefile | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/Makefile b/Makefile index bc090e1..bbce8af 100644 --- a/Makefile +++ b/Makefile @@ -4,31 +4,31 @@ build: podman build -t $(IMG) . # Server configuration (Change these to your actual server details) -SERVER_USER := user -SERVER_IP := 192.168.100.105 -SERVER_PATH := /var/www/mkm-admin +SERVER_USER := ubuntu +SERVER_IP := 192.168.100.200 +SERVER_PATH := /var/www/MKM deploy: build @echo "Cleaning up existing deployment if any..." - -podman kube down k8s/deployment.yaml + -podman kube down k8s/deployment.yaml >/dev/null 2>&1 @echo "Generating merged deployment with ConfigMap..." - kubectl create configmap mkm-admin-config --from-env-file=.env --dry-run=client -o yaml > k8s/merged_deployment.yaml - @echo "---" >> k8s/merged_deployment.yaml - @cat k8s/deployment.yaml >> k8s/merged_deployment.yaml + @kubectl create configmap mkm-admin-config --from-env-file=.env --dry-run=client -o yaml > /tmp/merged_deployment.yaml + @echo "---" >> /tmp/merged_deployment.yaml + @cat k8s/deployment.yaml >> /tmp/merged_deployment.yaml @echo "Deploying via podman kube play..." - podman kube play k8s/merged_deployment.yaml - @rm k8s/merged_deployment.yaml + podman kube play /tmp/merged_deployment.yaml + @rm /tmp/merged_deployment.yaml deploy-server: @echo "Deploying to remote server $(SERVER_IP)..." - @# Generate temporary merged YAML for server - @kubectl create configmap mkm-admin-config --from-env-file=.env --dry-run=client -o yaml > k8s/server_deploy.yaml - @echo "---" >> k8s/server_deploy.yaml - @cat k8s/deployment.yaml >> k8s/server_deploy.yaml + @# Generate temporary merged YAML for server in /tmp to avoid WSL permissions + @kubectl create configmap mkm-admin-config --from-env-file=.env --dry-run=client -o yaml > /tmp/server_deploy.yaml + @echo "---" >> /tmp/server_deploy.yaml + @cat k8s/deployment.yaml >> /tmp/server_deploy.yaml @# Single SCP/SSH call to reduce password prompts - scp k8s/server_deploy.yaml $(SERVER_USER)@$(SERVER_IP):/tmp/server_deploy.yaml + scp /tmp/server_deploy.yaml $(SERVER_USER)@$(SERVER_IP):/tmp/server_deploy.yaml ssh $(SERVER_USER)@$(SERVER_IP) "kubectl apply -f /tmp/server_deploy.yaml && rm /tmp/server_deploy.yaml" - @rm k8s/server_deploy.yaml + @rm /tmp/server_deploy.yaml stop: -podman kube down k8s/deployment.yaml >/dev/null 2>&1