kingjaypee12/MKM
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore(Makefile): update server config and improve deployment scripts

Browse Source 
- 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
This commit is contained in:
Jp
2026-02-26 11:25:54 +08:00
parent 55d2f61d09
commit 07748a7025
1 changed files with 15 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
Makefile
View File

@@ -4,31 +4,31 @@ build:
podman build -t $(IMG) . podman build -t $(IMG) .
# Server configuration (Change these to your actual server details) # Server configuration (Change these to your actual server details)
SERVER_USER := user SERVER_USER := ubuntu
SERVER_IP := 192.168.100.105 SERVER_IP := 192.168.100.200
SERVER_PATH := /var/www/mkm-admin SERVER_PATH := /var/www/MKM
deploy: build deploy: build
@echo "Cleaning up existing deployment if any..." @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..." @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 @kubectl create configmap mkm-admin-config --from-env-file=.env --dry-run=client -o yaml > /tmp/merged_deployment.yaml
@echo "---" >> k8s/merged_deployment.yaml @echo "---" >> /tmp/merged_deployment.yaml
@cat k8s/deployment.yaml >> k8s/merged_deployment.yaml @cat k8s/deployment.yaml >> /tmp/merged_deployment.yaml
@echo "Deploying via podman kube play..." @echo "Deploying via podman kube play..."
podman kube play k8s/merged_deployment.yaml podman kube play /tmp/merged_deployment.yaml
@rm k8s/merged_deployment.yaml @rm /tmp/merged_deployment.yaml
deploy-server: deploy-server:
@echo "Deploying to remote server $(SERVER_IP)..." @echo "Deploying to remote server $(SERVER_IP)..."
@# Generate temporary merged YAML for server @# 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 > k8s/server_deploy.yaml @kubectl create configmap mkm-admin-config --from-env-file=.env --dry-run=client -o yaml > /tmp/server_deploy.yaml
@echo "---" >> k8s/server_deploy.yaml @echo "---" >> /tmp/server_deploy.yaml
@cat k8s/deployment.yaml >> k8s/server_deploy.yaml @cat k8s/deployment.yaml >> /tmp/server_deploy.yaml
@# Single SCP/SSH call to reduce password prompts @# 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" 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: stop:
-podman kube down k8s/deployment.yaml >/dev/null 2>&1 -podman kube down k8s/deployment.yaml >/dev/null 2>&1