Skip to content

Commit b000edd

Browse files
Pigbibicodex
andauthored
fix: reconcile cloud runtime drift (#302)
Co-authored-by: Codex <noreply@openai.com>
1 parent 84bd5c9 commit b000edd

4 files changed

Lines changed: 660 additions & 28 deletions

File tree

.github/workflows/sync-cloud-run-env.yml

Lines changed: 15 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -959,6 +959,14 @@ jobs:
959959
set -euo pipefail
960960
python3 scripts/verify_cloud_run_strategy_plugin_mounts.py
961961
962+
- name: Reconcile Cloud Run traffic
963+
if: steps.config.outputs.env_sync_enabled == 'true'
964+
env:
965+
SYNC_PLAN_JSON: ${{ steps.strategy_requirements.outputs.sync_plan_json }}
966+
run: |
967+
set -euo pipefail
968+
python3 scripts/reconcile_cloud_runtime.py --platform longbridge --ensure-latest-traffic
969+
962970
- name: Sync Cloud Scheduler schedule
963971
if: steps.config.outputs.env_sync_enabled == 'true'
964972
env:
@@ -1136,32 +1144,13 @@ jobs:
11361144
echo "Skipping shared LongBridge monitor dispatcher scheduler from ${DEPLOYMENT_LABEL}; owner is ${MONITOR_DISPATCHER_OWNER_LABEL:-SG}."
11371145
fi
11381146
1139-
legacy_jobs=(
1140-
"${CLOUD_RUN_SERVICE}-probe-scheduler"
1141-
"${CLOUD_RUN_SERVICE}-precheck-scheduler"
1142-
)
1143-
if [[ "${CLOUD_RUN_SERVICE}" == *-service ]]; then
1144-
legacy_jobs+=(
1145-
"${CLOUD_RUN_SERVICE%-service}-probe-scheduler"
1146-
"${CLOUD_RUN_SERVICE%-service}-precheck-scheduler"
1147-
)
1148-
fi
1149-
legacy_scope="${CLOUD_RUN_SERVICE#longbridge-quant-}"
1150-
legacy_scope="${legacy_scope%-service}"
1151-
if [ -n "${legacy_scope}" ] && [ "${legacy_scope}" != "${CLOUD_RUN_SERVICE}" ]; then
1152-
legacy_jobs+=("lb-${legacy_scope}-backup-execution")
1153-
fi
1154-
for legacy_job in "${legacy_jobs[@]}"; do
1155-
if gcloud scheduler jobs describe "${legacy_job}" \
1156-
--project="${GCP_PROJECT_ID}" \
1157-
--location="${scheduler_location}" >/dev/null 2>&1; then
1158-
echo "Deleting legacy Cloud Scheduler job ${legacy_job}; monitor dispatcher now owns probe/precheck."
1159-
gcloud scheduler jobs delete "${legacy_job}" \
1160-
--project="${GCP_PROJECT_ID}" \
1161-
--location="${scheduler_location}" \
1162-
--quiet
1163-
fi
1164-
done
1147+
- name: Reconcile legacy Cloud Scheduler jobs
1148+
if: steps.config.outputs.env_sync_enabled == 'true'
1149+
env:
1150+
SYNC_PLAN_JSON: ${{ steps.strategy_requirements.outputs.sync_plan_json }}
1151+
run: |
1152+
set -euo pipefail
1153+
python3 scripts/reconcile_cloud_runtime.py --platform longbridge --delete-legacy-schedulers
11651154
11661155
- name: Prune old Cloud Run revisions
11671156
if: steps.config.outputs.enabled == 'true'

0 commit comments

Comments
 (0)