Skip to content

Commit 8c3d2d9

Browse files
authored
Revert "feat(gocd): make ST deploys actually split rs/py" (#7615)
This didn't work. In STs all containers are named snuba or snuba-admin. s4s2 probably changes this by unifying to the SaaS configuration Reverts #7606
1 parent 9f6c68b commit 8c3d2d9

File tree

2 files changed

+8
-52
lines changed

2 files changed

+8
-52
lines changed

gocd/templates/bash/deploy-st-py.sh

Lines changed: 5 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -2,36 +2,10 @@
22

33
eval $(regions-project-env-vars --region="${SENTRY_REGION}")
44

5-
/devinfra/scripts/get-cluster-credentials \
6-
&& k8s-deploy \
7-
--label-selector="${LABEL_SELECTOR}" \
8-
--image="us-docker.pkg.dev/sentryio/snuba-mr/image:${GO_REVISION_SNUBA_REPO}" \
9-
--container-name="api" \
10-
--container-name="eap-items-subscriptions-executor" \
11-
--container-name="eap-items-subscriptions-scheduler" \
12-
--container-name="errors-replacer" \
13-
--container-name="events-subscriptions-consumer" \
14-
--container-name="generic-metrics-counters-subscriptions-executor" \
15-
--container-name="generic-metrics-counters-subscriptions-scheduler" \
16-
--container-name="generic-metrics-distributions-subscriptions-executor" \
17-
--container-name="generic-metrics-distributions-subscriptions-scheduler" \
18-
--container-name="generic-metrics-sets-subscriptions-executor" \
19-
--container-name="generic-metrics-sets-subscriptions-scheduler" \
20-
--container-name="generic-metrics-gauges-subscriptions-executor" \
21-
--container-name="generic-metrics-gauges-subscriptions-scheduler" \
22-
--container-name="group-attributes-consumer" \
23-
--container-name="lw-deletions-search-issues-consumer" \
24-
--container-name="lw-deletions-eap-items-consumer" \
25-
--container-name="metrics-counters-subscriptions-scheduler" \
26-
--container-name="metrics-sets-subscriptions-scheduler" \
27-
--container-name="metrics-subscriptions-executor" \
28-
--container-name="search-issues-consumer" \
29-
--container-name="snuba-admin" \
30-
--container-name="transactions-subscriptions-consumer" \
31-
&& k8s-deploy \
5+
/devinfra/scripts/get-cluster-credentials
6+
7+
k8s-deploy \
328
--label-selector="${LABEL_SELECTOR}" \
339
--image="us-docker.pkg.dev/sentryio/snuba-mr/image:${GO_REVISION_SNUBA_REPO}" \
34-
--type="cronjob" \
35-
--container-name="optimize" \
36-
--container-name="cleanup" \
37-
--container-name="cardinality-report"
10+
--container-name="snuba" \
11+
--container-name="snuba-admin"
Lines changed: 3 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,5 @@
11
#!/bin/bash
22

3-
eval $(regions-project-env-vars --region="${SENTRY_REGION}")
4-
5-
/devinfra/scripts/get-cluster-credentials \
6-
&& k8s-deploy \
7-
--label-selector="${LABEL_SELECTOR}" \
8-
--image="us-docker.pkg.dev/sentryio/snuba-mr/image:${GO_REVISION_SNUBA_REPO}" \
9-
--container-name="consumer" \
10-
--container-name="eap-items-consumer" \
11-
--container-name="generic-metrics-counters-consumer" \
12-
--container-name="generic-metrics-distributions-consumer" \
13-
--container-name="generic-metrics-sets-consumer" \
14-
--container-name="loadbalancer-outcomes-consumer" \
15-
--container-name="metrics-consumer" \
16-
--container-name="outcomes-billing-consumer" \
17-
--container-name="outcomes-consumer" \
18-
--container-name="profile-chunks-consumer" \
19-
--container-name="profiles-consumer" \
20-
--container-name="profiling-functions-consumer" \
21-
--container-name="querylog-consumer" \
22-
--container-name="replays-consumer" \
23-
--container-name="transactions-consumer"
3+
echo "TODO fix"
4+
echo "This is a no-op for single-tenants. deploy-snuba-py handles everything"
5+
echo "(and traffic is low enough that we don't have rebalance issues)"

0 commit comments

Comments
 (0)