From 2c6d47ef9beaaaba9c8400a538fec51ec52af531 Mon Sep 17 00:00:00 2001 From: Dmitrii Fedorov Date: Mon, 26 Oct 2026 12:28:21 -0700 Subject: [PATCH 1/2] ref(rollout): Switch gocd tracking logic to rollout in s4s2 --- gocd/templates/bash/deploy-py.sh | 8 ++++++-- gocd/templates/pipelines/snuba-py.libsonnet | 11 ++++++++++- 2 files changed, 16 insertions(+), 3 deletions(-) diff --git a/gocd/templates/bash/deploy-py.sh b/gocd/templates/bash/deploy-py.sh index 95ce0caf07..f4cf61b6a3 100644 --- a/gocd/templates/bash/deploy-py.sh +++ b/gocd/templates/bash/deploy-py.sh @@ -8,7 +8,6 @@ IMAGE_TAG="${GO_REVISION_SNUBA_REPO}" && k8s-deploy \ --label-selector="${LABEL_SELECTOR}" \ --image="us-docker.pkg.dev/sentryio/snuba-mr/image:${IMAGE_TAG}" \ - --container-name="api" \ --container-name="dlq-consumer" \ --container-name="eap-items-subscriptions-executor" \ --container-name="eap-items-subscriptions-scheduler" \ @@ -37,4 +36,9 @@ IMAGE_TAG="${GO_REVISION_SNUBA_REPO}" --type="cronjob" \ --container-name="optimize" \ --container-name="cleanup" \ - --container-name="cardinality-report" + --container-name="cardinality-report" \ +&& k8s-deploy \ + --label-selector="${LABEL_SELECTOR}" \ + --image="us-docker.pkg.dev/sentryio/snuba-mr/image:${IMAGE_TAG}" \ + --type="${SNUBA_API_DEPLOY_TYPE:-deployment}" \ + --container-name="api" diff --git a/gocd/templates/pipelines/snuba-py.libsonnet b/gocd/templates/pipelines/snuba-py.libsonnet index 43b8a3bf9e..0a98d06bb9 100644 --- a/gocd/templates/pipelines/snuba-py.libsonnet +++ b/gocd/templates/pipelines/snuba-py.libsonnet @@ -40,6 +40,12 @@ local migrate_stage(stage_name, region) = [ }, ]; +// Regions where snuba-api is an Argo Rollout and k8s-deploy should track the +// Rollout instead of the (scaled to zero) Deployment it references. +local api_rollout_regions = ['s4s2']; + +local is_api_rollout(region) = std.member(api_rollout_regions, region); + local saas_datadog_monitor_ids = { us: '311884335 311884334', de: '311884404 311884405', @@ -215,10 +221,13 @@ function(region) { ], }, 'deploy-primary': { - timeout: 1200, + // Argo Rollout canary steps and analyses take longer than a + // plain rolling update. + timeout: if is_api_rollout(region) then 2400 else 1200, elastic_profile_id: 'snuba', environment_variables: { LABEL_SELECTOR: 'service=snuba', + [if is_api_rollout(region) then 'SNUBA_API_DEPLOY_TYPE' else null]: 'rollout', }, tasks: [ if getsentry.is_st(region) then From 28e70a673faf460ebd7229f1ec31e11f83b27f03 Mon Sep 17 00:00:00 2001 From: Dmitrii Fedorov Date: Mon, 26 Oct 2026 12:43:55 -0700 Subject: [PATCH 2/2] fix --- gocd/templates/bash/deploy-py.sh | 1 - 1 file changed, 1 deletion(-) diff --git a/gocd/templates/bash/deploy-py.sh b/gocd/templates/bash/deploy-py.sh index 3957703c8a..081aeda6a3 100644 --- a/gocd/templates/bash/deploy-py.sh +++ b/gocd/templates/bash/deploy-py.sh @@ -46,7 +46,6 @@ IMAGE_TAG="${GO_REVISION_SNUBA_REPO}" --type="cronjob" \ --container-name="optimize" \ --container-name="cleanup" \ - --container-name="cardinality-report" \ && k8s-deploy \ --label-selector="${LABEL_SELECTOR}" \ --image="us-docker.pkg.dev/sentryio/snuba-mr/image:${IMAGE_TAG}" \