15359401fa
The Next.js 16 webapp in sibling repo honeyDueAPI-Web now runs alongside api/worker/admin on the cluster. Uses a server-side proxy pattern: browser hits app.myhoneydue.com, Next.js route handlers forward to the Go API with an httpOnly cookie, so no CORS entry or Allowed-Hosts change is needed on the API side. Availability mirrors api (3 replicas, PDB minAvailable:2, topologySpreadConstraints across nodes). Changes: - deploy-k3s/manifests/web/deployment.yaml: 3 replicas, readOnly root FS, drops all caps, mounts emptyDir for /app/.next/cache and /tmp, reads API_URL from honeydue-config. - deploy-k3s/manifests/web/service.yaml: ClusterIP :3000. - deploy-k3s/manifests/rbac.yaml: ServiceAccount web with automountServiceAccountToken: false. - deploy-k3s/manifests/pod-disruption-budgets.yaml: web-pdb minAvailable: 2. - deploy-k3s/manifests/ingress/ingress-simple.yaml: route app.myhoneydue.com → web:3000. - deploy-k3s/scripts/_config.sh: emit API_URL into the ConfigMap. - deploy-k3s/scripts/03-deploy.sh: build + push + apply the web image alongside api/worker/admin. Reads NEXT_PUBLIC_POSTHOG_KEY and NEXT_PUBLIC_POSTHOG_HOST from the operator shell env (not committed). Also adds the --build-arg NEXT_PUBLIC_API_URL wiring for the admin image that was previously only done manually. Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
187 lines
6.5 KiB
Bash
Executable File
187 lines
6.5 KiB
Bash
Executable File
#!/usr/bin/env bash
|
|
set -euo pipefail
|
|
|
|
SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
|
|
# shellcheck source=_config.sh
|
|
source "${SCRIPT_DIR}/_config.sh"
|
|
|
|
REPO_DIR="$(cd "${DEPLOY_DIR}/.." && pwd)"
|
|
NAMESPACE="honeydue"
|
|
MANIFESTS="${DEPLOY_DIR}/manifests"
|
|
|
|
log() { printf '[deploy] %s\n' "$*"; }
|
|
warn() { printf '[deploy][warn] %s\n' "$*" >&2; }
|
|
die() { printf '[deploy][error] %s\n' "$*" >&2; exit 1; }
|
|
|
|
# --- Parse arguments ---
|
|
|
|
SKIP_BUILD=false
|
|
DEPLOY_TAG=""
|
|
|
|
while (( $# > 0 )); do
|
|
case "$1" in
|
|
--skip-build) SKIP_BUILD=true; shift ;;
|
|
--tag)
|
|
[[ -n "${2:-}" ]] || die "--tag requires a value"
|
|
DEPLOY_TAG="$2"; shift 2 ;;
|
|
-h|--help)
|
|
cat <<'EOF'
|
|
Usage: ./scripts/03-deploy.sh [OPTIONS]
|
|
|
|
Options:
|
|
--skip-build Skip Docker build/push, use existing images
|
|
--tag <tag> Image tag (default: git short SHA)
|
|
-h, --help Show this help
|
|
EOF
|
|
exit 0 ;;
|
|
*) die "Unknown argument: $1" ;;
|
|
esac
|
|
done
|
|
|
|
# --- Prerequisites ---
|
|
|
|
command -v kubectl >/dev/null 2>&1 || die "Missing: kubectl"
|
|
command -v docker >/dev/null 2>&1 || die "Missing: docker"
|
|
|
|
if [[ -z "${DEPLOY_TAG}" ]]; then
|
|
DEPLOY_TAG="$(git -C "${REPO_DIR}" rev-parse --short HEAD 2>/dev/null || echo "latest")"
|
|
fi
|
|
|
|
# --- Read registry config ---
|
|
|
|
REGISTRY_SERVER="$(cfg_require registry.server "Container registry server")"
|
|
REGISTRY_NS="$(cfg_require registry.namespace "Registry namespace")"
|
|
REGISTRY_USER="$(cfg_require registry.username "Registry username")"
|
|
REGISTRY_TOKEN="$(cfg_require registry.token "Registry token")"
|
|
|
|
REGISTRY_PREFIX="${REGISTRY_SERVER%/}/${REGISTRY_NS#/}"
|
|
API_IMAGE="${REGISTRY_PREFIX}/honeydue-api:${DEPLOY_TAG}"
|
|
WORKER_IMAGE="${REGISTRY_PREFIX}/honeydue-worker:${DEPLOY_TAG}"
|
|
ADMIN_IMAGE="${REGISTRY_PREFIX}/honeydue-admin:${DEPLOY_TAG}"
|
|
WEB_IMAGE="${REGISTRY_PREFIX}/honeydue-web:${DEPLOY_TAG}"
|
|
|
|
# The web client lives in a sibling repo. Resolve its path once.
|
|
WEB_REPO_DIR="$(cd "${REPO_DIR}/../honeyDueAPI-Web" 2>/dev/null && pwd || echo "")"
|
|
|
|
# NEXT_PUBLIC_* is baked into client bundles at build time, so API/PostHog
|
|
# URLs must be passed as build-args — setting them at pod runtime has no
|
|
# effect on already-bundled JS.
|
|
API_DOMAIN="$(cfg_require domains.api "API domain")"
|
|
ADMIN_API_URL="https://${API_DOMAIN}"
|
|
WEB_API_URL="https://${API_DOMAIN}/api"
|
|
|
|
# PostHog keys for the web client are optional — read from operator shell
|
|
# env so they never land in a committed file. Empty disables analytics.
|
|
: "${NEXT_PUBLIC_POSTHOG_KEY:=}"
|
|
: "${NEXT_PUBLIC_POSTHOG_HOST:=}"
|
|
|
|
# --- Build and push ---
|
|
|
|
if [[ "${SKIP_BUILD}" == "false" ]]; then
|
|
log "Logging in to ${REGISTRY_SERVER}..."
|
|
printf '%s' "${REGISTRY_TOKEN}" | docker login "${REGISTRY_SERVER}" -u "${REGISTRY_USER}" --password-stdin >/dev/null
|
|
|
|
log "Building API image: ${API_IMAGE}"
|
|
docker build --target api -t "${API_IMAGE}" "${REPO_DIR}"
|
|
|
|
log "Building Worker image: ${WORKER_IMAGE}"
|
|
docker build --target worker -t "${WORKER_IMAGE}" "${REPO_DIR}"
|
|
|
|
log "Building Admin image: ${ADMIN_IMAGE} (NEXT_PUBLIC_API_URL=${ADMIN_API_URL})"
|
|
docker build --target admin \
|
|
--build-arg "NEXT_PUBLIC_API_URL=${ADMIN_API_URL}" \
|
|
-t "${ADMIN_IMAGE}" "${REPO_DIR}"
|
|
|
|
if [[ -n "${WEB_REPO_DIR}" && -f "${WEB_REPO_DIR}/Dockerfile" ]]; then
|
|
log "Building Web image: ${WEB_IMAGE} (NEXT_PUBLIC_API_URL=${WEB_API_URL})"
|
|
docker build \
|
|
--build-arg "NEXT_PUBLIC_API_URL=${WEB_API_URL}" \
|
|
--build-arg "NEXT_PUBLIC_POSTHOG_KEY=${NEXT_PUBLIC_POSTHOG_KEY}" \
|
|
--build-arg "NEXT_PUBLIC_POSTHOG_HOST=${NEXT_PUBLIC_POSTHOG_HOST}" \
|
|
-t "${WEB_IMAGE}" "${WEB_REPO_DIR}"
|
|
else
|
|
warn "honeyDueAPI-Web sibling repo not found at ${WEB_REPO_DIR:-<unset>}; skipping web build"
|
|
fi
|
|
|
|
log "Pushing images..."
|
|
docker push "${API_IMAGE}"
|
|
docker push "${WORKER_IMAGE}"
|
|
docker push "${ADMIN_IMAGE}"
|
|
[[ -n "${WEB_REPO_DIR}" && -f "${WEB_REPO_DIR}/Dockerfile" ]] && docker push "${WEB_IMAGE}"
|
|
|
|
# Also tag and push :latest
|
|
docker tag "${API_IMAGE}" "${REGISTRY_PREFIX}/honeydue-api:latest"
|
|
docker tag "${WORKER_IMAGE}" "${REGISTRY_PREFIX}/honeydue-worker:latest"
|
|
docker tag "${ADMIN_IMAGE}" "${REGISTRY_PREFIX}/honeydue-admin:latest"
|
|
docker push "${REGISTRY_PREFIX}/honeydue-api:latest"
|
|
docker push "${REGISTRY_PREFIX}/honeydue-worker:latest"
|
|
docker push "${REGISTRY_PREFIX}/honeydue-admin:latest"
|
|
if [[ -n "${WEB_REPO_DIR}" && -f "${WEB_REPO_DIR}/Dockerfile" ]]; then
|
|
docker tag "${WEB_IMAGE}" "${REGISTRY_PREFIX}/honeydue-web:latest"
|
|
docker push "${REGISTRY_PREFIX}/honeydue-web:latest"
|
|
fi
|
|
else
|
|
warn "Skipping build. Using images for tag: ${DEPLOY_TAG}"
|
|
fi
|
|
|
|
# --- Generate and apply ConfigMap from config.yaml ---
|
|
|
|
log "Generating env from config.yaml..."
|
|
ENV_FILE="$(mktemp)"
|
|
trap 'rm -f "${ENV_FILE}"' EXIT
|
|
generate_env > "${ENV_FILE}"
|
|
|
|
log "Creating ConfigMap..."
|
|
kubectl create configmap honeydue-config \
|
|
--namespace="${NAMESPACE}" \
|
|
--from-env-file="${ENV_FILE}" \
|
|
--dry-run=client -o yaml | kubectl apply -f -
|
|
|
|
# --- Apply manifests ---
|
|
|
|
log "Applying manifests..."
|
|
|
|
kubectl apply -f "${MANIFESTS}/namespace.yaml"
|
|
kubectl apply -f "${MANIFESTS}/redis/"
|
|
kubectl apply -f "${MANIFESTS}/ingress/"
|
|
|
|
# Apply deployments with image substitution
|
|
sed "s|image: IMAGE_PLACEHOLDER|image: ${API_IMAGE}|" "${MANIFESTS}/api/deployment.yaml" | kubectl apply -f -
|
|
kubectl apply -f "${MANIFESTS}/api/service.yaml"
|
|
kubectl apply -f "${MANIFESTS}/api/hpa.yaml"
|
|
|
|
sed "s|image: IMAGE_PLACEHOLDER|image: ${WORKER_IMAGE}|" "${MANIFESTS}/worker/deployment.yaml" | kubectl apply -f -
|
|
|
|
sed "s|image: IMAGE_PLACEHOLDER|image: ${ADMIN_IMAGE}|" "${MANIFESTS}/admin/deployment.yaml" | kubectl apply -f -
|
|
kubectl apply -f "${MANIFESTS}/admin/service.yaml"
|
|
|
|
if [[ -d "${MANIFESTS}/web" ]]; then
|
|
sed "s|image: IMAGE_PLACEHOLDER|image: ${WEB_IMAGE}|" "${MANIFESTS}/web/deployment.yaml" | kubectl apply -f -
|
|
kubectl apply -f "${MANIFESTS}/web/service.yaml"
|
|
fi
|
|
|
|
# --- Wait for rollouts ---
|
|
|
|
log "Waiting for rollouts..."
|
|
|
|
kubectl rollout status deployment/redis -n "${NAMESPACE}" --timeout=120s
|
|
kubectl rollout status deployment/api -n "${NAMESPACE}" --timeout=300s
|
|
kubectl rollout status deployment/worker -n "${NAMESPACE}" --timeout=300s
|
|
kubectl rollout status deployment/admin -n "${NAMESPACE}" --timeout=300s
|
|
if [[ -d "${MANIFESTS}/web" ]]; then
|
|
kubectl rollout status deployment/web -n "${NAMESPACE}" --timeout=300s
|
|
fi
|
|
|
|
# --- Done ---
|
|
|
|
log ""
|
|
log "Deploy completed successfully."
|
|
log "Tag: ${DEPLOY_TAG}"
|
|
log "Images:"
|
|
log " API: ${API_IMAGE}"
|
|
log " Worker: ${WORKER_IMAGE}"
|
|
log " Admin: ${ADMIN_IMAGE}"
|
|
[[ -d "${MANIFESTS}/web" ]] && log " Web: ${WEB_IMAGE}"
|
|
log ""
|
|
log "Run ./scripts/04-verify.sh to check cluster health."
|