Skip to content

Commit a7c8686

Browse files
ctslaterctslater
authored
Merge pull request #4497 from lsst-sqre/tickets/DM-50020
DM-50020: USDF Rapid Analysis updates for LSSTCam
2 parents 92522e2 + 39f1eb8 commit a7c8686

18 files changed

+390
-16
lines changed

‎applications/argocd/values-usdf-rapid-analysis.yaml‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,9 @@ argo-cd:
2727
g, ppascual@slac.stanford.edu, role:admin
2828
g, pav@slac.stanford.edu, role:admin
2929
g, reinking@slac.stanford.edu, role:admin
30+
g, fritzm@slac.stanford.edu, role:admin
3031
g, cslater@slac.stanford.edu, role:admin
32+
g, yusra@slac.stanford.edu, role:admin
3133
g, mfl@slac.stanford.edu, role:admin
3234
scopes: "[email]"
3335

‎applications/rapid-analysis/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,13 +8,14 @@ A Helm chart for deploying the Rapid Analysis services.
88
|-----|------|---------|-------------|
99
| affinity | object | `{}` | This specifies the scheduling constraints of the pod. |
1010
| 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) |
11+
| 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), |
1112
| 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_. |
1213
| 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) |
1314
| fullnameOverride | string | `""` | Specify the deployed application name specifically. Overrides all other names. |
1415
| gather2aSet | object | `{}` | This configures a StatefulSet used for visit-level gather processing. |
1516
| gatherRollupSet | object | `{}` | This configures a StatefulSet used for night-summary rollup. |
1617
| image.pullPolicy | string | `"IfNotPresent"` | The policy to apply when pulling an image for deployment. |
17-
| image.repository | string | `"ghcr.io/lsst-sitcom/rubintv_production"` | The Docker registry name for the container image. |
18+
| image.repository | string | `"ghcr.io/lsst-so/rubintv_production"` | The Docker registry name for the container image. |
1819
| image.tag | string | `"develop"` | The tag of the container image to use. |
1920
| 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) |
2021
| location | string | `""` | Provide the location where the system is running. |
@@ -41,7 +42,6 @@ A Helm chart for deploying the Rapid Analysis services.
4142
| resources | object | `{}` | This allows the specification of resources (CPU, memory) requires to run the container. |
4243
| 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) |
4344
| 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), |
44-
| siteTag | string | `""` | A special tag for letting the scripts know where they are running. |
4545
| squid.affinity | object | `{}` | Affinity rules for the squid pods |
4646
| squid.embargo | bool | `false` | This specifies wether the squid service needs to reach embargo or not. |
4747
| squid.enabled | bool | `false` | This specifies whether to use squid or not. |

‎applications/rapid-analysis/templates/configmap-repos.yaml‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
apiVersion: v1
2+
kind: ConfigMap
3+
metadata:
4+
name: "config-repos"
5+
labels:
6+
{{- include "rapid-analysis.labels" . | nindent 4 }}
7+
data:
8+
data-repos.yaml: |
9+
embargo: "s3://embargo@rubin-summit-users/butler.yaml"

‎applications/rapid-analysis/templates/deployment.yaml‎

Lines changed: 20 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ spec:
4545
imagePullPolicy: {{ $.Values.image.pullPolicy }}
4646
env:
4747
- name: RUN_ARG
48-
value: {{ $script.name }} {{ $.Values.siteTag }}
48+
value: {{ $script.name }} {{ $.Values.location }}
4949
- name: RAPID_ANALYSIS_LOCATION
5050
value: {{ $.Values.location | upper | quote }}
5151
{{- if $script.env }}
@@ -114,6 +114,15 @@ spec:
114114
{{- end }}
115115
{{- end }}
116116
{{- end }}
117+
{{- if $.Values.configMountpoint }}
118+
{{- range $values := $.Values.configMountpoint }}
119+
{{- if (has $values.name $script.mounts) }}
120+
- name: {{ $values.name }}
121+
mountPath: {{ $values.path }}
122+
readOnly: true
123+
{{- end }}
124+
{{- end }}
125+
{{- end }}
117126
{{- if $.Values.pvcMountpointClaim }}
118127
{{- range $values := $.Values.pvcMountpointClaim }}
119128
{{- if (has $values.name $script.mounts) }}
@@ -158,6 +167,16 @@ spec:
158167
{{- end }}
159168
{{- end }}
160169
{{- end }}
170+
{{- if $.Values.configMountpoint }}
171+
{{- range $values := $.Values.configMountpoint }}
172+
{{- if (has $values.name $script.mounts) }}
173+
- name: {{ $values.name }}
174+
configMap:
175+
name: {{ $values.name }}
176+
items: {{ toYaml $values.items | nindent 12 }}
177+
{{- end }}
178+
{{- end }}
179+
{{- end }}
161180
{{- if $.Values.pvcMountpointClaim }}
162181
{{- range $values := $.Values.pvcMountpointClaim }}
163182
{{- if (has $values.name $script.mounts) }}

‎applications/rapid-analysis/templates/lsstcam-backlog-worker-set.yaml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,15 @@ spec:
118118
{{- end }}
119119
{{- end }}
120120
{{- end }}
121+
{{- if $.Values.configMountpoint }}
122+
{{- range $values := $.Values.configMountpoint }}
123+
{{- if (has $values.name $script.mounts) }}
124+
- name: {{ $values.name }}
125+
mountPath: {{ $values.path }}
126+
readOnly: true
127+
{{- end }}
128+
{{- end }}
129+
{{- end }}
121130
{{- if $.Values.pvcMountpointClaim }}
122131
{{- range $values := $.Values.pvcMountpointClaim }}
123132
{{- if (has $values.name $script.mounts) }}
@@ -162,6 +171,16 @@ spec:
162171
{{- end }}
163172
{{- end }}
164173
{{- end }}
174+
{{- if $.Values.configMountpoint }}
175+
{{- range $values := $.Values.configMountpoint }}
176+
{{- if (has $values.name $script.mounts) }}
177+
- name: {{ $values.name }}
178+
configMap:
179+
name: {{ $values.name }}
180+
items: {{ toYaml $values.items | nindent 12 }}
181+
{{- end }}
182+
{{- end }}
183+
{{- end }}
165184
{{- if $.Values.pvcMountpointClaim }}
166185
{{- range $values := $.Values.pvcMountpointClaim }}
167186
{{- if (has $values.name $script.mounts) }}

‎applications/rapid-analysis/templates/lsstcam-gather-rollup-set.yaml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,15 @@ spec:
118118
{{- end }}
119119
{{- end }}
120120
{{- end }}
121+
{{- if $.Values.configMountpoint }}
122+
{{- range $values := $.Values.configMountpoint }}
123+
{{- if (has $values.name $script.mounts) }}
124+
- name: {{ $values.name }}
125+
mountPath: {{ $values.path }}
126+
readOnly: true
127+
{{- end }}
128+
{{- end }}
129+
{{- end }}
121130
{{- if $.Values.pvcMountpointClaim }}
122131
{{- range $values := $.Values.pvcMountpointClaim }}
123132
{{- if (has $values.name $script.mounts) }}
@@ -162,6 +171,16 @@ spec:
162171
{{- end }}
163172
{{- end }}
164173
{{- end }}
174+
{{- if $.Values.configMountpoint }}
175+
{{- range $values := $.Values.configMountpoint }}
176+
{{- if (has $values.name $script.mounts) }}
177+
- name: {{ $values.name }}
178+
configMap:
179+
name: {{ $values.name }}
180+
items: {{ toYaml $values.items | nindent 12 }}
181+
{{- end }}
182+
{{- end }}
183+
{{- end }}
165184
{{- if $.Values.pvcMountpointClaim }}
166185
{{- range $values := $.Values.pvcMountpointClaim }}
167186
{{- if (has $values.name $script.mounts) }}

‎applications/rapid-analysis/templates/lsstcam-gather1b-set.yaml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,15 @@ spec:
118118
{{- end }}
119119
{{- end }}
120120
{{- end }}
121+
{{- if $.Values.configMountpoint }}
122+
{{- range $values := $.Values.configMountpoint }}
123+
{{- if (has $values.name $script.mounts) }}
124+
- name: {{ $values.name }}
125+
mountPath: {{ $values.path }}
126+
readOnly: true
127+
{{- end }}
128+
{{- end }}
129+
{{- end }}
121130
{{- if $.Values.pvcMountpointClaim }}
122131
{{- range $values := $.Values.pvcMountpointClaim }}
123132
{{- if (has $values.name $script.mounts) }}
@@ -162,6 +171,16 @@ spec:
162171
{{- end }}
163172
{{- end }}
164173
{{- end }}
174+
{{- if $.Values.configMountpoint }}
175+
{{- range $values := $.Values.configMountpoint }}
176+
{{- if (has $values.name $script.mounts) }}
177+
- name: {{ $values.name }}
178+
configMap:
179+
name: {{ $values.name }}
180+
items: {{ toYaml $values.items | nindent 12 }}
181+
{{- end }}
182+
{{- end }}
183+
{{- end }}
165184
{{- if $.Values.pvcMountpointClaim }}
166185
{{- range $values := $.Values.pvcMountpointClaim }}
167186
{{- if (has $values.name $script.mounts) }}

‎applications/rapid-analysis/templates/lsstcam-gather1bAos-set.yaml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -119,6 +119,15 @@ spec:
119119
{{- end }}
120120
{{- end }}
121121
{{- end }}
122+
{{- if $.Values.configMountpoint }}
123+
{{- range $values := $.Values.configMountpoint }}
124+
{{- if (has $values.name $script.mounts) }}
125+
- name: {{ $values.name }}
126+
mountPath: {{ $values.path }}
127+
readOnly: true
128+
{{- end }}
129+
{{- end }}
130+
{{- end }}
122131
{{- if $.Values.pvcMountpointClaim }}
123132
{{- range $values := $.Values.pvcMountpointClaim }}
124133
{{- if (has $values.name $script.mounts) }}
@@ -163,6 +172,16 @@ spec:
163172
{{- end }}
164173
{{- end }}
165174
{{- end }}
175+
{{- if $.Values.configMountpoint }}
176+
{{- range $values := $.Values.configMountpoint }}
177+
{{- if (has $values.name $script.mounts) }}
178+
- name: {{ $values.name }}
179+
configMap:
180+
name: {{ $values.name }}
181+
items: {{ toYaml $values.items | nindent 12 }}
182+
{{- end }}
183+
{{- end }}
184+
{{- end }}
166185
{{- if $.Values.pvcMountpointClaim }}
167186
{{- range $values := $.Values.pvcMountpointClaim }}
168187
{{- if (has $values.name $script.mounts) }}

‎applications/rapid-analysis/templates/lsstcam-worker-set.yaml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,15 @@ spec:
118118
{{- end }}
119119
{{- end }}
120120
{{- end }}
121+
{{- if $.Values.configMountpoint }}
122+
{{- range $values := $.Values.configMountpoint }}
123+
{{- if (has $values.name $script.mounts) }}
124+
- name: {{ $values.name }}
125+
mountPath: {{ $values.path }}
126+
readOnly: true
127+
{{- end }}
128+
{{- end }}
129+
{{- end }}
121130
{{- if $.Values.pvcMountpointClaim }}
122131
{{- range $values := $.Values.pvcMountpointClaim }}
123132
{{- if (has $values.name $script.mounts) }}
@@ -162,6 +171,16 @@ spec:
162171
{{- end }}
163172
{{- end }}
164173
{{- end }}
174+
{{- if $.Values.configMountpoint }}
175+
{{- range $values := $.Values.configMountpoint }}
176+
{{- if (has $values.name $script.mounts) }}
177+
- name: {{ $values.name }}
178+
configMap:
179+
name: {{ $values.name }}
180+
items: {{ toYaml $values.items | nindent 12 }}
181+
{{- end }}
182+
{{- end }}
183+
{{- end }}
165184
{{- if $.Values.pvcMountpointClaim }}
166185
{{- range $values := $.Values.pvcMountpointClaim }}
167186
{{- if (has $values.name $script.mounts) }}

‎applications/rapid-analysis/templates/lsstcam-workerAos-set.yaml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -118,6 +118,15 @@ spec:
118118
{{- end }}
119119
{{- end }}
120120
{{- end }}
121+
{{- if $.Values.configMountpoint }}
122+
{{- range $values := $.Values.configMountpoint }}
123+
{{- if (has $values.name $script.mounts) }}
124+
- name: {{ $values.name }}
125+
mountPath: {{ $values.path }}
126+
readOnly: true
127+
{{- end }}
128+
{{- end }}
129+
{{- end }}
121130
{{- if $.Values.pvcMountpointClaim }}
122131
{{- range $values := $.Values.pvcMountpointClaim }}
123132
{{- if (has $values.name $script.mounts) }}
@@ -162,6 +171,16 @@ spec:
162171
{{- end }}
163172
{{- end }}
164173
{{- end }}
174+
{{- if $.Values.configMountpoint }}
175+
{{- range $values := $.Values.configMountpoint }}
176+
{{- if (has $values.name $script.mounts) }}
177+
- name: {{ $values.name }}
178+
configMap:
179+
name: {{ $values.name }}
180+
items: {{ toYaml $values.items | nindent 12 }}
181+
{{- end }}
182+
{{- end }}
183+
{{- end }}
165184
{{- if $.Values.pvcMountpointClaim }}
166185
{{- range $values := $.Values.pvcMountpointClaim }}
167186
{{- if (has $values.name $script.mounts) }}

0 commit comments

Comments
 (0)