diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml deleted file mode 100644 index 5ec3484..0000000 --- a/.gitea/workflows/deploy.yml +++ /dev/null @@ -1,237 +0,0 @@ -name: Deploy - -on: - push: - branches: - - main - workflow_dispatch: - -env: - REGISTRY: git.itexp.me - IMAGE_TAG: ${{ gitea.sha }} - ADMIN_API_IMAGE: git.itexp.me/bsodfather/crank-community-admin-api - MCP_SERVER_IMAGE: git.itexp.me/bsodfather/crank-community-mcp-server - UI_IMAGE: git.itexp.me/bsodfather/crank-community-ui - OPENBAO_ENV_FILE: .openbao-env - -jobs: - deploy: - runs-on: ubuntu-latest - - steps: - - name: Checkout - uses: actions/checkout@v5 - - - name: Verify runner toolchain - run: | - docker --version - command -v bao - bao version - - - name: Load deployment secrets from OpenBao - env: - BAO_ADDR: ${{ secrets.BAO_ADDR }} - BAO_ROLE_ID: ${{ secrets.BAO_ROLE_ID }} - BAO_SECRET_ID: ${{ secrets.BAO_SECRET_ID }} - OPENBAO_APP: crank - run: scripts/load-openbao-env.sh - - - name: Login to registry - run: | - . "$OPENBAO_ENV_FILE" - printf '%s' "$DEPLOY_REGISTRY_TOKEN" | \ - docker login '${{ env.REGISTRY }}' -u "$DEPLOY_REGISTRY_USER" --password-stdin - - - name: Build and push images - run: | - docker build -f apps/admin-api/Dockerfile \ - -t '${{ env.ADMIN_API_IMAGE }}:${{ env.IMAGE_TAG }}' \ - -t '${{ env.ADMIN_API_IMAGE }}:main' \ - . - docker build -f apps/mcp-server/Dockerfile \ - -t '${{ env.MCP_SERVER_IMAGE }}:${{ env.IMAGE_TAG }}' \ - -t '${{ env.MCP_SERVER_IMAGE }}:main' \ - . - docker build -f apps/ui/Dockerfile \ - -t '${{ env.UI_IMAGE }}:${{ env.IMAGE_TAG }}' \ - -t '${{ env.UI_IMAGE }}:main' \ - . - docker push '${{ env.ADMIN_API_IMAGE }}:${{ env.IMAGE_TAG }}' - docker push '${{ env.ADMIN_API_IMAGE }}:main' - docker push '${{ env.MCP_SERVER_IMAGE }}:${{ env.IMAGE_TAG }}' - docker push '${{ env.MCP_SERVER_IMAGE }}:main' - docker push '${{ env.UI_IMAGE }}:${{ env.IMAGE_TAG }}' - docker push '${{ env.UI_IMAGE }}:main' - - - name: Configure SSH key - run: | - . "$OPENBAO_ENV_FILE" - mkdir -p ~/.ssh - chmod 700 ~/.ssh - printf '%s\n' "$DEPLOY_SSH_KEY" > ~/.ssh/id_ed25519 - chmod 600 ~/.ssh/id_ed25519 - - - name: Configure known hosts - run: | - . "$OPENBAO_ENV_FILE" - if [ -n "${DEPLOY_KNOWN_HOSTS:-}" ]; then - printf '%s\n' "$DEPLOY_KNOWN_HOSTS" > ~/.ssh/known_hosts - else - ssh-keyscan -p "${DEPLOY_PORT:-22}" "$DEPLOY_HOST" > ~/.ssh/known_hosts - fi - chmod 644 ~/.ssh/known_hosts - - - name: Sync deployment files to server - run: | - . "$OPENBAO_ENV_FILE" - ssh -p "$DEPLOY_PORT" "$DEPLOY_USER@$DEPLOY_HOST" \ - "mkdir -p '$DEPLOY_PATH'" - rsync -az -e "ssh -p $DEPLOY_PORT" deploy/community/docker-compose.yml \ - "$DEPLOY_USER@$DEPLOY_HOST:$DEPLOY_PATH/docker-compose.yml" - - - name: Write environment file - run: | - . "$OPENBAO_ENV_FILE" - tmp_env="$(mktemp)" - append_if_set() { - if [ -n "$2" ]; then - printf '%s=%s\n' "$1" "$2" >> "$tmp_env" - fi - } - : > "$tmp_env" - append_if_set POSTGRES_DB "$POSTGRES_DB" - append_if_set POSTGRES_USER "$POSTGRES_USER" - append_if_set POSTGRES_PASSWORD "$POSTGRES_PASSWORD" - append_if_set POSTGRES_HOST "$POSTGRES_HOST" - if [ -n "${POSTGRES_PORT:-}" ]; then - append_if_set POSTGRES_PORT "$POSTGRES_PORT" - elif [ -n "${PGBOUNCER_PORT:-}" ]; then - append_if_set POSTGRES_PORT "$PGBOUNCER_PORT" - fi - append_if_set CRANK_STORAGE_ROOT "$CRANK_STORAGE_ROOT" - append_if_set CRANK_PUBLISH_BIND "$CRANK_PUBLISH_BIND" - append_if_set CRANK_ADMIN_BIND "$CRANK_ADMIN_BIND" - append_if_set CRANK_MCP_BIND "$CRANK_MCP_BIND" - append_if_set CRANK_MCP_REFRESH_MS "$CRANK_MCP_REFRESH_MS" - append_if_set CRANK_LOG_LEVEL "$CRANK_LOG_LEVEL" - append_if_set CRANK_MASTER_KEY "$CRANK_MASTER_KEY" - append_if_set CRANK_BASE_URL "$CRANK_BASE_URL" - append_if_set CRANK_CACHE_BACKEND "$CRANK_CACHE_BACKEND" - append_if_set CRANK_CACHE_URL "$CRANK_CACHE_URL" - append_if_set CRANK_CACHE_DEFAULT_TTL_MS "$CRANK_CACHE_DEFAULT_TTL_MS" - append_if_set CRANK_SESSION_SECRET "$CRANK_SESSION_SECRET" - append_if_set CRANK_PASSWORD_PEPPER "$CRANK_PASSWORD_PEPPER" - append_if_set CRANK_SESSION_TTL_HOURS "$CRANK_SESSION_TTL_HOURS" - append_if_set CRANK_BOOTSTRAP_ADMIN_EMAIL "$CRANK_BOOTSTRAP_ADMIN_EMAIL" - append_if_set CRANK_BOOTSTRAP_ADMIN_PASSWORD "$CRANK_BOOTSTRAP_ADMIN_PASSWORD" - append_if_set CRANK_BOOTSTRAP_ADMIN_DISPLAY_NAME "$CRANK_BOOTSTRAP_ADMIN_DISPLAY_NAME" - append_if_set CRANK_DEMO_SEED "$CRANK_DEMO_SEED" - { - printf 'COMPOSE_PROJECT_NAME=community\n' - printf 'CRANK_ADMIN_API_IMAGE=%s:%s\n' '${{ env.ADMIN_API_IMAGE }}' '${{ env.IMAGE_TAG }}' - printf 'CRANK_MCP_SERVER_IMAGE=%s:%s\n' '${{ env.MCP_SERVER_IMAGE }}' '${{ env.IMAGE_TAG }}' - printf 'CRANK_UI_IMAGE=%s:%s\n' '${{ env.UI_IMAGE }}' '${{ env.IMAGE_TAG }}' - } >> "$tmp_env" - cat "$tmp_env" | ssh -p "$DEPLOY_PORT" "$DEPLOY_USER@$DEPLOY_HOST" \ - "mkdir -p '$DEPLOY_PATH' && cat > '$DEPLOY_PATH/.env'" - rm -f "$tmp_env" - - - name: Validate required environment variables - run: | - . "$OPENBAO_ENV_FILE" - ssh -p "$DEPLOY_PORT" "$DEPLOY_USER@$DEPLOY_HOST" " - set -e - cd '$DEPLOY_PATH' - required_vars=' - POSTGRES_HOST - POSTGRES_PORT - POSTGRES_DB - POSTGRES_USER - POSTGRES_PASSWORD - CRANK_MASTER_KEY - CRANK_SESSION_SECRET - CRANK_PASSWORD_PEPPER - CRANK_BOOTSTRAP_ADMIN_EMAIL - CRANK_BOOTSTRAP_ADMIN_PASSWORD - CRANK_BASE_URL - ' - for var in \$required_vars; do - value=\$(grep -E \"^\${var}=\" .env | tail -n1 | cut -d= -f2- || true) - if [ -z \"\$value\" ]; then - echo \"missing required env: \$var\" >&2 - exit 1 - fi - done - " - - - name: Deploy with Docker Compose - run: | - . "$OPENBAO_ENV_FILE" - ssh -p "$DEPLOY_PORT" "$DEPLOY_USER@$DEPLOY_HOST" " - set -e - cd '$DEPLOY_PATH' - compose_profiles='' - cache_backend=\$(grep -E '^CRANK_CACHE_BACKEND=' .env | tail -n1 | cut -d= -f2- || true) - if [ \"\$cache_backend\" = 'valkey' ] || [ \"\$cache_backend\" = 'redis' ]; then - compose_profiles='--profile cache' - fi - echo '$DEPLOY_REGISTRY_TOKEN' | docker login '${{ env.REGISTRY }}' -u '$DEPLOY_REGISTRY_USER' --password-stdin - docker compose \$compose_profiles config -q - docker compose \$compose_profiles pull - docker compose \$compose_profiles down --remove-orphans - for container in \ - crank-ui-1 \ - crank-admin-api-1 \ - crank-mcp-server-1 \ - crank-postgres-1 \ - crank-valkey-1 \ - crank-community-ui-1 \ - crank-community-admin-api-1 \ - crank-community-mcp-server-1 \ - crank-community-postgres-1 \ - crank-community-valkey-1; do - if docker ps -a --format '{{.Names}}' | grep -Fx \"\$container\" >/dev/null; then - docker rm -f \"\$container\" - fi - done - echo 'Docker containers before freeing required ports:' - docker ps --format 'table {{.ID}}\t{{.Names}}\t{{.Ports}}' - for port in 3000 3001 3002; do - container_ids=\$(docker ps -aq --filter \"publish=\$port\") - if [ -n \"\$container_ids\" ]; then - echo \"Removing containers publishing port \$port\" - docker inspect --format '{{.Name}} {{json .NetworkSettings.Ports}}' \$container_ids || true - docker rm -f \$container_ids - fi - done - if command -v ss >/dev/null 2>&1; then - ss -ltnp '( sport = :3000 or sport = :3001 or sport = :3002 )' || true - fi - docker compose \$compose_profiles up -d --remove-orphans - " - - - name: Verify health endpoints - run: | - . "$OPENBAO_ENV_FILE" - ssh -p "$DEPLOY_PORT" "$DEPLOY_USER@$DEPLOY_HOST" " - set -e - cd '$DEPLOY_PATH' - for attempt in \$(seq 1 30); do - if curl --fail --silent http://127.0.0.1:3000/ >/dev/null \ - && curl --fail --silent http://127.0.0.1:3001/health >/dev/null \ - && curl --fail --silent http://127.0.0.1:3002/health >/dev/null; then - exit 0 - fi - sleep 2 - done - echo 'deployment health verification failed' >&2 - docker compose ps >&2 - exit 1 - " - - - name: Run authenticated product smoke - run: | - . "$OPENBAO_ENV_FILE" - CRANK_STAGING_ADMIN_EMAIL="$CRANK_BOOTSTRAP_ADMIN_EMAIL" \ - CRANK_STAGING_ADMIN_PASSWORD="$CRANK_BOOTSTRAP_ADMIN_PASSWORD" \ - scripts/authenticated-product-smoke.sh "$CRANK_BASE_URL" diff --git a/.gitea/workflows/release.yml b/.gitea/workflows/release.yml deleted file mode 100644 index e82c12d..0000000 --- a/.gitea/workflows/release.yml +++ /dev/null @@ -1,100 +0,0 @@ -name: Community Release - -on: - push: - tags: - - "v*" - workflow_dispatch: - -env: - REGISTRY: git.itexp.me - IMAGE_TAG: ${{ gitea.ref_name }} - ADMIN_API_IMAGE: git.itexp.me/bsodfather/crank-community-admin-api - MCP_SERVER_IMAGE: git.itexp.me/bsodfather/crank-community-mcp-server - UI_IMAGE: git.itexp.me/bsodfather/crank-community-ui - OPENBAO_ENV_FILE: .openbao-env - -jobs: - release: - runs-on: ubuntu-latest - - steps: - - name: Checkout - uses: actions/checkout@v5 - - - name: Verify runner toolchain - run: | - rustc --version - cargo --version - node --version - npm --version - docker --version - command -v bao - bao version - - - name: Build release binaries - run: cargo build --release -p admin-api -p mcp-server - - - name: Install UI dependencies - working-directory: apps/ui - run: npm ci - - - name: Build UI dist - working-directory: apps/ui - run: npm run build - - - name: Package release artifacts - run: | - mkdir -p dist/release - cp target/release/admin-api dist/release/admin-api - cp target/release/mcp-server dist/release/mcp-server - tar -C dist/release -czf dist/crank-community-admin-api-${IMAGE_TAG}.tar.gz admin-api - tar -C dist/release -czf dist/crank-community-mcp-server-${IMAGE_TAG}.tar.gz mcp-server - tar -C apps/ui/dist -czf dist/crank-community-ui-${IMAGE_TAG}.tar.gz . - sha256sum \ - dist/crank-community-admin-api-${IMAGE_TAG}.tar.gz \ - dist/crank-community-mcp-server-${IMAGE_TAG}.tar.gz \ - dist/crank-community-ui-${IMAGE_TAG}.tar.gz \ - > dist/crank-community-${IMAGE_TAG}-checksums.txt - - - name: Generate SBOM - run: | - docker run --rm -v "$PWD:/workspace" anchore/syft:latest \ - dir:/workspace -o spdx-json \ - > dist/crank-community-${IMAGE_TAG}-sbom.spdx.json - - - name: Load deployment secrets from OpenBao - env: - BAO_ADDR: ${{ secrets.BAO_ADDR }} - BAO_ROLE_ID: ${{ secrets.BAO_ROLE_ID }} - BAO_SECRET_ID: ${{ secrets.BAO_SECRET_ID }} - OPENBAO_APP: crank - run: scripts/load-openbao-env.sh - - - name: Login to registry - run: | - . "$OPENBAO_ENV_FILE" - printf '%s' "$DEPLOY_REGISTRY_TOKEN" | \ - docker login '${{ env.REGISTRY }}' -u "$DEPLOY_REGISTRY_USER" --password-stdin - - - name: Build and push release images - run: | - docker build -f apps/admin-api/Dockerfile \ - -t '${{ env.ADMIN_API_IMAGE }}:${{ env.IMAGE_TAG }}' \ - -t '${{ env.ADMIN_API_IMAGE }}:latest' . - docker build -f apps/mcp-server/Dockerfile \ - -t '${{ env.MCP_SERVER_IMAGE }}:${{ env.IMAGE_TAG }}' \ - -t '${{ env.MCP_SERVER_IMAGE }}:latest' . - docker build -f apps/ui/Dockerfile \ - -t '${{ env.UI_IMAGE }}:${{ env.IMAGE_TAG }}' \ - -t '${{ env.UI_IMAGE }}:latest' . - docker push '${{ env.ADMIN_API_IMAGE }}:${{ env.IMAGE_TAG }}' - docker push '${{ env.ADMIN_API_IMAGE }}:latest' - docker push '${{ env.MCP_SERVER_IMAGE }}:${{ env.IMAGE_TAG }}' - docker push '${{ env.MCP_SERVER_IMAGE }}:latest' - docker push '${{ env.UI_IMAGE }}:${{ env.IMAGE_TAG }}' - docker push '${{ env.UI_IMAGE }}:latest' - - - name: Show release bundle summary - run: | - ls -lh dist diff --git a/docs/authenticated-staging-pass.md b/docs/authenticated-staging-pass.md index 7a288d5..d92e929 100644 --- a/docs/authenticated-staging-pass.md +++ b/docs/authenticated-staging-pass.md @@ -38,11 +38,7 @@ export CRANK_STAGING_ADMIN_PASSWORD=secret just authenticated-staging-smoke https:// ``` -После завершения прохода готовый блок для [staging-regression-notes.md](staging-regression-notes.md) можно сгенерировать так: - -```bash -just staging-note-block "codex + operator" -``` +После завершения прохода добавьте результат в [staging-regression-notes.md](staging-regression-notes.md) вручную по шаблону ниже. ### 3.1. Login and shell @@ -146,12 +142,6 @@ just staging-note-block "codex + operator" ## 5. Готовый блок для вставки -Этот же блок можно получить через: - -```bash -just staging-note-block "codex + operator" -``` - ```md ## YYYY-MM-DD HH:MM TZ — rmcp.itexp.me (authenticated pass) diff --git a/docs/deploy-and-staging-smoke.md b/docs/deploy-and-staging-smoke.md index e56bc3b..7721f08 100644 --- a/docs/deploy-and-staging-smoke.md +++ b/docs/deploy-and-staging-smoke.md @@ -38,7 +38,7 @@ - задеплоенный стек `ui`, `admin-api`, `mcp-server`, `postgres`; - корректный `.env` на сервере; -- валидный deploy через `.gitea/workflows/deploy.yml`; +- валидная сборка и доставка образов в выбранной инфраструктуре; - server deployment path, собранный из `deploy/community/docker-compose.yml`; - `CRANK_DEMO_SEED=true`, если нужен предзаполненный smoke state; - bootstrap admin credentials для входа в UI. diff --git a/docs/staging-regression-notes.md b/docs/staging-regression-notes.md index 8bd7b19..97229ad 100644 --- a/docs/staging-regression-notes.md +++ b/docs/staging-regression-notes.md @@ -59,12 +59,6 @@ - [manual-regression-checklist.md](manual-regression-checklist.md) - [authenticated-staging-pass.md](authenticated-staging-pass.md) -Если нужно сгенерировать заготовку новой записи: - -```bash -just staging-note-block "codex + operator" -``` - ## 2. Как вести записи Добавлять новую запись сверху документа. diff --git a/justfile b/justfile index 4b718e6..b06d8e9 100644 --- a/justfile +++ b/justfile @@ -49,6 +49,3 @@ authenticated-staging-smoke base_url: authenticated-product-smoke base_url: bash scripts/authenticated-product-smoke.sh {{base_url}} - -staging-note-block environment deploy_commit checked_by smoke_status='partial': - bash scripts/staging-note-block.sh {{environment}} {{deploy_commit}} {{checked_by}} {{smoke_status}} diff --git a/scripts/README.md b/scripts/README.md index ca6cefe..c14aae3 100644 --- a/scripts/README.md +++ b/scripts/README.md @@ -47,43 +47,6 @@ CRANK_STAGING_ADMIN_PASSWORD=secret \ CRANK_PRODUCT_SMOKE_KEEP_ASSETS=1 ./scripts/authenticated-product-smoke.sh https://crank.example.com ``` -## `staging-note-block.sh` - -Генерирует markdown-блок для `docs/staging-regression-notes.md` после реального -staging pass. - -```bash -./scripts/staging-note-block.sh crank.example.com abc1234 "operator" partial -``` - -## `load-openbao-env.sh` - -Логинится в OpenBao через AppRole и выгружает deploy/runtime secrets в локальный -shell env file. - -Обязательные переменные: - -- `BAO_ADDR` -- `BAO_ROLE_ID` -- `BAO_SECRET_ID` -- `OPENBAO_APP` - -Опционально: - -- `OPENBAO_ENV_FILE`, default `.openbao-env` - -Скрипт читает KV v2 secrets из mount `ci`: - -- `shared/registry` -- `shared/deploy-ssh` -- `projects/${OPENBAO_APP}/deploy` -- `projects/${OPENBAO_APP}/runtime` - -Также он создает workflow-compatible aliases: - -- `REGISTRY_USERNAME -> DEPLOY_REGISTRY_USER` -- `REGISTRY_PASSWORD -> DEPLOY_REGISTRY_TOKEN` - ## `check-rust-code-health.sh` Проверяет базовые правила сопровождаемости Rust-кода: diff --git a/scripts/load-openbao-env.sh b/scripts/load-openbao-env.sh deleted file mode 100755 index 6376942..0000000 --- a/scripts/load-openbao-env.sh +++ /dev/null @@ -1,86 +0,0 @@ -#!/usr/bin/env bash -set -euo pipefail - -: "${BAO_ADDR:?BAO_ADDR is required}" -: "${BAO_ROLE_ID:?BAO_ROLE_ID is required}" -: "${BAO_SECRET_ID:?BAO_SECRET_ID is required}" -: "${OPENBAO_APP:?OPENBAO_APP is required}" - -output="${OPENBAO_ENV_FILE:-.openbao-env}" -payload="$(mktemp)" -merged="$(mktemp)" -trap 'rm -f "$payload" "$merged"' EXIT - -export BAO_ADDR -BAO_TOKEN="$(bao write -field=token auth/approle/login role_id="$BAO_ROLE_ID" secret_id="$BAO_SECRET_ID")" -export BAO_TOKEN - -printf '{}\n' > "$merged" - -merge_secret() { - local path="$1" - - bao kv get -mount=ci -format=json "$path" > "$payload" - - python3 - "$payload" "$merged" <<'PY' -import json -import sys -from pathlib import Path - -payload = json.loads(Path(sys.argv[1]).read_text(encoding="utf-8")) -merged_path = Path(sys.argv[2]) -merged = json.loads(merged_path.read_text(encoding="utf-8")) - -data = payload.get("data", {}) -if isinstance(data, dict) and isinstance(data.get("data"), dict): - data = data["data"] - -if not isinstance(data, dict): - raise SystemExit("OpenBao response does not contain an object secret payload") - -merged.update({key: value for key, value in data.items() if value is not None}) -merged_path.write_text(json.dumps(merged), encoding="utf-8") -PY -} - -merge_secret "shared/registry" -merge_secret "shared/deploy-ssh" -merge_secret "projects/${OPENBAO_APP}/deploy" -merge_secret "projects/${OPENBAO_APP}/runtime" - -python3 - "$merged" "$output" <<'PY' -import json -import re -import shlex -import sys -from pathlib import Path - -data = json.loads(Path(sys.argv[1]).read_text(encoding="utf-8")) -output_path = Path(sys.argv[2]) - -if "REGISTRY_USERNAME" in data and "DEPLOY_REGISTRY_USER" not in data: - data["DEPLOY_REGISTRY_USER"] = data["REGISTRY_USERNAME"] - -if "REGISTRY_PASSWORD" in data and "DEPLOY_REGISTRY_TOKEN" not in data: - data["DEPLOY_REGISTRY_TOKEN"] = data["REGISTRY_PASSWORD"] - -name_re = re.compile(r"^[A-Za-z_][A-Za-z0-9_]*$") -lines = [ - "# Generated by scripts/load-openbao-env.sh", - "# Do not commit this file.", -] - -for key in sorted(data): - if not name_re.match(key): - raise SystemExit(f"Unsupported environment variable name from OpenBao: {key}") - value = data[key] - if isinstance(value, bool): - value = "true" if value else "false" - elif not isinstance(value, str): - value = str(value) - lines.append(f"export {key}={shlex.quote(value)}") - -output_path.write_text("\n".join(lines) + "\n", encoding="utf-8") -output_path.chmod(0o600) -print(f"Loaded {len(lines) - 2} OpenBao values into {output_path}", file=sys.stderr) -PY diff --git a/scripts/staging-note-block.sh b/scripts/staging-note-block.sh deleted file mode 100644 index 847b632..0000000 --- a/scripts/staging-note-block.sh +++ /dev/null @@ -1,55 +0,0 @@ -#!/usr/bin/env bash - -set -euo pipefail - -if [[ $# -lt 3 ]]; then - echo "usage: $0 [smoke-status]" >&2 - echo "example: $0 rmcp.itexp.me abc1234 \"codex + operator\" partial" >&2 - exit 64 -fi - -ENVIRONMENT="$1" -DEPLOY_COMMIT="$2" -CHECKED_BY="$3" -SMOKE_STATUS="${4:-partial}" -STAMP="$(TZ="${TZ:-Europe/Moscow}" date '+%Y-%m-%d %H:%M %Z')" - -cat <\` -- REST smoke: \`\` -- MCP smoke: \`\` - -### Findings - -- none - -### Infra notes - -- ... - -### Follow-up - -- ... -EOF