Remove k8s-server host
Drop k8s-server from flake, Makefile targets, modules (kubernetes.nix, docker-registry.nix), install script and hardware config. Remove related registry vhost, port 6443 and NAT rules from gateway.nix. Drop K8s-Server section and dangling markdown wrapper from README. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
This commit is contained in:
@@ -1,9 +1,8 @@
|
||||
.PHONY: help deploy deploy-gateway deploy-fileserver deploy-k8s-server install-gateway install-fileserver install-k8s-server fetch-hwconfig-gateway fetch-hwconfig-fileserver fetch-hwconfig-k8s-server upgrade-containers all
|
||||
.PHONY: help deploy deploy-gateway deploy-fileserver install-gateway install-fileserver fetch-hwconfig-gateway fetch-hwconfig-fileserver upgrade-containers all
|
||||
|
||||
# Hosts
|
||||
GATEWAY_HOST := danlin@10.202.82.3
|
||||
FILESERVER_HOST := danlin@10.202.82.6
|
||||
K8S_HOST := danlin@10.202.82.7
|
||||
|
||||
# Default target
|
||||
all: deploy
|
||||
@@ -15,30 +14,16 @@ help:
|
||||
@echo " make deploy Deploy to gateway and fileserver"
|
||||
@echo " make deploy-gateway Deploy to gateway only"
|
||||
@echo " make deploy-fileserver Deploy to fileserver only"
|
||||
@echo " make deploy-k8s-server Deploy to k8s-server only"
|
||||
@echo " make upgrade-containers Pull latest images and restart containers on fileserver"
|
||||
@echo " make install-gateway Run installation script for gateway"
|
||||
@echo " make install-fileserver Run installation script for fileserver"
|
||||
@echo " make install-k8s-server Run installation script for k8s-server"
|
||||
@echo " make fetch-hwconfig-gateway Fetch hardware config from gateway"
|
||||
@echo " make fetch-hwconfig-fileserver Fetch hardware config from fileserver"
|
||||
@echo " make fetch-hwconfig-k8s-server Fetch hardware config from k8s-server"
|
||||
@echo ""
|
||||
|
||||
# Deployment targets
|
||||
deploy: deploy-gateway deploy-fileserver
|
||||
|
||||
deploy-k8s-server:
|
||||
@echo "======================================"
|
||||
@echo "Deploying k8s-server..."
|
||||
@echo "======================================"
|
||||
@echo "Syncing files to k8s-server..."
|
||||
rsync -av --delete --exclude '.git' ./ $(K8S_HOST):/tmp/infra-nix/
|
||||
@echo "Building and switching on k8s-server..."
|
||||
ssh -tt $(K8S_HOST) "cd /tmp/infra-nix && sudo nixos-rebuild switch --flake '.#k8s-server'"
|
||||
@echo "✓ k8s-server deployed successfully"
|
||||
@echo ""
|
||||
|
||||
deploy-gateway:
|
||||
@echo "======================================"
|
||||
@echo "Deploying gateway..."
|
||||
@@ -118,28 +103,6 @@ install-fileserver:
|
||||
echo "✓ Update hosts/fileserver/configuration.nix with the correct IP if needed"
|
||||
@echo ""
|
||||
|
||||
install-k8s-server:
|
||||
@echo "======================================"
|
||||
@echo "Installing k8s-server..."
|
||||
@echo "======================================"
|
||||
@read -p "Enter k8s-server IP address: " IP; \
|
||||
if [ -z "$$IP" ]; then \
|
||||
echo "Error: IP address required"; \
|
||||
exit 1; \
|
||||
fi; \
|
||||
echo "Copying install script to $$IP..."; \
|
||||
scp install/install-k8s-server.sh root@$$IP:/tmp/; \
|
||||
echo "Connecting to $$IP..."; \
|
||||
ssh root@$$IP "bash /tmp/install-k8s-server.sh"; \
|
||||
echo ""; \
|
||||
echo "Fetching hardware config from $$IP..."; \
|
||||
scp root@$$IP:/mnt/etc/nixos/hardware-configuration.nix hosts/k8s-server/hardware-configuration.nix; \
|
||||
echo "✓ Hardware config saved to hosts/k8s-server/hardware-configuration.nix"; \
|
||||
scp root@$$IP:/mnt/etc/nixos/configuration.nix hosts/k8s-server/configuration.installer.nix; \
|
||||
echo "✓ Installer config saved to hosts/k8s-server/configuration.installer.nix"; \
|
||||
echo "✓ Update hosts/k8s-server/configuration.nix with the correct IP if needed"
|
||||
@echo ""
|
||||
|
||||
# Fetch hardware configuration targets
|
||||
fetch-hwconfig-gateway:
|
||||
@echo "======================================"
|
||||
@@ -156,11 +119,3 @@ fetch-hwconfig-fileserver:
|
||||
scp $(FILESERVER_HOST):/etc/nixos/hardware-configuration.nix hosts/fileserver/
|
||||
@echo "✓ Hardware config saved to hosts/fileserver/hardware-configuration.nix"
|
||||
@echo ""
|
||||
|
||||
fetch-hwconfig-k8s-server:
|
||||
@echo "======================================"
|
||||
@echo "Fetching hardware config from k8s-server..."
|
||||
@echo "======================================"
|
||||
scp $(K8S_HOST):/etc/nixos/hardware-configuration.nix hosts/k8s-server/
|
||||
@echo "✓ Hardware config saved to hosts/k8s-server/hardware-configuration.nix"
|
||||
@echo ""
|
||||
|
||||
Reference in New Issue
Block a user