From 20e2b1206714a3cf3af97e1c0ab19c8516dc3faf Mon Sep 17 00:00:00 2001
From: pav511 <38131208+pav511@users.noreply.github.com>
Date: Wed, 23 Oct 2024 18:35:41 -0700
Subject: [PATCH 01/16] base applications for usdf-rapid-analysis phalanx
 deployment

---
 applications/argocd/values-usdf-rapid-analysis.yaml | 2 ++
 environments/values-usdf-rapid-analysis.yaml        | 4 +---
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/applications/argocd/values-usdf-rapid-analysis.yaml b/applications/argocd/values-usdf-rapid-analysis.yaml
index 9e9d6ffcbe..02e3a9c6c2 100644
--- a/applications/argocd/values-usdf-rapid-analysis.yaml
+++ b/applications/argocd/values-usdf-rapid-analysis.yaml
@@ -27,7 +27,9 @@ argo-cd:
         g, ppascual@slac.stanford.edu, role:admin
         g, pav@slac.stanford.edu, role:admin
         g, reinking@slac.stanford.edu, role:admin
+        g, fritzm@slac.stanford.edu, role:admin
         g, cslater@slac.stanford.edu, role:admin
+        g, yusra@slac.stanford.edu, role:admin
         g, mfl@slac.stanford.edu, role:admin
       scopes: "[email]"
 
diff --git a/environments/values-usdf-rapid-analysis.yaml b/environments/values-usdf-rapid-analysis.yaml
index 30f0f0c1bf..fbd481aa73 100644
--- a/environments/values-usdf-rapid-analysis.yaml
+++ b/environments/values-usdf-rapid-analysis.yaml
@@ -8,7 +8,5 @@ applications:
   # This environment uses an ingress managed in a separate Kubernetes cluster,
   # despite that configuration not being officially supported by Phalanx.
   cert-manager: false
+  gafaelfawr: false
   ingress-nginx: false
-  gafaelfawr: true
-
-  postgres: true

From 0bd801eb384c3f09d8f6627f3dbed1d3ac4f727b Mon Sep 17 00:00:00 2001
From: Colin Slater <ctslater@uw.edu>
Date: Wed, 16 Oct 2024 10:55:50 -0700
Subject: [PATCH 02/16] Add usdf-rapid-analysis environment.

---
 .../values-usdf-rapid-analysis.yaml           | 147 ++++++++++++++++++
 environments/values-usdf-rapid-analysis.yaml  |   1 +
 2 files changed, 148 insertions(+)
 create mode 100644 applications/rapid-analysis/values-usdf-rapid-analysis.yaml

diff --git a/applications/rapid-analysis/values-usdf-rapid-analysis.yaml b/applications/rapid-analysis/values-usdf-rapid-analysis.yaml
new file mode 100644
index 0000000000..5a004b3e64
--- /dev/null
+++ b/applications/rapid-analysis/values-usdf-rapid-analysis.yaml
@@ -0,0 +1,147 @@
+image:
+  repository: lsstts/rapid-analysis
+  tag: c0039_usdf
+  pullPolicy: Always
+location: USDF
+env:
+  DAF_BUTLER_REPOSITORY_INDEX: /sdf/group/rubin/shared/data-repos.yaml
+  http_proxy: http://sdfproxy.sdf.slac.stanford.edu:3128
+  https_proxy: http://sdfproxy.sdf.slac.stanford.edu:3128
+  squid_proxy: http://sdfproxy.sdf.slac.stanford.edu:3128
+  no_proxy: .slac.stanford.edu
+  HTTP_PROXY: http://sdfproxy.sdf.slac.stanford.edu:3128
+  HTTPS_PROXY: http://sdfproxy.sdf.slac.stanford.edu:3128
+  SQUID_PROXY: http://sdfproxy.sdf.slac.stanford.edu:3128
+  NO_PROXY: .slac.stanford.edu
+  DEPLOY_BRANCH: deploy-slac-comcam
+  S3_ENDPOINT_URL: https://s3dfrgw.slac.stanford.edu
+  SASQUATCH_EXTRAS: dataset_tag=LSSTComCam/rapid_analysis
+  LSST_RESOURCES_S3_PROFILE_embargo: https://sdfembs3.sdf.slac.stanford.edu
+  HOME: /home/saluser
+scripts:
+###
+### ComCam pods
+###
+- name: LSSTComCam/runButlerWatcher.py
+  mounts:
+  - sdf-group-rubin
+  - sdf-data-rubin
+  - sdf-scratch
+- name: LSSTComCam/runHeadNode.py
+  mounts:
+  - sdf-group-rubin
+  - sdf-data-rubin
+  - sdf-scratch
+- name: LSSTComCam/runMetadataServer.py
+  mounts:
+  - sdf-group-rubin
+  - sdf-data-rubin
+  - sdf-scratch
+- name: LSSTComCam/runPlotter.py
+  mounts:
+  - sdf-group-rubin
+  - sdf-data-rubin
+  - sdf-scratch
+###
+### ComCam StatefulSets
+###
+comcamWorkerSet:
+  name: LSSTComCam/runSfmRunner.py
+  mounts:
+  - sdf-group-rubin
+  - sdf-data-rubin
+  - sdf-scratch
+  replicas: 9
+  resources:
+    requests:
+      cpu: 1.0
+      memory: 4G
+    limits:
+      cpu: 1.0
+      memory: 8G
+comcamGather2aSet:
+  name: LSSTComCam/runStep2aWorker.py
+  mounts:
+  - sdf-group-rubin
+  - sdf-data-rubin
+  - sdf-scratch
+  replicas: 8
+  resources:
+    requests:
+      cpu: 1.0
+      memory: "4G"
+    limits:
+      cpu: 1.0
+      memory: "8G"
+comcamGatherRollupSet:
+  name: LSSTComCam/runNightlyWorker.py
+  mounts:
+  - sdf-group-rubin
+  - sdf-data-rubin
+  - sdf-scratch
+  - sdf-group-rubin
+  - sdf-data-rubin
+  - sdf-scratch
+  replicas: 4
+  resources:
+    requests:
+      cpu: 1.0
+      memory: "12G"
+    limits:
+      cpu: 1.0
+      memory: "24G"
+credentialFile: google_write_creds
+vaultPrefixPath: secret/rubin/usdf-rapid-analysis
+pullSecretsPath: pull-secret
+rubinTvSecretsPath: rubintv-secrets
+credentialSecretsPath: rubintv-broadcaster
+butlerSecret:
+  key: butler-secret
+  containerPath: /secrets
+  dbUser: rubin
+envSecrets:
+- name: ASTROMETRY_NET_API_KEY
+  secretName: rubintv-secrets
+  secretKey: astrometry-net-api-key
+imagePullSecrets:
+- name: pull-secret
+pvcMountpointClaim:
+- name: sdf-group-rubin
+  containerPath: /sdf/group/rubin
+  claimSize: 1Gi
+  accessMode: ReadWriteMany
+- name: sdf-data-rubin
+  containerPath: /sdf/data/rubin
+  claimSize: 1Gi
+  accessMode: ReadWriteMany
+- name: sdf-scratch
+  containerPath: /sdf/scratch
+  claimSize: 1Gi
+  accessMode: ReadWriteMany
+resources:
+  requests:
+    cpu: 0.5
+    memory: 1G
+  limits:
+    cpu: 1.0
+    memory: 2.5G
+redis:
+  enabled: true
+  port: 6379
+  env:
+    MASTER: true
+  serviceAnnotations:
+    metallb.universe.tf/address-pool: sdf-services
+  envSecrets:
+  - name: REDIS_PASSWORD
+    secretName: rubintv-secrets
+    secretKey: redis-password
+  storage:
+    request: 10Gi
+  resources:
+    requests:
+      cpu: 100m
+      memory: 1Gi
+    limits:
+      cpu: 1
+      memory: 50Gi
diff --git a/environments/values-usdf-rapid-analysis.yaml b/environments/values-usdf-rapid-analysis.yaml
index fbd481aa73..f60204e2b7 100644
--- a/environments/values-usdf-rapid-analysis.yaml
+++ b/environments/values-usdf-rapid-analysis.yaml
@@ -10,3 +10,4 @@ applications:
   cert-manager: false
   gafaelfawr: false
   ingress-nginx: false
+  rapid-analysis: true

From 87805b818bdd5329f4e31266e19d2f3d431de9c6 Mon Sep 17 00:00:00 2001
From: Colin Slater <ctslater@uw.edu>
Date: Wed, 9 Apr 2025 16:58:26 -0700
Subject: [PATCH 03/16] Switch USDF from ComCam to LSSTCam.

---
 .../values-usdf-rapid-analysis.yaml           | 76 ++++++++++---------
 1 file changed, 39 insertions(+), 37 deletions(-)

diff --git a/applications/rapid-analysis/values-usdf-rapid-analysis.yaml b/applications/rapid-analysis/values-usdf-rapid-analysis.yaml
index 5a004b3e64..d7f71a57f4 100644
--- a/applications/rapid-analysis/values-usdf-rapid-analysis.yaml
+++ b/applications/rapid-analysis/values-usdf-rapid-analysis.yaml
@@ -1,7 +1,7 @@
 image:
   repository: lsstts/rapid-analysis
-  tag: c0039_usdf
-  pullPolicy: Always
+  tag: c0041_usdf
+  pullPolicy: IfNotPresent
 location: USDF
 env:
   DAF_BUTLER_REPOSITORY_INDEX: /sdf/group/rubin/shared/data-repos.yaml
@@ -13,83 +13,85 @@ env:
   HTTPS_PROXY: http://sdfproxy.sdf.slac.stanford.edu:3128
   SQUID_PROXY: http://sdfproxy.sdf.slac.stanford.edu:3128
   NO_PROXY: .slac.stanford.edu
-  DEPLOY_BRANCH: deploy-slac-comcam
+  DEPLOY_BRANCH: deploy-usdf
   S3_ENDPOINT_URL: https://s3dfrgw.slac.stanford.edu
-  SASQUATCH_EXTRAS: dataset_tag=LSSTComCam/rapid_analysis
+  SASQUATCH_EXTRAS: dataset_tag=LSSTCam/rapid_analysis
   LSST_RESOURCES_S3_PROFILE_embargo: https://sdfembs3.sdf.slac.stanford.edu
+  AWS_REQUEST_CHECKSUM_CALCULATION: WHEN_REQUIRED
+  AWS_RESPONSE_CHECKSUM_VALIDATION: WHEN_REQUIRED
   HOME: /home/saluser
+podAnnotations:
+  edu.stanford.slac.sdf.project/usdf-embargo: "true"
+affinity:
+  nodeAffinity:
+    requiredDuringSchedulingIgnoredDuringExecution:
+      nodeSelectorTerms:
+      - matchExpressions:
+        - key: node-role.kubernetes.io/rapid-analysis
+          operator: Exists
 scripts:
 ###
-### ComCam pods
+### LSSTCam pods
 ###
-- name: LSSTComCam/runButlerWatcher.py
+- name: LSSTCam/runButlerWatcher.py
   mounts:
   - sdf-group-rubin
   - sdf-data-rubin
   - sdf-scratch
-- name: LSSTComCam/runHeadNode.py
+- name: LSSTCam/runHeadNode.py
   mounts:
   - sdf-group-rubin
   - sdf-data-rubin
   - sdf-scratch
-- name: LSSTComCam/runMetadataServer.py
+- name: LSSTCam/runMetadataServer.py
   mounts:
   - sdf-group-rubin
   - sdf-data-rubin
   - sdf-scratch
-- name: LSSTComCam/runPlotter.py
+- name: LSSTCam/runOneOffExpRecord.py
   mounts:
   - sdf-group-rubin
   - sdf-data-rubin
   - sdf-scratch
-###
-### ComCam StatefulSets
-###
-comcamWorkerSet:
-  name: LSSTComCam/runSfmRunner.py
+- name: LSSTCam/runOneOffPostIsr.py
   mounts:
   - sdf-group-rubin
   - sdf-data-rubin
   - sdf-scratch
-  replicas: 9
-  resources:
-    requests:
-      cpu: 1.0
-      memory: 4G
-    limits:
-      cpu: 1.0
-      memory: 8G
-comcamGather2aSet:
-  name: LSSTComCam/runStep2aWorker.py
+- name: LSSTCam/runOneOffCalexp.py
   mounts:
   - sdf-group-rubin
   - sdf-data-rubin
   - sdf-scratch
-  replicas: 8
-  resources:
-    requests:
-      cpu: 1.0
-      memory: "4G"
-    limits:
-      cpu: 1.0
-      memory: "8G"
-comcamGatherRollupSet:
-  name: LSSTComCam/runNightlyWorker.py
+- name: LSSTCam/runPlotter.py
   mounts:
   - sdf-group-rubin
   - sdf-data-rubin
   - sdf-scratch
+  resources:
+    requests:
+      cpu: 1
+      memory: 8G
+    limits:
+      cpu: 1
+      memory: 12G
+###
+### LSSTCam StatefulSets
+###
+lsstcamWorkerSet:
+  name: LSSTCam/runSfmRunner.py
+  replicas: 9
+  mounts:
   - sdf-group-rubin
   - sdf-data-rubin
   - sdf-scratch
-  replicas: 4
   resources:
     requests:
       cpu: 1.0
-      memory: "12G"
+      memory: 4G
     limits:
       cpu: 1.0
-      memory: "24G"
+      memory: 8G
 credentialFile: google_write_creds
 vaultPrefixPath: secret/rubin/usdf-rapid-analysis
 pullSecretsPath: pull-secret

From 4af6eef0783f7a94946b3e31d55d0c2089b3cef5 Mon Sep 17 00:00:00 2001
From: Colin Slater <ctslater@uw.edu>
Date: Mon, 21 Apr 2025 10:57:33 -0700
Subject: [PATCH 04/16] Add butler canary.

---
 .../rapid-analysis/values-usdf-rapid-analysis.yaml         | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/applications/rapid-analysis/values-usdf-rapid-analysis.yaml b/applications/rapid-analysis/values-usdf-rapid-analysis.yaml
index d7f71a57f4..e592808f81 100644
--- a/applications/rapid-analysis/values-usdf-rapid-analysis.yaml
+++ b/applications/rapid-analysis/values-usdf-rapid-analysis.yaml
@@ -75,6 +75,13 @@ scripts:
     limits:
       cpu: 1
       memory: 12G
+- name: LSSTCam/runButlerCanary.py
+  mounts:
+  - sdf-group-rubin
+  - sdf-data-rubin
+  - sdf-scratch
+  env:
+    DAF_BUTLER_CACHE_EXPIRATION_MODE: disabled
 ###
 ### LSSTCam StatefulSets
 ###

From ac300640cc3b1af79a2dd4bae03bf67efa6c5e5c Mon Sep 17 00:00:00 2001
From: Colin Slater <ctslater@uw.edu>
Date: Mon, 21 Apr 2025 19:05:01 -0700
Subject: [PATCH 05/16] Many RA updates

---
 .../templates/configmap-repos.yaml            |  9 ++++
 .../rapid-analysis/templates/deployment.yaml  | 12 +++++
 .../templates/lsstcam-worker-set.yaml         |  3 ++
 .../rapid-analysis/templates/squid-pvc.yaml   |  5 +-
 .../templates/vault-secret.yaml               |  2 +
 .../values-usdf-rapid-analysis.yaml           | 47 +++++++++----------
 6 files changed, 50 insertions(+), 28 deletions(-)
 create mode 100644 applications/rapid-analysis/templates/configmap-repos.yaml

diff --git a/applications/rapid-analysis/templates/configmap-repos.yaml b/applications/rapid-analysis/templates/configmap-repos.yaml
new file mode 100644
index 0000000000..5074faf632
--- /dev/null
+++ b/applications/rapid-analysis/templates/configmap-repos.yaml
@@ -0,0 +1,9 @@
+apiVersion: v1
+kind: ConfigMap
+metadata:
+  name: "config-repos"
+  labels:
+    {{- include "rapid-analysis.labels" . | nindent 4 }}
+data:
+  data-repos.yaml: |
+    embargo: "s3://embargo@rubin-summit-users/butler.yaml"
diff --git a/applications/rapid-analysis/templates/deployment.yaml b/applications/rapid-analysis/templates/deployment.yaml
index 7387c49128..509a4e9176 100644
--- a/applications/rapid-analysis/templates/deployment.yaml
+++ b/applications/rapid-analysis/templates/deployment.yaml
@@ -94,6 +94,9 @@ spec:
             - name: user-secrets
               mountPath: {{ default "/home/saluser/.lsst" $.Values.butlerSecret.containerPath }}
               readOnly: true
+            - name: config
+              mountPath: "/config"
+              readOnly: true
           {{- if $.Values.nfsMountpoint }}
           {{- range $values := $.Values.nfsMountpoint }}
           {{- if (has $values.name $script.mounts) }}
@@ -138,6 +141,15 @@ spec:
         - name: rapid-analysis-secrets
           secret:
             secretName: rapid-analysis-secrets
+        - name: rubintv-aws-creds
+          secret:
+            secretName: rubintv-secrets
+        - name: config
+          configMap:
+            name: config-repos
+            items:
+            - key: "data-repos.yaml"
+              path: "data-repos.yaml"
       {{- if $.Values.nfsMountpoint }}
       {{- range $values := $.Values.nfsMountpoint }}
       {{- if (has $values.name $script.mounts) }}
diff --git a/applications/rapid-analysis/templates/lsstcam-worker-set.yaml b/applications/rapid-analysis/templates/lsstcam-worker-set.yaml
index ff3ec93176..9748a25c81 100644
--- a/applications/rapid-analysis/templates/lsstcam-worker-set.yaml
+++ b/applications/rapid-analysis/templates/lsstcam-worker-set.yaml
@@ -98,6 +98,9 @@ spec:
             - name: user-secrets
               mountPath: {{ default "/home/saluser/.lsst" $.Values.butlerSecret.containerPath }}
               readOnly: true
+            - name: config
+              mountPath: "/config"
+              readOnly: true
           {{- if $.Values.nfsMountpoint }}
           {{- range $values := $.Values.nfsMountpoint }}
           {{- if (has $values.name $script.mounts) }}
diff --git a/applications/rapid-analysis/templates/squid-pvc.yaml b/applications/rapid-analysis/templates/squid-pvc.yaml
index 06adcc3c1e..e0d1cc53d8 100644
--- a/applications/rapid-analysis/templates/squid-pvc.yaml
+++ b/applications/rapid-analysis/templates/squid-pvc.yaml
@@ -1,4 +1,4 @@
----
+{{- if .Values.squid.enabled }}
 apiVersion: v1
 kind: PersistentVolumeClaim
 metadata:
@@ -9,4 +9,5 @@ spec:
   resources:
     requests:
       storage: 1Gi
-  storageClassName: rook-ceph-block
\ No newline at end of file
+  storageClassName: rook-ceph-block
+{{- end }}
diff --git a/applications/rapid-analysis/templates/vault-secret.yaml b/applications/rapid-analysis/templates/vault-secret.yaml
index a841489c51..6a13bde356 100644
--- a/applications/rapid-analysis/templates/vault-secret.yaml
+++ b/applications/rapid-analysis/templates/vault-secret.yaml
@@ -1,3 +1,4 @@
+{{- if $.Values.pullSecretsPath }}
 ---
 apiVersion: ricoberger.de/v1alpha1
 kind: VaultSecret
@@ -9,6 +10,7 @@ metadata:
 spec:
   path: {{ required "vaultSecretsPath must be set" .Values.global.vaultSecretsPath }}/{{ required "pullSecretsPath must be set" .Values.pullSecretsPath }}
   type: kubernetes.io/dockerconfigjson
+{{- end }}
 ---
 apiVersion: ricoberger.de/v1alpha1
 kind: VaultSecret
diff --git a/applications/rapid-analysis/values-usdf-rapid-analysis.yaml b/applications/rapid-analysis/values-usdf-rapid-analysis.yaml
index e592808f81..a90606a320 100644
--- a/applications/rapid-analysis/values-usdf-rapid-analysis.yaml
+++ b/applications/rapid-analysis/values-usdf-rapid-analysis.yaml
@@ -1,10 +1,10 @@
 image:
-  repository: lsstts/rapid-analysis
-  tag: c0041_usdf
+  repository: ghcr.io/lsst-sitcom/rubintv_production
+  tag: tickets-DM-50534-w27
   pullPolicy: IfNotPresent
 location: USDF
 env:
-  DAF_BUTLER_REPOSITORY_INDEX: /sdf/group/rubin/shared/data-repos.yaml
+  DAF_BUTLER_REPOSITORY_INDEX: /config/data-repos.yaml
   http_proxy: http://sdfproxy.sdf.slac.stanford.edu:3128
   https_proxy: http://sdfproxy.sdf.slac.stanford.edu:3128
   squid_proxy: http://sdfproxy.sdf.slac.stanford.edu:3128
@@ -20,6 +20,7 @@ env:
   AWS_REQUEST_CHECKSUM_CALCULATION: WHEN_REQUIRED
   AWS_RESPONSE_CHECKSUM_VALIDATION: WHEN_REQUIRED
   HOME: /home/saluser
+  RA_PULL_DIRECTORIES: ""
 podAnnotations:
   edu.stanford.slac.sdf.project/usdf-embargo: "true"
 affinity:
@@ -29,44 +30,33 @@ affinity:
       - matchExpressions:
         - key: node-role.kubernetes.io/rapid-analysis
           operator: Exists
+securityContext:
+  uid: 17951
+  gid: 4085
 scripts:
 ###
 ### LSSTCam pods
 ###
 - name: LSSTCam/runButlerWatcher.py
   mounts:
-  - sdf-group-rubin
-  - sdf-data-rubin
   - sdf-scratch
 - name: LSSTCam/runHeadNode.py
   mounts:
-  - sdf-group-rubin
-  - sdf-data-rubin
   - sdf-scratch
 - name: LSSTCam/runMetadataServer.py
   mounts:
-  - sdf-group-rubin
-  - sdf-data-rubin
   - sdf-scratch
 - name: LSSTCam/runOneOffExpRecord.py
   mounts:
-  - sdf-group-rubin
-  - sdf-data-rubin
   - sdf-scratch
 - name: LSSTCam/runOneOffPostIsr.py
   mounts:
-  - sdf-group-rubin
-  - sdf-data-rubin
   - sdf-scratch
 - name: LSSTCam/runOneOffCalexp.py
   mounts:
-  - sdf-group-rubin
-  - sdf-data-rubin
   - sdf-scratch
 - name: LSSTCam/runPlotter.py
   mounts:
-  - sdf-group-rubin
-  - sdf-data-rubin
   - sdf-scratch
   resources:
     requests:
@@ -77,8 +67,6 @@ scripts:
       memory: 12G
 - name: LSSTCam/runButlerCanary.py
   mounts:
-  - sdf-group-rubin
-  - sdf-data-rubin
   - sdf-scratch
   env:
     DAF_BUTLER_CACHE_EXPIRATION_MODE: disabled
@@ -87,10 +75,8 @@ scripts:
 ###
 lsstcamWorkerSet:
   name: LSSTCam/runSfmRunner.py
-  replicas: 9
+  replicas: 820
   mounts:
-  - sdf-group-rubin
-  - sdf-data-rubin
   - sdf-scratch
   resources:
     requests:
@@ -99,21 +85,30 @@ lsstcamWorkerSet:
     limits:
       cpu: 1.0
       memory: 8G
+lsstcamGather2aSet:
+  name: LSSTCam/runStep1bWorker.py
+  mounts:
+  - sdf-scratch
+  replicas: 5
+  resources:
+    requests:
+      cpu: 1.0
+      memory: "4G"
+    limits:
+      cpu: 1.0
+      memory: "8G"
 credentialFile: google_write_creds
 vaultPrefixPath: secret/rubin/usdf-rapid-analysis
-pullSecretsPath: pull-secret
 rubinTvSecretsPath: rubintv-secrets
 credentialSecretsPath: rubintv-broadcaster
 butlerSecret:
   key: butler-secret
   containerPath: /secrets
-  dbUser: rubin
+  dbUser: rapid_analysis
 envSecrets:
 - name: ASTROMETRY_NET_API_KEY
   secretName: rubintv-secrets
   secretKey: astrometry-net-api-key
-imagePullSecrets:
-- name: pull-secret
 pvcMountpointClaim:
 - name: sdf-group-rubin
   containerPath: /sdf/group/rubin

From 8bc544fa26be98c3eae2f17d8776b560cd202683 Mon Sep 17 00:00:00 2001
From: Colin Slater <ctslater@uw.edu>
Date: Thu, 10 Jul 2025 16:34:32 -0700
Subject: [PATCH 06/16] Add AOS to USDF.

---
 .../rapid-analysis/values-usdf-rapid-analysis.yaml | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/applications/rapid-analysis/values-usdf-rapid-analysis.yaml b/applications/rapid-analysis/values-usdf-rapid-analysis.yaml
index a90606a320..f536b4a8ea 100644
--- a/applications/rapid-analysis/values-usdf-rapid-analysis.yaml
+++ b/applications/rapid-analysis/values-usdf-rapid-analysis.yaml
@@ -97,6 +97,20 @@ lsstcamGather2aSet:
     limits:
       cpu: 1.0
       memory: "8G"
+lsstcamAosWorkerSet:
+  name: LSSTCam/runAosWorker.py
+  mounts:
+  - sdf-scratch
+  replicas: 36
+  env:
+    LIMITS_CPU: 2
+  resources:
+    requests:
+      cpu: 1.0
+      memory: 4G
+    limits:
+      cpu: 2.0
+      memory: 8G
 credentialFile: google_write_creds
 vaultPrefixPath: secret/rubin/usdf-rapid-analysis
 rubinTvSecretsPath: rubintv-secrets

From a2c7c6ec87700365d0dbfcd4488d0dce6a688928 Mon Sep 17 00:00:00 2001
From: Colin Slater <ctslater@uw.edu>
Date: Fri, 16 Jan 2026 13:23:14 -0800
Subject: [PATCH 07/16] Add AOS to USDF.

---
 .../rapid-analysis/templates/lsstcam-workerAos-set.yaml        | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/applications/rapid-analysis/templates/lsstcam-workerAos-set.yaml b/applications/rapid-analysis/templates/lsstcam-workerAos-set.yaml
index 741c5468b7..438a65c9b2 100644
--- a/applications/rapid-analysis/templates/lsstcam-workerAos-set.yaml
+++ b/applications/rapid-analysis/templates/lsstcam-workerAos-set.yaml
@@ -98,6 +98,9 @@ spec:
             - name: user-secrets
               mountPath: {{ default "/home/saluser/.lsst" $.Values.butlerSecret.containerPath }}
               readOnly: true
+            - name: config
+              mountPath: "/config"
+              readOnly: true
           {{- if $.Values.nfsMountpoint }}
           {{- range $values := $.Values.nfsMountpoint }}
           {{- if (has $values.name $script.mounts) }}

From cd18994fb386df639b409ef31c57bfc81213153f Mon Sep 17 00:00:00 2001
From: Colin Slater <ctslater@uw.edu>
Date: Sun, 20 Jul 2025 21:48:51 -0400
Subject: [PATCH 08/16] Enable image compression, version bumps, AOS updates.

---
 .../values-usdf-rapid-analysis.yaml           | 54 +++++++++++++++++--
 1 file changed, 49 insertions(+), 5 deletions(-)

diff --git a/applications/rapid-analysis/values-usdf-rapid-analysis.yaml b/applications/rapid-analysis/values-usdf-rapid-analysis.yaml
index f536b4a8ea..2772afa8f2 100644
--- a/applications/rapid-analysis/values-usdf-rapid-analysis.yaml
+++ b/applications/rapid-analysis/values-usdf-rapid-analysis.yaml
@@ -1,10 +1,11 @@
 image:
   repository: ghcr.io/lsst-sitcom/rubintv_production
-  tag: tickets-DM-50534-w27
+  tag: tickets-DM-50534-w48
   pullPolicy: IfNotPresent
 location: USDF
 env:
   DAF_BUTLER_REPOSITORY_INDEX: /config/data-repos.yaml
+  DAF_BUTLER_CONFIG_PATH: /repos/drp_pipe/bps/compression/LSSTCam/nightly-validation/config
   http_proxy: http://sdfproxy.sdf.slac.stanford.edu:3128
   https_proxy: http://sdfproxy.sdf.slac.stanford.edu:3128
   squid_proxy: http://sdfproxy.sdf.slac.stanford.edu:3128
@@ -20,7 +21,8 @@ env:
   AWS_REQUEST_CHECKSUM_CALCULATION: WHEN_REQUIRED
   AWS_RESPONSE_CHECKSUM_VALIDATION: WHEN_REQUIRED
   HOME: /home/saluser
-  RA_PULL_DIRECTORIES: ""
+  RA_PULL_DIRECTORIES: "drp_pipe"
+  TARTS_DATA_DIR: /sdf/scratch/rubin/rapid-analysis/aos_data/TARTS
 podAnnotations:
   edu.stanford.slac.sdf.project/usdf-embargo: "true"
 affinity:
@@ -52,9 +54,39 @@ scripts:
 - name: LSSTCam/runOneOffPostIsr.py
   mounts:
   - sdf-scratch
-- name: LSSTCam/runOneOffCalexp.py
+- name: LSSTCam/runOneOffVisitImage.py
   mounts:
   - sdf-scratch
+  resources:
+    requests:
+      cpu: 1
+      memory: 6G
+    limits:
+      cpu: 1
+      memory: 8G
+- name: LSSTCam/runMetadataServerRaPerformance.py
+  mounts:
+  - sdf-scratch
+- name: LSSTCam/runPerformanceMonitor.py
+  mounts:
+  - sdf-scratch
+  resources:
+    requests:
+      cpu: 1
+      memory: 6G
+    limits:
+      cpu: 1
+      memory: 8G
+- name: LSSTCam/runFWHMPlotting.py
+  mounts:
+  - sdf-scratch
+  resources:
+    requests:
+      cpu: 1
+      memory: 4G
+    limits:
+      cpu: 1
+      memory: 6G
 - name: LSSTCam/runPlotter.py
   mounts:
   - sdf-scratch
@@ -93,10 +125,10 @@ lsstcamGather2aSet:
   resources:
     requests:
       cpu: 1.0
-      memory: "4G"
+      memory: "8G"
     limits:
       cpu: 1.0
-      memory: "8G"
+      memory: "12G"
 lsstcamAosWorkerSet:
   name: LSSTCam/runAosWorker.py
   mounts:
@@ -111,6 +143,18 @@ lsstcamAosWorkerSet:
     limits:
       cpu: 2.0
       memory: 8G
+lsstcamGather2aAosSet:
+  name: LSSTCam/runStep1bAosWorker.py
+  mounts:
+  - sdf-scratch
+  replicas: 4
+  resources:
+    requests:
+      cpu: 1.0
+      memory: "4G"
+    limits:
+      cpu: 1.0
+      memory: "8G"
 credentialFile: google_write_creds
 vaultPrefixPath: secret/rubin/usdf-rapid-analysis
 rubinTvSecretsPath: rubintv-secrets

From e45ee8abb1594861db617ed5170380716ec1337d Mon Sep 17 00:00:00 2001
From: Colin Slater <ctslater@uw.edu>
Date: Tue, 16 Dec 2025 16:45:25 -0800
Subject: [PATCH 09/16] Add transfer alarm.

---
 applications/rapid-analysis/values-usdf-rapid-analysis.yaml | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/applications/rapid-analysis/values-usdf-rapid-analysis.yaml b/applications/rapid-analysis/values-usdf-rapid-analysis.yaml
index 2772afa8f2..892056cba6 100644
--- a/applications/rapid-analysis/values-usdf-rapid-analysis.yaml
+++ b/applications/rapid-analysis/values-usdf-rapid-analysis.yaml
@@ -102,6 +102,11 @@ scripts:
   - sdf-scratch
   env:
     DAF_BUTLER_CACHE_EXPIRATION_MODE: disabled
+- name: LSSTCam/runTransferAlarm.py
+  image:
+    pullPolicy: Always
+  mounts:
+  - sdf-scratch
 ###
 ### LSSTCam StatefulSets
 ###

From 08933891d3c73640aec0b6b0e2be80df569e42ea Mon Sep 17 00:00:00 2001
From: Colin Slater <ctslater@uw.edu>
Date: Fri, 16 Jan 2026 15:14:51 -0800
Subject: [PATCH 10/16] Add configmap mounts.

---
 applications/rapid-analysis/README.md         |  3 +-
 .../rapid-analysis/templates/deployment.yaml  | 31 ++++++++++++-------
 .../values-usdf-rapid-analysis.yaml           | 23 +++++++++++++-
 applications/rapid-analysis/values.yaml       |  5 +++
 4 files changed, 48 insertions(+), 14 deletions(-)

diff --git a/applications/rapid-analysis/README.md b/applications/rapid-analysis/README.md
index 06569d1293..b7e4aceda9 100644
--- a/applications/rapid-analysis/README.md
+++ b/applications/rapid-analysis/README.md
@@ -8,6 +8,7 @@ A Helm chart for deploying the Rapid Analysis services.
 |-----|------|---------|-------------|
 | affinity | object | `{}` | This specifies the scheduling constraints of the pod. |
 | butlerSecret | object | `{}` | This section allows for specification of Butler secret information. If this section is used, it must contain the following attributes: _key_ (The vault key for the Butler secret), _containerPath_ (The directory location for the Butler secret), _dbUser_ (The username for the Butler backend database) |
+| configMountpoint | list | `[]` | This section holds the information necessary to claim persistent volumes. If the section is used, each object listed can have the following attributes defined: _name_ (The name ot the persistent volume), _containerPath_ (The path inside the container to mount), _subPath_ (persistent volume subpath, optional) |
 | env | object | `{"AWS_REQUEST_CHECKSUM_CALCULATION":"WHEN_REQUIRED","AWS_RESPONSE_CHECKSUM_VALIDATION":"WHEN_REQUIRED"}` | This section holds a set of key, value pairs for environmental variables (ENV_VAR: value). NOTE: RUN_ARG is taken care of by the chart using _script_. |
 | envSecrets | list | `[]` | This section holds specifications for secret injection. If this section is used, each object listed must have the following attributes defined: _name_ (The label for the secret), _secretName_ (The name of the vault store reference. Uses the _namespace_ attribute to construct the full name), _secretKey_ (The key in the vault store containing the necessary secret) |
 | fullnameOverride | string | `""` | Specify the deployed application name specifically. Overrides all other names. |
@@ -25,7 +26,7 @@ A Helm chart for deploying the Rapid Analysis services.
 | podAnnotations | object | `{}` | This allows the specification of pod annotations. |
 | pullSecretsPath | string | `""` |  |
 | pvcMountpoint | list | `[]` | This section holds information about existing volume claims. If the section is used, each object listed can have the following attributes defined: _name_ (The name ot the persistent volume), _containerPath_ (The path inside the container to mount), _subPath_ (persistent volume subpath, optional) |
-| pvcMountpointClaim | list | `[]` | This section holds the information necessary to claim persistent volumes. If the section is used, each object listed can have the following attributes defined: _name_ (The name ot the persistent volume), _containerPath_ (The path inside the container to mount), _subPath_ (persistent volume subpath, optional) |
+| pvcMountpointClaim | list | `[]` | This section holds the information necessary to claim persistent volumes. If the section is used, each object listed can have the following attributes defined: _name_ (The name of the persistent volume and the configMap), _items_ (Files in the configmap to mount), |
 | redis.affinity | object | `{}` | Affinity rules for the redis pods |
 | redis.enabled | bool | `false` | This specifies whether to use redis or not. |
 | redis.env | object | `{}` | This section holds a set of key, value pairs for environmental variables (ENV_VAR: value). NOTE: RUN_ARG is taken care of by the chart using _script_. |
diff --git a/applications/rapid-analysis/templates/deployment.yaml b/applications/rapid-analysis/templates/deployment.yaml
index 509a4e9176..345cdf4f85 100644
--- a/applications/rapid-analysis/templates/deployment.yaml
+++ b/applications/rapid-analysis/templates/deployment.yaml
@@ -94,9 +94,6 @@ spec:
             - name: user-secrets
               mountPath: {{ default "/home/saluser/.lsst" $.Values.butlerSecret.containerPath }}
               readOnly: true
-            - name: config
-              mountPath: "/config"
-              readOnly: true
           {{- if $.Values.nfsMountpoint }}
           {{- range $values := $.Values.nfsMountpoint }}
           {{- if (has $values.name $script.mounts) }}
@@ -117,6 +114,15 @@ spec:
           {{- end }}
           {{- end }}
           {{- end }}
+          {{- if $.Values.configMountpoint }}
+          {{- range $values := $.Values.configMountpoint }}
+          {{- if (has $values.name $script.mounts) }}
+            - name: {{ $values.name }}
+              mountPath: {{ $values.path }}
+              readOnly: true
+          {{- end }}
+          {{- end }}
+          {{- end }}
           {{- if $.Values.pvcMountpointClaim }}
           {{- range $values := $.Values.pvcMountpointClaim }}
           {{- if (has $values.name $script.mounts) }}
@@ -141,15 +147,6 @@ spec:
         - name: rapid-analysis-secrets
           secret:
             secretName: rapid-analysis-secrets
-        - name: rubintv-aws-creds
-          secret:
-            secretName: rubintv-secrets
-        - name: config
-          configMap:
-            name: config-repos
-            items:
-            - key: "data-repos.yaml"
-              path: "data-repos.yaml"
       {{- if $.Values.nfsMountpoint }}
       {{- range $values := $.Values.nfsMountpoint }}
       {{- if (has $values.name $script.mounts) }}
@@ -170,6 +167,16 @@ spec:
       {{- end }}
       {{- end }}
       {{- end }}
+      {{- if $.Values.configMountpoint }}
+      {{- range $values := $.Values.configMountpoint }}
+      {{- if (has $values.name $script.mounts) }}
+        - name: {{ $values.name }}
+          configMap:
+            name: {{ $values.name }}
+            items: {{ toYaml $values.items | nindent 12 }}
+      {{- end }}
+      {{- end }}
+      {{- end }}
       {{- if $.Values.pvcMountpointClaim }}
       {{- range $values := $.Values.pvcMountpointClaim }}
       {{- if (has $values.name $script.mounts) }}
diff --git a/applications/rapid-analysis/values-usdf-rapid-analysis.yaml b/applications/rapid-analysis/values-usdf-rapid-analysis.yaml
index 892056cba6..dd8d03e1a4 100644
--- a/applications/rapid-analysis/values-usdf-rapid-analysis.yaml
+++ b/applications/rapid-analysis/values-usdf-rapid-analysis.yaml
@@ -42,21 +42,27 @@ scripts:
 - name: LSSTCam/runButlerWatcher.py
   mounts:
   - sdf-scratch
+  - config-repos
 - name: LSSTCam/runHeadNode.py
   mounts:
   - sdf-scratch
+  - config-repos
 - name: LSSTCam/runMetadataServer.py
   mounts:
   - sdf-scratch
+  - config-repos
 - name: LSSTCam/runOneOffExpRecord.py
   mounts:
   - sdf-scratch
+  - config-repos
 - name: LSSTCam/runOneOffPostIsr.py
   mounts:
   - sdf-scratch
+  - config-repos
 - name: LSSTCam/runOneOffVisitImage.py
   mounts:
   - sdf-scratch
+  - config-repos
   resources:
     requests:
       cpu: 1
@@ -67,9 +73,11 @@ scripts:
 - name: LSSTCam/runMetadataServerRaPerformance.py
   mounts:
   - sdf-scratch
+  - config-repos
 - name: LSSTCam/runPerformanceMonitor.py
   mounts:
   - sdf-scratch
+  - config-repos
   resources:
     requests:
       cpu: 1
@@ -90,6 +98,7 @@ scripts:
 - name: LSSTCam/runPlotter.py
   mounts:
   - sdf-scratch
+  - config-repos
   resources:
     requests:
       cpu: 1
@@ -100,13 +109,15 @@ scripts:
 - name: LSSTCam/runButlerCanary.py
   mounts:
   - sdf-scratch
+  - config-repos
   env:
     DAF_BUTLER_CACHE_EXPIRATION_MODE: disabled
 - name: LSSTCam/runTransferAlarm.py
   image:
-    pullPolicy: Always
+    pullPolicy: IfNotPresent
   mounts:
   - sdf-scratch
+  - config-repos
 ###
 ### LSSTCam StatefulSets
 ###
@@ -115,6 +126,7 @@ lsstcamWorkerSet:
   replicas: 820
   mounts:
   - sdf-scratch
+  - config-repos
   resources:
     requests:
       cpu: 1.0
@@ -126,6 +138,7 @@ lsstcamGather2aSet:
   name: LSSTCam/runStep1bWorker.py
   mounts:
   - sdf-scratch
+  - config-repos
   replicas: 5
   resources:
     requests:
@@ -138,6 +151,7 @@ lsstcamAosWorkerSet:
   name: LSSTCam/runAosWorker.py
   mounts:
   - sdf-scratch
+  - config-repos
   replicas: 36
   env:
     LIMITS_CPU: 2
@@ -152,6 +166,7 @@ lsstcamGather2aAosSet:
   name: LSSTCam/runStep1bAosWorker.py
   mounts:
   - sdf-scratch
+  - config-repos
   replicas: 4
   resources:
     requests:
@@ -185,6 +200,12 @@ pvcMountpointClaim:
   containerPath: /sdf/scratch
   claimSize: 1Gi
   accessMode: ReadWriteMany
+configMountpoint:
+- name: config-repos
+  path: "/config"
+  items:
+  - key: "data-repos.yaml"
+    path: "data-repos.yaml"
 resources:
   requests:
     cpu: 0.5
diff --git a/applications/rapid-analysis/values.yaml b/applications/rapid-analysis/values.yaml
index cf2fcbd874..bf5fd70cca 100644
--- a/applications/rapid-analysis/values.yaml
+++ b/applications/rapid-analysis/values.yaml
@@ -65,6 +65,11 @@ pvcMountpoint: []
 # _name_ (The name ot the persistent volume),
 # _containerPath_ (The path inside the container to mount),
 # _subPath_ (persistent volume subpath, optional)
+configMountpoint: []
+# -- This section holds the information necessary to claim persistent volumes.
+# If the section is used, each object listed can have the following attributes defined:
+# _name_ (The name of the persistent volume and the configMap),
+# _items_ (Files in the configmap to mount),
 pvcMountpointClaim: []
 # -- Adds an extra string to the release name.
 nameOverride: ""

From b1b8a0cd27a2ee9afa9118e5344fb95bf4d7942f Mon Sep 17 00:00:00 2001
From: Colin Slater <ctslater@uw.edu>
Date: Fri, 16 Jan 2026 15:41:56 -0800
Subject: [PATCH 11/16] Add configMap mounts.

---
 .../templates/lsstcam-backlog-worker-set.yaml | 19 ++++++++++++++++
 .../templates/lsstcam-gather-rollup-set.yaml  | 19 ++++++++++++++++
 .../templates/lsstcam-gather1b-set.yaml       | 19 ++++++++++++++++
 .../templates/lsstcam-gather1bAos-set.yaml    | 19 ++++++++++++++++
 .../templates/lsstcam-worker-set.yaml         | 22 ++++++++++++++++---
 .../templates/lsstcam-workerAos-set.yaml      | 22 ++++++++++++++++---
 6 files changed, 114 insertions(+), 6 deletions(-)

diff --git a/applications/rapid-analysis/templates/lsstcam-backlog-worker-set.yaml b/applications/rapid-analysis/templates/lsstcam-backlog-worker-set.yaml
index 1fc29151d3..dcd8d49f17 100644
--- a/applications/rapid-analysis/templates/lsstcam-backlog-worker-set.yaml
+++ b/applications/rapid-analysis/templates/lsstcam-backlog-worker-set.yaml
@@ -118,6 +118,15 @@ spec:
           {{- end }}
           {{- end }}
           {{- end }}
+          {{- if $.Values.configMountpoint }}
+          {{- range $values := $.Values.configMountpoint }}
+          {{- if (has $values.name $script.mounts) }}
+            - name: {{ $values.name }}
+              mountPath: {{ $values.path }}
+              readOnly: true
+          {{- end }}
+          {{- end }}
+          {{- end }}
           {{- if $.Values.pvcMountpointClaim }}
           {{- range $values := $.Values.pvcMountpointClaim }}
           {{- if (has $values.name $script.mounts) }}
@@ -162,6 +171,16 @@ spec:
       {{- end }}
       {{- end }}
       {{- end }}
+      {{- if $.Values.configMountpoint }}
+      {{- range $values := $.Values.configMountpoint }}
+      {{- if (has $values.name $script.mounts) }}
+        - name: {{ $values.name }}
+          configMap:
+            name: {{ $values.name }}
+            items: {{ toYaml $values.items | nindent 12 }}
+      {{- end }}
+      {{- end }}
+      {{- end }}
       {{- if $.Values.pvcMountpointClaim }}
       {{- range $values := $.Values.pvcMountpointClaim }}
       {{- if (has $values.name $script.mounts) }}
diff --git a/applications/rapid-analysis/templates/lsstcam-gather-rollup-set.yaml b/applications/rapid-analysis/templates/lsstcam-gather-rollup-set.yaml
index 90c9e2999b..a9ee5a0feb 100644
--- a/applications/rapid-analysis/templates/lsstcam-gather-rollup-set.yaml
+++ b/applications/rapid-analysis/templates/lsstcam-gather-rollup-set.yaml
@@ -118,6 +118,15 @@ spec:
           {{- end }}
           {{- end }}
           {{- end }}
+          {{- if $.Values.configMountpoint }}
+          {{- range $values := $.Values.configMountpoint }}
+          {{- if (has $values.name $script.mounts) }}
+            - name: {{ $values.name }}
+              mountPath: {{ $values.path }}
+              readOnly: true
+          {{- end }}
+          {{- end }}
+          {{- end }}
           {{- if $.Values.pvcMountpointClaim }}
           {{- range $values := $.Values.pvcMountpointClaim }}
           {{- if (has $values.name $script.mounts) }}
@@ -162,6 +171,16 @@ spec:
       {{- end }}
       {{- end }}
       {{- end }}
+      {{- if $.Values.configMountpoint }}
+      {{- range $values := $.Values.configMountpoint }}
+      {{- if (has $values.name $script.mounts) }}
+        - name: {{ $values.name }}
+          configMap:
+            name: {{ $values.name }}
+            items: {{ toYaml $values.items | nindent 12 }}
+      {{- end }}
+      {{- end }}
+      {{- end }}
       {{- if $.Values.pvcMountpointClaim }}
       {{- range $values := $.Values.pvcMountpointClaim }}
       {{- if (has $values.name $script.mounts) }}
diff --git a/applications/rapid-analysis/templates/lsstcam-gather1b-set.yaml b/applications/rapid-analysis/templates/lsstcam-gather1b-set.yaml
index ef4781e6be..1cbb7f0d33 100644
--- a/applications/rapid-analysis/templates/lsstcam-gather1b-set.yaml
+++ b/applications/rapid-analysis/templates/lsstcam-gather1b-set.yaml
@@ -118,6 +118,15 @@ spec:
           {{- end }}
           {{- end }}
           {{- end }}
+          {{- if $.Values.configMountpoint }}
+          {{- range $values := $.Values.configMountpoint }}
+          {{- if (has $values.name $script.mounts) }}
+            - name: {{ $values.name }}
+              mountPath: {{ $values.path }}
+              readOnly: true
+          {{- end }}
+          {{- end }}
+          {{- end }}
           {{- if $.Values.pvcMountpointClaim }}
           {{- range $values := $.Values.pvcMountpointClaim }}
           {{- if (has $values.name $script.mounts) }}
@@ -162,6 +171,16 @@ spec:
       {{- end }}
       {{- end }}
       {{- end }}
+      {{- if $.Values.configMountpoint }}
+      {{- range $values := $.Values.configMountpoint }}
+      {{- if (has $values.name $script.mounts) }}
+        - name: {{ $values.name }}
+          configMap:
+            name: {{ $values.name }}
+            items: {{ toYaml $values.items | nindent 12 }}
+      {{- end }}
+      {{- end }}
+      {{- end }}
       {{- if $.Values.pvcMountpointClaim }}
       {{- range $values := $.Values.pvcMountpointClaim }}
       {{- if (has $values.name $script.mounts) }}
diff --git a/applications/rapid-analysis/templates/lsstcam-gather1bAos-set.yaml b/applications/rapid-analysis/templates/lsstcam-gather1bAos-set.yaml
index 56a18dc81a..46ab6765c4 100644
--- a/applications/rapid-analysis/templates/lsstcam-gather1bAos-set.yaml
+++ b/applications/rapid-analysis/templates/lsstcam-gather1bAos-set.yaml
@@ -119,6 +119,15 @@ spec:
           {{- end }}
           {{- end }}
           {{- end }}
+          {{- if $.Values.configMountpoint }}
+          {{- range $values := $.Values.configMountpoint }}
+          {{- if (has $values.name $script.mounts) }}
+            - name: {{ $values.name }}
+              mountPath: {{ $values.path }}
+              readOnly: true
+          {{- end }}
+          {{- end }}
+          {{- end }}
           {{- if $.Values.pvcMountpointClaim }}
           {{- range $values := $.Values.pvcMountpointClaim }}
           {{- if (has $values.name $script.mounts) }}
@@ -163,6 +172,16 @@ spec:
       {{- end }}
       {{- end }}
       {{- end }}
+      {{- if $.Values.configMountpoint }}
+      {{- range $values := $.Values.configMountpoint }}
+      {{- if (has $values.name $script.mounts) }}
+        - name: {{ $values.name }}
+          configMap:
+            name: {{ $values.name }}
+            items: {{ toYaml $values.items | nindent 12 }}
+      {{- end }}
+      {{- end }}
+      {{- end }}
       {{- if $.Values.pvcMountpointClaim }}
       {{- range $values := $.Values.pvcMountpointClaim }}
       {{- if (has $values.name $script.mounts) }}
diff --git a/applications/rapid-analysis/templates/lsstcam-worker-set.yaml b/applications/rapid-analysis/templates/lsstcam-worker-set.yaml
index 9748a25c81..d09f00f3b0 100644
--- a/applications/rapid-analysis/templates/lsstcam-worker-set.yaml
+++ b/applications/rapid-analysis/templates/lsstcam-worker-set.yaml
@@ -98,9 +98,6 @@ spec:
             - name: user-secrets
               mountPath: {{ default "/home/saluser/.lsst" $.Values.butlerSecret.containerPath }}
               readOnly: true
-            - name: config
-              mountPath: "/config"
-              readOnly: true
           {{- if $.Values.nfsMountpoint }}
           {{- range $values := $.Values.nfsMountpoint }}
           {{- if (has $values.name $script.mounts) }}
@@ -121,6 +118,15 @@ spec:
           {{- end }}
           {{- end }}
           {{- end }}
+          {{- if $.Values.configMountpoint }}
+          {{- range $values := $.Values.configMountpoint }}
+          {{- if (has $values.name $script.mounts) }}
+            - name: {{ $values.name }}
+              mountPath: {{ $values.path }}
+              readOnly: true
+          {{- end }}
+          {{- end }}
+          {{- end }}
           {{- if $.Values.pvcMountpointClaim }}
           {{- range $values := $.Values.pvcMountpointClaim }}
           {{- if (has $values.name $script.mounts) }}
@@ -165,6 +171,16 @@ spec:
       {{- end }}
       {{- end }}
       {{- end }}
+      {{- if $.Values.configMountpoint }}
+      {{- range $values := $.Values.configMountpoint }}
+      {{- if (has $values.name $script.mounts) }}
+        - name: {{ $values.name }}
+          configMap:
+            name: {{ $values.name }}
+            items: {{ toYaml $values.items | nindent 12 }}
+      {{- end }}
+      {{- end }}
+      {{- end }}
       {{- if $.Values.pvcMountpointClaim }}
       {{- range $values := $.Values.pvcMountpointClaim }}
       {{- if (has $values.name $script.mounts) }}
diff --git a/applications/rapid-analysis/templates/lsstcam-workerAos-set.yaml b/applications/rapid-analysis/templates/lsstcam-workerAos-set.yaml
index 438a65c9b2..453a02b6c3 100644
--- a/applications/rapid-analysis/templates/lsstcam-workerAos-set.yaml
+++ b/applications/rapid-analysis/templates/lsstcam-workerAos-set.yaml
@@ -98,9 +98,6 @@ spec:
             - name: user-secrets
               mountPath: {{ default "/home/saluser/.lsst" $.Values.butlerSecret.containerPath }}
               readOnly: true
-            - name: config
-              mountPath: "/config"
-              readOnly: true
           {{- if $.Values.nfsMountpoint }}
           {{- range $values := $.Values.nfsMountpoint }}
           {{- if (has $values.name $script.mounts) }}
@@ -121,6 +118,15 @@ spec:
           {{- end }}
           {{- end }}
           {{- end }}
+          {{- if $.Values.configMountpoint }}
+          {{- range $values := $.Values.configMountpoint }}
+          {{- if (has $values.name $script.mounts) }}
+            - name: {{ $values.name }}
+              mountPath: {{ $values.path }}
+              readOnly: true
+          {{- end }}
+          {{- end }}
+          {{- end }}
           {{- if $.Values.pvcMountpointClaim }}
           {{- range $values := $.Values.pvcMountpointClaim }}
           {{- if (has $values.name $script.mounts) }}
@@ -165,6 +171,16 @@ spec:
       {{- end }}
       {{- end }}
       {{- end }}
+      {{- if $.Values.configMountpoint }}
+      {{- range $values := $.Values.configMountpoint }}
+      {{- if (has $values.name $script.mounts) }}
+        - name: {{ $values.name }}
+          configMap:
+            name: {{ $values.name }}
+            items: {{ toYaml $values.items | nindent 12 }}
+      {{- end }}
+      {{- end }}
+      {{- end }}
       {{- if $.Values.pvcMountpointClaim }}
       {{- range $values := $.Values.pvcMountpointClaim }}
       {{- if (has $values.name $script.mounts) }}

From a5b3d59185530e20ec0f681d03cb6872abe65610 Mon Sep 17 00:00:00 2001
From: Colin Slater <ctslater@uw.edu>
Date: Fri, 16 Jan 2026 15:48:00 -0800
Subject: [PATCH 12/16] Update values with correct statefulset names.

---
 applications/rapid-analysis/values-usdf-rapid-analysis.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/applications/rapid-analysis/values-usdf-rapid-analysis.yaml b/applications/rapid-analysis/values-usdf-rapid-analysis.yaml
index dd8d03e1a4..15bc6dcb28 100644
--- a/applications/rapid-analysis/values-usdf-rapid-analysis.yaml
+++ b/applications/rapid-analysis/values-usdf-rapid-analysis.yaml
@@ -134,7 +134,7 @@ lsstcamWorkerSet:
     limits:
       cpu: 1.0
       memory: 8G
-lsstcamGather2aSet:
+lsstcamGather1bSet:
   name: LSSTCam/runStep1bWorker.py
   mounts:
   - sdf-scratch
@@ -162,7 +162,7 @@ lsstcamAosWorkerSet:
     limits:
       cpu: 2.0
       memory: 8G
-lsstcamGather2aAosSet:
+lsstcamGather1bAosSet:
   name: LSSTCam/runStep1bAosWorker.py
   mounts:
   - sdf-scratch

From 601fa0e2031ec8d35c82582377299b5be12a012b Mon Sep 17 00:00:00 2001
From: Colin Slater <ctslater@uw.edu>
Date: Sun, 18 Jan 2026 22:38:30 -0800
Subject: [PATCH 13/16] Remove rubintv secrets.

---
 .../rapid-analysis/values-usdf-rapid-analysis.yaml       | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

diff --git a/applications/rapid-analysis/values-usdf-rapid-analysis.yaml b/applications/rapid-analysis/values-usdf-rapid-analysis.yaml
index 15bc6dcb28..1faee41b24 100644
--- a/applications/rapid-analysis/values-usdf-rapid-analysis.yaml
+++ b/applications/rapid-analysis/values-usdf-rapid-analysis.yaml
@@ -175,18 +175,11 @@ lsstcamGather1bAosSet:
     limits:
       cpu: 1.0
       memory: "8G"
-credentialFile: google_write_creds
 vaultPrefixPath: secret/rubin/usdf-rapid-analysis
-rubinTvSecretsPath: rubintv-secrets
-credentialSecretsPath: rubintv-broadcaster
 butlerSecret:
   key: butler-secret
   containerPath: /secrets
   dbUser: rapid_analysis
-envSecrets:
-- name: ASTROMETRY_NET_API_KEY
-  secretName: rubintv-secrets
-  secretKey: astrometry-net-api-key
 pvcMountpointClaim:
 - name: sdf-group-rubin
   containerPath: /sdf/group/rubin
@@ -222,7 +215,7 @@ redis:
     metallb.universe.tf/address-pool: sdf-services
   envSecrets:
   - name: REDIS_PASSWORD
-    secretName: rubintv-secrets
+    secretName: rapid-analysis-secrets
     secretKey: redis-password
   storage:
     request: 10Gi

From 3e302262ec1aee0aeb0d68682c9a27b524814046 Mon Sep 17 00:00:00 2001
From: Colin Slater <ctslater@uw.edu>
Date: Fri, 20 Feb 2026 13:58:52 -0800
Subject: [PATCH 14/16] Remove siteTag since it is redundant with location.

---
 applications/rapid-analysis/README.md                    | 1 -
 applications/rapid-analysis/templates/deployment.yaml    | 2 +-
 applications/rapid-analysis/values-base.yaml             | 1 -
 applications/rapid-analysis/values-summit.yaml           | 1 -
 applications/rapid-analysis/values-tucson-teststand.yaml | 1 -
 applications/rapid-analysis/values.yaml                  | 2 --
 6 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/applications/rapid-analysis/README.md b/applications/rapid-analysis/README.md
index b7e4aceda9..4a5d9ec5be 100644
--- a/applications/rapid-analysis/README.md
+++ b/applications/rapid-analysis/README.md
@@ -42,7 +42,6 @@ A Helm chart for deploying the Rapid Analysis services.
 | resources | object | `{}` | This allows the specification of resources (CPU, memory) requires to run the container. |
 | scripts | object | `{}` | List of script objects to run for the broadcaster. This section MUST have the following attribute specified for each entry. _name_ (The full path for the script) The following attributes are optional _resources_ (A resource object specification) _nodeSelector_ (A node selector object specification) _tolerations_ (A list of tolerations) _affinity_ (An affinity object specification) |
 | securityContext | object | `{}` | This section allows for specification of security context information. If the section is used, at least one of the following attributes must be specified. _uid_ (User id to run application as), _gid_ (Group id of the user that runs the application), _fid_ (File system context user id), |
-| siteTag | string | `""` | A special tag for letting the scripts know where they are running. |
 | squid.affinity | object | `{}` | Affinity rules for the squid pods |
 | squid.embargo | bool | `false` | This specifies wether the squid service needs to reach embargo or not. |
 | squid.enabled | bool | `false` | This specifies whether to use squid or not. |
diff --git a/applications/rapid-analysis/templates/deployment.yaml b/applications/rapid-analysis/templates/deployment.yaml
index 345cdf4f85..4890a1f067 100644
--- a/applications/rapid-analysis/templates/deployment.yaml
+++ b/applications/rapid-analysis/templates/deployment.yaml
@@ -45,7 +45,7 @@ spec:
           imagePullPolicy: {{ $.Values.image.pullPolicy }}
           env:
             - name: RUN_ARG
-              value: {{ $script.name }} {{ $.Values.siteTag }}
+              value: {{ $script.name }} {{ $.Values.location }}
             - name: RAPID_ANALYSIS_LOCATION
               value: {{ $.Values.location | upper | quote }}
           {{- if $script.env }}
diff --git a/applications/rapid-analysis/values-base.yaml b/applications/rapid-analysis/values-base.yaml
index a7032d8ec2..b891c5b083 100644
--- a/applications/rapid-analysis/values-base.yaml
+++ b/applications/rapid-analysis/values-base.yaml
@@ -3,7 +3,6 @@ image:
   tag: w_2025_48
   pullPolicy: Always
 location: BTS
-siteTag: bts
 env:
   DAF_BUTLER_REPOSITORY_INDEX: /project/data-repos.yaml
   DEPLOY_BRANCH: deploy-bts
diff --git a/applications/rapid-analysis/values-summit.yaml b/applications/rapid-analysis/values-summit.yaml
index f469411747..4952f1786e 100644
--- a/applications/rapid-analysis/values-summit.yaml
+++ b/applications/rapid-analysis/values-summit.yaml
@@ -3,7 +3,6 @@ image:
   tag: w_2025_48
   pullPolicy: Always
 location: SUMMIT
-siteTag: summit
 env:
   DAF_BUTLER_REPOSITORY_INDEX: /project/data-repos.yaml
   DEPLOY_BRANCH: deploy-summit
diff --git a/applications/rapid-analysis/values-tucson-teststand.yaml b/applications/rapid-analysis/values-tucson-teststand.yaml
index 3f84217b6f..9bf5034f24 100644
--- a/applications/rapid-analysis/values-tucson-teststand.yaml
+++ b/applications/rapid-analysis/values-tucson-teststand.yaml
@@ -3,7 +3,6 @@ image:
   tag: c0039
   pullPolicy: Always
 location: TTS
-siteTag: tts
 env:
   DAF_BUTLER_REPOSITORY_INDEX: /project/data-repos.yaml
   DEPLOY_BRANCH: deploy-tts
diff --git a/applications/rapid-analysis/values.yaml b/applications/rapid-analysis/values.yaml
index bf5fd70cca..b2042ad0dc 100644
--- a/applications/rapid-analysis/values.yaml
+++ b/applications/rapid-analysis/values.yaml
@@ -7,8 +7,6 @@ image:
   pullPolicy: IfNotPresent
 # -- This is the namespace where the applications will be deployed.
 namespace: rapid-analysis
-# -- A special tag for letting the scripts know where they are running.
-siteTag: ""
 # -- Provide the location where the system is running.
 location: ""
 # -- List of script objects to run for the broadcaster.

From 9b505991bac6dfa395e706af4004d41255256cc8 Mon Sep 17 00:00:00 2001
From: Colin Slater <ctslater@uw.edu>
Date: Fri, 20 Feb 2026 14:07:09 -0800
Subject: [PATCH 15/16] Fix docstring mixup on configMaps/PVCs.

---
 applications/rapid-analysis/README.md   | 4 ++--
 applications/rapid-analysis/values.yaml | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/applications/rapid-analysis/README.md b/applications/rapid-analysis/README.md
index 4a5d9ec5be..70330ab2d2 100644
--- a/applications/rapid-analysis/README.md
+++ b/applications/rapid-analysis/README.md
@@ -8,7 +8,7 @@ A Helm chart for deploying the Rapid Analysis services.
 |-----|------|---------|-------------|
 | affinity | object | `{}` | This specifies the scheduling constraints of the pod. |
 | butlerSecret | object | `{}` | This section allows for specification of Butler secret information. If this section is used, it must contain the following attributes: _key_ (The vault key for the Butler secret), _containerPath_ (The directory location for the Butler secret), _dbUser_ (The username for the Butler backend database) |
-| configMountpoint | list | `[]` | This section holds the information necessary to claim persistent volumes. If the section is used, each object listed can have the following attributes defined: _name_ (The name ot the persistent volume), _containerPath_ (The path inside the container to mount), _subPath_ (persistent volume subpath, optional) |
+| configMountpoint | list | `[]` | This section holds the information necessary to mount configmaps. If the section is used, each object listed can have the following attributes defined: _name_ (The name of the persistent volume and the configMap), _items_ (Files in the configmap to mount), |
 | env | object | `{"AWS_REQUEST_CHECKSUM_CALCULATION":"WHEN_REQUIRED","AWS_RESPONSE_CHECKSUM_VALIDATION":"WHEN_REQUIRED"}` | This section holds a set of key, value pairs for environmental variables (ENV_VAR: value). NOTE: RUN_ARG is taken care of by the chart using _script_. |
 | envSecrets | list | `[]` | This section holds specifications for secret injection. If this section is used, each object listed must have the following attributes defined: _name_ (The label for the secret), _secretName_ (The name of the vault store reference. Uses the _namespace_ attribute to construct the full name), _secretKey_ (The key in the vault store containing the necessary secret) |
 | fullnameOverride | string | `""` | Specify the deployed application name specifically. Overrides all other names. |
@@ -26,7 +26,7 @@ A Helm chart for deploying the Rapid Analysis services.
 | podAnnotations | object | `{}` | This allows the specification of pod annotations. |
 | pullSecretsPath | string | `""` |  |
 | pvcMountpoint | list | `[]` | This section holds information about existing volume claims. If the section is used, each object listed can have the following attributes defined: _name_ (The name ot the persistent volume), _containerPath_ (The path inside the container to mount), _subPath_ (persistent volume subpath, optional) |
-| pvcMountpointClaim | list | `[]` | This section holds the information necessary to claim persistent volumes. If the section is used, each object listed can have the following attributes defined: _name_ (The name of the persistent volume and the configMap), _items_ (Files in the configmap to mount), |
+| pvcMountpointClaim | list | `[]` | This section holds the information necessary to claim persistent volumes. If the section is used, each object listed can have the following attributes defined: _name_ (The name ot the persistent volume), _containerPath_ (The path inside the container to mount), _subPath_ (persistent volume subpath, optional) |
 | redis.affinity | object | `{}` | Affinity rules for the redis pods |
 | redis.enabled | bool | `false` | This specifies whether to use redis or not. |
 | redis.env | object | `{}` | This section holds a set of key, value pairs for environmental variables (ENV_VAR: value). NOTE: RUN_ARG is taken care of by the chart using _script_. |
diff --git a/applications/rapid-analysis/values.yaml b/applications/rapid-analysis/values.yaml
index b2042ad0dc..0e4183dece 100644
--- a/applications/rapid-analysis/values.yaml
+++ b/applications/rapid-analysis/values.yaml
@@ -63,12 +63,12 @@ pvcMountpoint: []
 # _name_ (The name ot the persistent volume),
 # _containerPath_ (The path inside the container to mount),
 # _subPath_ (persistent volume subpath, optional)
-configMountpoint: []
-# -- This section holds the information necessary to claim persistent volumes.
+pvcMountpointClaim: []
+# -- This section holds the information necessary to mount configmaps.
 # If the section is used, each object listed can have the following attributes defined:
 # _name_ (The name of the persistent volume and the configMap),
 # _items_ (Files in the configmap to mount),
-pvcMountpointClaim: []
+configMountpoint: []
 # -- Adds an extra string to the release name.
 nameOverride: ""
 # -- Specify the deployed application name specifically. Overrides all other names.

From 39f1eb8ef4584713a8fe11322f492d93f4c884e6 Mon Sep 17 00:00:00 2001
From: Colin Slater <ctslater@uw.edu>
Date: Wed, 1 Apr 2026 09:57:11 -0700
Subject: [PATCH 16/16] Rename github.com/lsst-sitcom to lsst-so.

---
 applications/rapid-analysis/README.md                       | 2 +-
 applications/rapid-analysis/values-base.yaml                | 2 +-
 applications/rapid-analysis/values-summit.yaml              | 2 +-
 applications/rapid-analysis/values-usdf-rapid-analysis.yaml | 2 +-
 applications/rapid-analysis/values.yaml                     | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/applications/rapid-analysis/README.md b/applications/rapid-analysis/README.md
index 70330ab2d2..be8aaaf2d2 100644
--- a/applications/rapid-analysis/README.md
+++ b/applications/rapid-analysis/README.md
@@ -15,7 +15,7 @@ A Helm chart for deploying the Rapid Analysis services.
 | gather2aSet | object | `{}` | This configures a StatefulSet used for visit-level gather processing. |
 | gatherRollupSet | object | `{}` | This configures a StatefulSet used for night-summary rollup. |
 | image.pullPolicy | string | `"IfNotPresent"` | The policy to apply when pulling an image for deployment. |
-| image.repository | string | `"ghcr.io/lsst-sitcom/rubintv_production"` | The Docker registry name for the container image. |
+| image.repository | string | `"ghcr.io/lsst-so/rubintv_production"` | The Docker registry name for the container image. |
 | image.tag | string | `"develop"` | The tag of the container image to use. |
 | imagePullSecrets | list | `[]` | The list of pull secrets needed for the images. If this section is used, each object listed can have the following attributes defined: _name_ (The label identifying the pull-secret to use) |
 | location | string | `""` | Provide the location where the system is running. |
diff --git a/applications/rapid-analysis/values-base.yaml b/applications/rapid-analysis/values-base.yaml
index b891c5b083..1d1c429eeb 100644
--- a/applications/rapid-analysis/values-base.yaml
+++ b/applications/rapid-analysis/values-base.yaml
@@ -1,5 +1,5 @@
 image:
-  repository: ghcr.io/lsst-sitcom/rubintv_production
+  repository: ghcr.io/lsst-so/rubintv_production
   tag: w_2025_48
   pullPolicy: Always
 location: BTS
diff --git a/applications/rapid-analysis/values-summit.yaml b/applications/rapid-analysis/values-summit.yaml
index 4952f1786e..84c61ecdbf 100644
--- a/applications/rapid-analysis/values-summit.yaml
+++ b/applications/rapid-analysis/values-summit.yaml
@@ -1,5 +1,5 @@
 image:
-  repository: ghcr.io/lsst-sitcom/rubintv_production
+  repository: ghcr.io/lsst-so/rubintv_production
   tag: w_2025_48
   pullPolicy: Always
 location: SUMMIT
diff --git a/applications/rapid-analysis/values-usdf-rapid-analysis.yaml b/applications/rapid-analysis/values-usdf-rapid-analysis.yaml
index 1faee41b24..da86d8e77f 100644
--- a/applications/rapid-analysis/values-usdf-rapid-analysis.yaml
+++ b/applications/rapid-analysis/values-usdf-rapid-analysis.yaml
@@ -1,5 +1,5 @@
 image:
-  repository: ghcr.io/lsst-sitcom/rubintv_production
+  repository: ghcr.io/lsst-so/rubintv_production
   tag: tickets-DM-50534-w48
   pullPolicy: IfNotPresent
 location: USDF
diff --git a/applications/rapid-analysis/values.yaml b/applications/rapid-analysis/values.yaml
index 0e4183dece..24fb90b651 100644
--- a/applications/rapid-analysis/values.yaml
+++ b/applications/rapid-analysis/values.yaml
@@ -1,6 +1,6 @@
 image:
   # -- The Docker registry name for the container image.
-  repository: ghcr.io/lsst-sitcom/rubintv_production
+  repository: ghcr.io/lsst-so/rubintv_production
   # -- The tag of the container image to use.
   tag: develop
   # -- The policy to apply when pulling an image for deployment.