-
Notifications
You must be signed in to change notification settings - Fork 0
Drop legacy runtime routes #175
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Changes from all commits
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -991,17 +991,29 @@ jobs: | |
| probe_time="${scheduler_market_config[2]}" | ||
| precheck_time="${scheduler_market_config[3]}" | ||
|
|
||
| service_url="$(gcloud run services describe "${CLOUD_RUN_SERVICE}" \ | ||
| --project="${GCP_PROJECT_ID}" \ | ||
| --region="${CLOUD_RUN_REGION}" \ | ||
| --format='value(status.url)' 2>/dev/null || true)" | ||
| if [ -z "${service_url}" ]; then | ||
| echo "Unable to resolve Cloud Run service URL for ${CLOUD_RUN_SERVICE}; cannot sync scheduler URI." >&2 | ||
| exit 1 | ||
| fi | ||
|
|
||
| for suffix in scheduler probe-scheduler precheck-scheduler; do | ||
| job_name="${CLOUD_RUN_SERVICE}-${suffix}" | ||
| case "${suffix}" in | ||
| scheduler) | ||
| schedule_time="${main_time}" | ||
| scheduler_path="/run" | ||
| ;; | ||
| probe-scheduler) | ||
| schedule_time="${probe_time}" | ||
| scheduler_path="/probe" | ||
| ;; | ||
| precheck-scheduler) | ||
| schedule_time="${precheck_time}" | ||
| scheduler_path="/dry-run" | ||
| ;; | ||
| esac | ||
|
|
||
|
|
@@ -1027,10 +1039,12 @@ jobs: | |
| PY | ||
| )" | ||
|
|
||
| echo "Updating Cloud Scheduler job ${job_name} schedule to ${desired_schedule} and timezone to ${market_timezone}." | ||
| scheduler_uri="${service_url}${scheduler_path}" | ||
| echo "Updating Cloud Scheduler job ${job_name} schedule to ${desired_schedule}, timezone to ${market_timezone}, and URI to ${scheduler_uri}." | ||
| gcloud scheduler jobs update http "${job_name}" \ | ||
| --project="${GCP_PROJECT_ID}" \ | ||
| --location="${scheduler_location}" \ | ||
| --uri="${scheduler_uri}" \ | ||
|
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Please set or verify the Cloud Scheduler OIDC audience when changing the main job target to a pathful URI. Google Cloud Scheduler documents that, when the Audience is not specified, the entire target URL is used as the OIDC Useful? React with 👍 / 👎. |
||
| --schedule="${desired_schedule}" \ | ||
| --time-zone="${market_timezone}" \ | ||
| --quiet | ||
|
|
||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This changes the main Cloud Scheduler job to target
/run, butscripts/execution_report_heartbeat.pystill treats only path/as a strategy-run scheduler (_scheduler_job_targets_strategy_runreturns false for any other path). After this sync, scheduler-aware heartbeat checks will see no matching main scheduler jobs and conservatively require reports for every configured service, causing false heartbeat failures for services whose main scheduler was not actually due.Useful? React with 👍 / 👎.