Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

DM-46898: Reconfigure RA for ComCam on sky #4071

Open
wants to merge 23 commits into
base: main
Choose a base branch
from
Open

DM-46898: Reconfigure RA for ComCam on sky #4071

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
23 commits
Select commit Hold shift + click to select a range
2261c56
rapid-analysis: Point TTS pods to new script locations
mfisherlevine Oct 16, 2024
f0a269c
rapid-analysis: extend selectorLabels helper to allow use of scripts …
sebastian-aranda Oct 16, 2024
1ea4513
rapid-analysis: Increase replicas for pipeline running to 18
mfisherlevine Oct 16, 2024
e18d010
Try minimal CPU reservation on TTS
mfisherlevine Oct 16, 2024
d2bf809
rapid-analysis: Add old AOS pipelines to TTS
mfisherlevine Oct 17, 2024
f8850b3
rapid-analysis: Update pod scripts for new paths
mfisherlevine Oct 21, 2024
b9fccc7
rapid-analysis: Update nominal replica counts for ComCam
mfisherlevine Oct 21, 2024
78c5dc7
rapid-analysis: Point AOS pipeline to ComCam from ComCamSim
mfisherlevine Oct 22, 2024
739c6e4
rapid-analysis: Slightly increase memory for StarTrackerCatchup
mfisherlevine Oct 24, 2024
339de92
rapid-analysis: Add new pod for one-off processing
mfisherlevine Oct 27, 2024
caa4d04
rapid-analysis: Add pod for calexp post-processing
mfisherlevine Oct 29, 2024
6d00313
rapid-analysis: add new pods for AOS
mfisherlevine Nov 7, 2024
9e00804
rapid-analysis: Fix typo on AWS credentials file comcam and lsstcam sets
sebastian-aranda Nov 7, 2024
99bde07
rapid-analysis: Fix annotations for comcam-gather2aAos-set
sebastian-aranda Nov 7, 2024
58d47ff
Disable ComCamSim for now
mfisherlevine Nov 18, 2024
ace693a
Disable butler watcher for LSSTCam for now
mfisherlevine Nov 18, 2024
58b303e
Increase memory for TMA plotting pod
mfisherlevine Nov 22, 2024
3659e0b
Turn off old AOS pipelines
mfisherlevine Nov 23, 2024
f0fd3b8
Add one-off processor for expRecords
mfisherlevine Nov 29, 2024
fb188d5
Add Soar seeing scraper and uploader
mfisherlevine Dec 3, 2024
6062e79
Remove duplicated resource section for TTS
mfisherlevine Jan 10, 2025
3d4d189
Simplify resource templating for rapid-analysis pods.
sebastian-aranda Jan 15, 2025
37630a6
Remove unnecessary app name prefix on volume names for rapid-analysis…
sebastian-aranda Jan 16, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
32 changes: 30 additions & 2 deletions applications/rapid-analysis/templates/_helpers.tpl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,8 +49,10 @@ Script name
Deployment name
*/}}
{{- define "rapid-analysis.deploymentName" -}}
{{- $name := regexSplit "/" .Values.script.name -1 | last | trimSuffix ".py" | kebabcase }}
{{- $cameraName := regexSplit "/" .Values.script.name -1 | rest | first | lower }}
{{- $values := regexSplit "/" .Values.script.name -1 }}
{{- $name := $values | last | trimSuffix ".py" | kebabcase }}
{{- if eq 2 (len $values) }}
{{- $cameraName := $values | first | lower }}
{{- $camera := "" }}
{{- if eq $cameraName "auxtel" }}
{{- $camera = "at"}}
Expand All @@ -60,6 +62,18 @@ Deployment name
{{- $camera = $cameraName}}
{{- end }}
{{- printf "s-%s-%s" $camera $name }}
{{- else if eq 3 (len $values) }}
{{- $cameraName := $values | rest | first | lower }}
{{- $camera := "" }}
{{- if eq $cameraName "auxtel" }}
{{- $camera = "at"}}
{{- else if eq $cameraName "comcam" }}
{{- $camera = "cc"}}
{{- else }}
{{- $camera = $cameraName}}
{{- end }}
{{- printf "s-%s-%s" $camera $name }}
{{- end }}
{{- end }}


Expand All @@ -72,7 +86,21 @@ app.kubernetes.io/instance: {{ include "rapid-analysis.name" . }}
{{- $values := regexSplit "/" .Values.script.name -1 }}
{{- if eq 1 (len $values) }}
all: misc
{{- else if eq 2 (len $values) }}
{{- $all_label := lower (index $values 0) }}
{{- $script := index $values 1 }}
{{- if contains "Isr" $script }}
isr: {{ $all_label }}
{{- end }}
all: {{ $all_label }}
{{- if has $all_label (list "auxtel" "comcam" "bot" "ts8") }}
camera: {{ $all_label }}
{{- else }}
{{- if contains "StarTracker" $script }}
camera: startracker
{{- end }}
{{- end }}
{{- else if eq 3 (len $values) }}
{{- $all_label := lower (index $values 1) }}
{{- $script := index $values 2 }}
{{- if contains "Isr" $script }}
Expand Down
42 changes: 11 additions & 31 deletions applications/rapid-analysis/templates/comcam-gather-rollup-set.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,22 +127,17 @@ spec:
{{- end }}
{{- end }}
{{- if $.Values.butlerSecret }}
- name: {{ $.Release.Name }}-butler-secret
- name: butler-secret
mountPath: {{ $.Values.butlerSecret.containerPath }}
{{- end }}
{{- if or $.Values.resources $script.resources }}
{{- $resources := "" }}
{{- if $script.resources }}
{{- $resources = $script.resources }}
{{- else }}
{{- $resources = $.Values.resources }}
{{- end }}
{{- $resources := $script.resources | default $.Values.resources }}
resources:
{{- toYaml $resources | nindent 12 }}
{{- end }}
{{- if $.Values.butlerSecret }}
initContainers:
- name: {{ $.Release.Name }}-butler-secret-perm-fixer
- name: butler-secret-perm-fixer
image: "alpine:latest"
command:
- "/bin/ash"
Expand All @@ -151,16 +146,16 @@ spec:
cp -RL /secrets-raw/* /secrets
cat /secrets/aws-credentials.ini > new-aws-credentials.ini
printf "\n" >> new-aws-credentials.ini
cat /secrets-rubintv/aws-credentials.ini >> new-aws-credentials.ini
cat /secrets-rubintv/aws_credentials.ini >> new-aws-credentials.ini
printf "\n" >> new-aws-credentials.ini
mv new-aws-credentials.ini /secrets/aws-credentials.ini
chown 73006:73006 /secrets/*
chmod 0600 /secrets/*
volumeMounts:
- name: {{ $.Release.Name }}-raw-butler-secret
- name: raw-butler-secret
mountPath: /secrets-raw
readOnly: true
- name: {{ $.Release.Name }}-butler-secret
- name: butler-secret
mountPath: /secrets
- name: rubintv-aws-creds
mountPath: /secrets-rubintv
Expand Down Expand Up @@ -203,40 +198,25 @@ spec:
{{- end }}
{{- end }}
{{- if $.Values.butlerSecret }}
- name: {{ $.Release.Name }}-butler-secret
- name: butler-secret
emptyDir: {}
- name: {{ $.Release.Name }}-raw-butler-secret
- name: raw-butler-secret
secret:
secretName: butler-secret
defaultMode: 0600
{{- end }}
{{- if or $.Values.nodeSelector $script.nodeSelector }}
{{- $nodeSelector := "" }}
{{- if $script.nodeSelector }}
{{- $nodeSelector = $script.nodeSelector }}
{{- else }}
{{- $nodeSelector = $.Values.nodeSelector }}
{{- end }}
{{- $nodeSelector := $script.nodeSelector | default $.Values.nodeSelector }}
nodeSelector:
{{- toYaml $nodeSelector | nindent 8 }}
{{- end }}
{{- if or $.Values.affinity $script.affinity }}
{{- $affinity := "" }}
{{- if $script.affinity }}
{{- $affinity = $script.affinity }}
{{- else }}
{{- $affinity = $.Values.affinity }}
{{- end }}
{{- $affinity := $script.affinity | default $.Values.affinity }}
affinity:
{{- toYaml $affinity | nindent 8 }}
{{- end }}
{{- if or $.Values.tolerations $script.tolerations }}
{{- $tolerations := "" }}
{{- if $script.tolerations }}
{{- $tolerations = $script.tolerations }}
{{- else }}
{{- $tolerations = $.Values.tolerations }}
{{- end }}
{{- $tolerations := $script.tolerations | default $.Values.tolerations }}
tolerations:
{{- toYaml $tolerations | nindent 8 }}
{{- end }}
Expand Down
42 changes: 11 additions & 31 deletions applications/rapid-analysis/templates/comcam-gather2a-set.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,22 +127,17 @@ spec:
{{- end }}
{{- end }}
{{- if $.Values.butlerSecret }}
- name: {{ $.Release.Name }}-butler-secret
- name: butler-secret
mountPath: {{ $.Values.butlerSecret.containerPath }}
{{- end }}
{{- if or $.Values.resources $script.resources }}
{{- $resources := "" }}
{{- if $script.resources }}
{{- $resources = $script.resources }}
{{- else }}
{{- $resources = $.Values.resources }}
{{- end }}
{{- $resources := $script.resources | default $.Values.resources }}
resources:
{{- toYaml $resources | nindent 12 }}
{{- end }}
{{- if $.Values.butlerSecret }}
initContainers:
- name: {{ $.Release.Name }}-butler-secret-perm-fixer
- name: butler-secret-perm-fixer
image: "alpine:latest"
command:
- "/bin/ash"
Expand All @@ -151,16 +146,16 @@ spec:
cp -RL /secrets-raw/* /secrets
cat /secrets/aws-credentials.ini > new-aws-credentials.ini
printf "\n" >> new-aws-credentials.ini
cat /secrets-rubintv/aws-credentials.ini >> new-aws-credentials.ini
cat /secrets-rubintv/aws_credentials.ini >> new-aws-credentials.ini
printf "\n" >> new-aws-credentials.ini
mv new-aws-credentials.ini /secrets/aws-credentials.ini
chown 73006:73006 /secrets/*
chmod 0600 /secrets/*
volumeMounts:
- name: {{ $.Release.Name }}-raw-butler-secret
- name: raw-butler-secret
mountPath: /secrets-raw
readOnly: true
- name: {{ $.Release.Name }}-butler-secret
- name: butler-secret
mountPath: /secrets
- name: rubintv-aws-creds
mountPath: /secrets-rubintv
Expand Down Expand Up @@ -203,40 +198,25 @@ spec:
{{- end }}
{{- end }}
{{- if $.Values.butlerSecret }}
- name: {{ $.Release.Name }}-butler-secret
- name: butler-secret
emptyDir: {}
- name: {{ $.Release.Name }}-raw-butler-secret
- name: raw-butler-secret
secret:
secretName: butler-secret
defaultMode: 0600
{{- end }}
{{- if or $.Values.nodeSelector $script.nodeSelector }}
{{- $nodeSelector := "" }}
{{- if $script.nodeSelector }}
{{- $nodeSelector = $script.nodeSelector }}
{{- else }}
{{- $nodeSelector = $.Values.nodeSelector }}
{{- end }}
{{- $nodeSelector := $script.nodeSelector | default $.Values.nodeSelector }}
nodeSelector:
{{- toYaml $nodeSelector | nindent 8 }}
{{- end }}
{{- if or $.Values.affinity $script.affinity }}
{{- $affinity := "" }}
{{- if $script.affinity }}
{{- $affinity = $script.affinity }}
{{- else }}
{{- $affinity = $.Values.affinity }}
{{- end }}
{{- $affinity := $script.affinity | default $.Values.affinity }}
affinity:
{{- toYaml $affinity | nindent 8 }}
{{- end }}
{{- if or $.Values.tolerations $script.tolerations }}
{{- $tolerations := "" }}
{{- if $script.tolerations }}
{{- $tolerations = $script.tolerations }}
{{- else }}
{{- $tolerations = $.Values.tolerations }}
{{- end }}
{{- $tolerations := $script.tolerations | default $.Values.tolerations }}
tolerations:
{{- toYaml $tolerations | nindent 8 }}
{{- end }}
Expand Down
Loading
Loading