Merge cockroachdb#129371

129371: roachprod: update roachprod-gc.yaml with azure-subscription-names flag r=srosenberg,herkolategan a=DarrylWong This enables roachprod to clean up multiple subscriptions. Fixes: none Release note: none Epic: none Co-authored-by: DarrylWong <[email protected]>
mgartner · Aug 22, 2024 · c1500e5 · c1500e5
2 parents 4344440 + 5c83036
commit c1500e5
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/pkg/roachprod/k8s/roachprod-gc.yaml b/pkg/roachprod/k8s/roachprod-gc.yaml
@@ -10,7 +10,7 @@
 #    --from-literal azure_password=XYZZY
 #    --from-literal azure_tenant_id=XYZZY
 #    --from-literal slack_token=XYZZY
-apiVersion: batch/v1beta1
+apiVersion: batch/v1
 kind: CronJob
 metadata:
   name: roachprod-gc-cronjob
@@ -31,13 +31,14 @@ spec:
         spec:
           containers:
             - name: roachprod-gc-cronjob
-              image: gcr.io/cockroach-dev-inf/cockroachlabs/roachprod:485975b3a82
+              image: gcr.io/cockroach-dev-inf/cockroachlabs/roachprod:1d01263b3a4
               args:
                 - gc
                 - --gce-project=cockroach-ephemeral,cockroach-roachstress
                 - --slack-token
                 - $(SLACK_TOKEN)
                 - --aws-account-ids=541263489771,337380398238
+                - --azure-subscription-names=e2e-adhoc,e2e-infra,Microsoft Azure Subscription
               env:
                 - name: SLACK_TOKEN
                   valueFrom: