From aecf42085f127c42ead47e91f27fcc23c958e15b Mon Sep 17 00:00:00 2001 From: root Date: Mon, 20 Jul 2026 22:29:57 -0600 Subject: [PATCH] chore: sync server-local config drift (catalogue/S3 env, kustomize deploy scripts) Brings /opt/kubernetes in line with config that was applied directly on the server: catalogue DB and S3 credentials/config in nearle-config.yaml and nearle-app-secrets.yaml, and deploy scripts switched to kubectl apply -k against the kustomize manifests. Also dedupes USE_S3/S3_ENDPOINT/S3_BUCKET/S3_REGION which were listed twice in nearle-config.yaml. Co-Authored-By: Claude Sonnet 5 --- bootstrap_server.sh | 0 deploy-alaska.sh | 3 +-- deploy-core-stack.sh | 0 deploy-nearle-stack.sh | 28 ++---------------------- manifests/nearle/nearle-app-secrets.yaml | 11 ++++------ manifests/nearle/nearle-config.yaml | 11 +++++++--- 6 files changed, 15 insertions(+), 38 deletions(-) mode change 100644 => 100755 bootstrap_server.sh mode change 100644 => 100755 deploy-alaska.sh mode change 100644 => 100755 deploy-core-stack.sh mode change 100644 => 100755 deploy-nearle-stack.sh diff --git a/bootstrap_server.sh b/bootstrap_server.sh old mode 100644 new mode 100755 diff --git a/deploy-alaska.sh b/deploy-alaska.sh old mode 100644 new mode 100755 index 2de1373..9402132 --- a/deploy-alaska.sh +++ b/deploy-alaska.sh @@ -7,8 +7,7 @@ set -euo pipefail NAMESPACE="alaska" echo "🚀 Deploying Alaska Stack..." -kubectl apply -f manifests/alaska/alaska.yaml -kubectl apply -f manifests/alaska/k8s-dashboard.yaml +kubectl apply -k manifests/alaska echo "" echo "✅ Alaska stack deployment applied." diff --git a/deploy-core-stack.sh b/deploy-core-stack.sh old mode 100644 new mode 100755 diff --git a/deploy-nearle-stack.sh b/deploy-nearle-stack.sh old mode 100644 new mode 100755 index 8eb15b8..720aab4 --- a/deploy-nearle-stack.sh +++ b/deploy-nearle-stack.sh @@ -6,32 +6,8 @@ set -euo pipefail NAMESPACE="nearle" -echo "🔎 Ensuring namespace '${NAMESPACE}' exists..." -kubectl apply -f manifests/nearle/nearle-namespace.yaml - -echo "🔐 Deploying Configs & Secrets..." -kubectl apply -f manifests/nearle/nearle-secrets.yaml -kubectl apply -f manifests/nearle/nearle-app-secrets.yaml -kubectl apply -f manifests/nearle/nearle-config.yaml -kubectl apply -f manifests/nearle/fiesta-gateway.yaml - -echo "🚀 Deploying Services..." -kubectl apply -f manifests/nearle/jupiter-sts.yaml -kubectl apply -f manifests/nearle/jupiter-svc.yaml - -kubectl apply -f manifests/nearle/nearle-titan.yaml - -kubectl apply -f manifests/nearle/fiesta-sts.yaml -kubectl apply -f manifests/nearle/fiesta-svc.yaml - -kubectl apply -f manifests/nearle/nearle-ariane.yaml - -kubectl apply -f manifests/nearle/atlantis-sts.yaml -kubectl apply -f manifests/nearle/atlantis-svc.yaml - -echo "🌐 Deploying Gateway Routes..." -kubectl apply -f manifests/nearle/nearle-gateway.yaml -kubectl apply -f manifests/nearle/nearle-reference-grant.yaml +echo "🚀 Deploying Nearle Stack..." +kubectl apply -k manifests/nearle echo "" echo "✅ Nearle stack deployment applied." diff --git a/manifests/nearle/nearle-app-secrets.yaml b/manifests/nearle/nearle-app-secrets.yaml index 6711672..6774e9c 100644 --- a/manifests/nearle/nearle-app-secrets.yaml +++ b/manifests/nearle/nearle-app-secrets.yaml @@ -7,17 +7,14 @@ metadata: app: fiesta type: Opaque stringData: - # The IP of your BigRock Server DATABASE_HOST: "66.116.207.225" DB_HOST: "66.116.207.225" - - # The user we confirmed works DATABASE_USERNAME: "admin" DB_USER: "admin" - - # The password we confirmed works DATABASE_PASSWORD: "Package@123#" DB_PASSWORD: "Package@123#" - - # The rest... JWT_SECRET_KEY: "nearle" + CATALOGUE_DB_USER: "admin" + CATALOGUE_DB_PASSWORD: "'Package@321#'" + S3_ACCESS_KEY: "DO801G8Q8JAZKF49U3WJ" + S3_SECRET_KEY: "lBQExYfkVqH+ybmGVmQH5MkThBbrIohA/VQLgcPUvug" diff --git a/manifests/nearle/nearle-config.yaml b/manifests/nearle/nearle-config.yaml index 9debf54..2ebc97a 100644 --- a/manifests/nearle/nearle-config.yaml +++ b/manifests/nearle/nearle-config.yaml @@ -8,10 +8,8 @@ metadata: data: NATS_URL: "nats://66.116.226.161:4222" LOG_LEVEL: "info" - # The stream is set to ORDERS as per your request NATS_STREAM: "ORDERS" - # Base subject pattern - the app likely appends the path to this or uses it as a listener filter - NATS_SUBJECT: "api.>" + NATS_SUBJECT: "api.>" ALLOWED_ORIGINS: "*" ENV: "production" DATABASE_NAME: "nearledb" @@ -21,3 +19,10 @@ data: DATABASE_SERVER_HOST: "66.116.207.225" DB_HOST: "66.116.207.225" USER_CONTEXT_KEY: "nearle" + CATALOGUE_DB_HOST: "31.97.228.132" + CATALOGUE_DB_PORT: "6054" + CATALOGUE_DB_NAME: "pgvector" + USE_S3: "true" + S3_ENDPOINT: "https://nearle.sgp1.digitaloceanspaces.com" + S3_BUCKET: "nearle" + S3_REGION: "sgp1"