From bbaa4a01d1f331cfbdecb7af040fe82b5f1e77b7 Mon Sep 17 00:00:00 2001
From: Dalitso Banda <dalitso.banda@sentry.io>
Date: Thu, 21 Mar 2024 13:25:53 -0700
Subject: [PATCH] match ops labels (#5678)

* alllow passing in replyer username and password

* type hints

* change labels to match ops repo. have a service labels match
---
 gocd/templates/bash/s4s-clickhouse-queries.sh    | 6 +++---
 gocd/templates/bash/s4s-replay-queries.sh        | 4 ++--
 gocd/templates/clickhouse-query-replayer.jsonnet | 2 +-
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/gocd/templates/bash/s4s-clickhouse-queries.sh b/gocd/templates/bash/s4s-clickhouse-queries.sh
index ec4cd1ea7f..7a48945b58 100755
--- a/gocd/templates/bash/s4s-clickhouse-queries.sh
+++ b/gocd/templates/bash/s4s-clickhouse-queries.sh
@@ -15,15 +15,15 @@ then
     ARGS="--gcs-bucket ${GCS_BUCKET}"
 fi
 
-SNUBA_SERVICE_NAME="query-${SNUBA_CMD_TYPE}-gocd"
+SNUBA_COMPONENT_NAME="query-${SNUBA_CMD_TYPE}-gocd"
 SNUBA_CMD="query-${SNUBA_CMD_TYPE} ${ARGS[@]}"
 
 eval $(/devinfra/scripts/regions/project_env_vars.py --region="${SENTRY_REGION}")
 /devinfra/scripts/k8s/k8stunnel
 
 /devinfra/scripts/k8s/k8s-spawn-job.py \
-  --label-selector="service=snuba-${SNUBA_SERVICE_NAME}" \
-  --container-name="${SNUBA_SERVICE_NAME}" \
+  --label-selector="service=snuba,component=${SNUBA_COMPONENT_NAME}" \
+  --container-name="${SNUBA_COMPONENT_NAME}" \
   --try-deployments-and-statefulsets \
   "snuba-query-${SNUBA_CMD_TYPE}" \
   "us.gcr.io/sentryio/snuba:${GO_REVISION_SNUBA_REPO}" \
diff --git a/gocd/templates/bash/s4s-replay-queries.sh b/gocd/templates/bash/s4s-replay-queries.sh
index 773a00daa4..9c1c4f43fb 100644
--- a/gocd/templates/bash/s4s-replay-queries.sh
+++ b/gocd/templates/bash/s4s-replay-queries.sh
@@ -4,8 +4,8 @@ eval $(/devinfra/scripts/regions/project_env_vars.py --region="${SENTRY_REGION}"
 /devinfra/scripts/k8s/k8stunnel
 
 /devinfra/scripts/k8s/k8s-spawn-job.py \
-  --label-selector="service=snuba-${SNUBA_SERVICE_NAME}" \
-  --container-name="${SNUBA_SERVICE_NAME}" \
+  --label-selector="service=snuba,component=${SNUBA_COMPONENT_NAME}" \
+  --container-name="${SNUBA_COMPONENT_NAME}" \
   "snuba-query-replayer" \
   "us.gcr.io/sentryio/snuba:${GO_REVISION_SNUBA_REPO}" \
   -- \
diff --git a/gocd/templates/clickhouse-query-replayer.jsonnet b/gocd/templates/clickhouse-query-replayer.jsonnet
index 502e22dc8a..3d9a0bdb7a 100644
--- a/gocd/templates/clickhouse-query-replayer.jsonnet
+++ b/gocd/templates/clickhouse-query-replayer.jsonnet
@@ -7,7 +7,7 @@ local generate_replay_job(component) =
   {
     environment_variables: {
       SENTRY_REGION: 's4s',
-      SNUBA_SERVICE_NAME: 'query-replayer-gocd',
+      SNUBA_COMPONENT_NAME: 'query-replayer-gocd',
     },
     elastic_profile_id: pipeline_group,
     tasks: [