Skip to content

Commit

Permalink
Merge pull request #4119 from lsst-sqre/tickets/DM-48257
Browse files Browse the repository at this point in the history
Tickets/dm 48257
  • Loading branch information
aibsen authored Jan 22, 2025
2 parents c334140 + 3fedc9f commit b839405
Show file tree
Hide file tree
Showing 38 changed files with 3,188 additions and 14 deletions.
5 changes: 5 additions & 0 deletions applications/auxtel/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -89,3 +89,8 @@ dependencies:
version: 1.0.0
condition: atspectrograph-sim.enabled
repository: file://../../charts/csc
- name: csc
alias: pmd1
version: 1.0.0
condition: pmd1.enabled
repository: file://../../charts/csc
1 change: 1 addition & 0 deletions applications/auxtel/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,7 @@ Deployment for the Auxiliary Telescope CSCs
| atspectrograph-sim.enabled | bool | `false` | Enable the ATSpectograph simulator CSC |
| atspectrograph.enabled | bool | `false` | Enable the ATSpectrograph CSC |
| hexapod-sim.enabled | bool | `false` | Enable the hexapod controller simulator |
| pmd1.enabled | bool | `false` | Enable the PMD1 CSC |
| hexapod-sim.affinity | object | `{}` | This specifies the scheduling constraints of the pod |
| hexapod-sim.image | object | `{"pullPolicy":"Always","repository":"ts-dockerhub.lsst.org/hexapod_simulator","tag":"latest"}` | This section holds the configuration of the container image |
| hexapod-sim.image.pullPolicy | string | `"Always"` | The policy to apply when pulling an image for deployment |
Expand Down
251 changes: 251 additions & 0 deletions applications/auxtel/values-summit.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,251 @@
ataos:
image:
repository: ts-dockerhub.lsst.org/ataos
pullPolicy: Always
resources:
limits:
cpu: 450m
memory: 600Mi
requests:
cpu: 45m
memory: 200Mi

atbuilding:
enabled: true
image:
repository: ts-dockerhub.lsst.org/atbuilding
pullPolicy: Always
resources:
limits:
cpu: 120m
memory: 300Mi
requests:
cpu: 12m
memory: 100Mi

atdome:
enabled: true
image:
repository: ts-dockerhub.lsst.org/atdome
pullPolicy: Always
resources:
limits:
cpu: 170m
memory: 300Mi
requests:
cpu: 17m
memory: 100Mi

atdometrajectory:
image:
repository: ts-dockerhub.lsst.org/atdometrajectory
pullPolicy: Always
resources:
limits:
cpu: 350m
memory: 300Mi
requests:
cpu: 35m
memory: 100Mi

atheaderservice:
image:
repository: ts-dockerhub.lsst.org/headerservice
pullPolicy: Always
env:
URL_SPEC: --lfa_mode s3 --s3instance cp
CAMERA: at
envSecrets:
- name: AWS_ACCESS_KEY_ID
key: aws-access-key-id
- name: AWS_SECRET_ACCESS_KEY
key: aws-secret-access-key
- name: MYS3_ACCESS_KEY
key: aws-access-key-id
- name: MYS3_SECRET_KEY
key: aws-secret-access-key
resources:
limits:
cpu: 800m
memory: 700Mi
requests:
cpu: 80m
memory: 250Mi

athexapod:
enabled: true
image:
repository: ts-dockerhub.lsst.org/athexapod
pullPolicy: Always
resources:
limits:
cpu: 90m
memory: 300Mi
requests:
cpu: 9m
memory: 95Mi

atmcs:
enabled: true
image:
repository: ts-dockerhub.lsst.org/atmcs_sim
pullPolicy: Always
resources:
limits:
cpu: 600m
memory: 1200Mi
requests:
cpu: 60m
memory: 400Mi

atoods:
image:
repository: ts-dockerhub.lsst.org/atoods
pullPolicy: Always
env:
CTRL_OODS_CONFIG_FILE: /etc/atoods.yaml
butlerSecret:
containerPath: &bs-cp /home/saluser/.lsst
dbUser: oods
secretFilename: &bs-fn postgres-credentials.txt
secretFixup:
containerPath: *bs-cp
filenames:
- *bs-fn
nfsMountpoint:
- name: auxtel-gen3-butler
containerPath: /repo/LATISS
readOnly: false
server: nfs-auxtel.cp.lsst.org
serverPath: /auxtel/repo/LATISS
- name: auxtel-oods-data
containerPath: /data
readOnly: false
server: nfs-auxtel.cp.lsst.org
serverPath: /auxtel
resources:
limits:
cpu: 1000m
memory: 1000Mi
requests:
cpu: 100m
memory: 325Mi
configfile:
path: /etc
filename: atoods.yaml
content: |
defaultInterval: &interval
days: 0
hours: 0
minutes: 0
seconds: 0
ingesterClass:
ingesterType: lsst.ctrl.oods.fileIngester
ingesterName: FileIngester
ingester:
imageStagingDirectory: /data/staging/auxtel/oods
butlers:
- butler:
instrument: lsst.obs.lsst.Latiss
class:
import: lsst.ctrl.oods.fileAttendant
name: FileAttendant
stagingDirectory: /data/lsstdata/base/auxtel/oods/gen3butler/raw
badFileDirectory: /data/lsstdata/base/auxtel/oods/gen3butler/badfiles
repoDirectory: /repo/LATISS
collections:
- LATISS/raw/all
cleanCollections:
- collection: LATISS/raw/all
filesOlderThan:
<<: *interval
days: 30
- collenction: LATISS/runs/quickLook
filesOlderThan:
<<: *interval
days: 7
scanInterval:
<<: *interval
hours: 1
batchSize: 20
scanInterval:
<<: *interval
seconds: 2
cacheCleaner:
# ONLY clean out empty directories here, never files
clearEmptyDirectories:
- /data/lsstdata/base/auxtel/oods/gen3butler/raw
- /data/repo/LATISS/LATISS/runs/quickLook
# clean out empty directories and old files from these directories
clearEmptyDirectoriesAndOldFiles:
- /data/lsstdata/base/auxtel/oods/gen3butler/badfiles
- /data/staging/auxtel/oods
- /data/staging/auxtel/forwarder
scanInterval:
<<: *interval
hours: 1
filesOlderThan:
<<: *interval
days: 30
directoriesEmptyForMoreThan:
<<: *interval
days: 2
atpneumatics:
enabled: true
image:
repository: ts-dockerhub.lsst.org/at_pneumatics_sim
pullPolicy: Always
resources:
limits:
cpu: 120m
memory: 300Mi
requests:
cpu: 12m
memory: 90Mi

atptg:
image:
repository: ts-dockerhub.lsst.org/ptkernel
pullPolicy: Always
env:
TELESCOPE: AT
LSST_KAFKA_TLM_FLUSH_MS: 0
LSST_KAFKA_CMDEVT_FLUSH_MS: 0
resources:
limits:
cpu: 900m
requests:
cpu: 90m
memory: 265Mi

atspectrograph:
enabled: true
image:
repository: ts-dockerhub.lsst.org/atspec
pullPolicy: Always
resources:
limits:
cpu: 120m
memory: 300Mi
requests:
cpu: 12m
memory: 95Mi

pmd1:
enabled: true
image:
repository: ts-dockerhub.lsst.org/pmd
pullPolicy: Always
env:
RUN_ARG: 1
resources:
limits:
cpu: 100m
memory: 300Mi
requests:
cpu: 10m
memory: 95Mi
4 changes: 4 additions & 0 deletions applications/auxtel/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,10 @@ atspectrograph-sim:
# -- Enable the ATSpectograph simulator CSC
enabled: false

pmd1:
# -- Enable the PMD1 CSC
enabled: false

# The following will be set by parameters injected by Argo CD and should not
# be set in the individual environment values files.
global:
Expand Down
10 changes: 10 additions & 0 deletions applications/calsys/Chart.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,16 @@ dependencies:
- name: csc_shared
version: 1.0.0
repository: file://../../charts/csc_shared
- name: csc
alias: atmonochromator
version: 1.0.0
condition: atmonochromator.enabled
repository: file://../../charts/csc
- name: csc
alias: atwhitelight
version: 1.0.0
condition: atwhitelight.enabled
repository: file://../../charts/csc
- name: csc
alias: cbp
version: 1.0.0
Expand Down
11 changes: 11 additions & 0 deletions applications/calsys/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,14 @@ Deployment for the Calibration System CSCs

| Key | Type | Default | Description |
|-----|------|---------|-------------|
| atmonochromator.enabled | bool | `false` | Enabled the ATMonochromator CSC |
| atwhitelight.enabled | bool | `false` | Enabled the ATWhitelight CSC |
| cbp.enabled | bool | `false` | Enable the CBP:0 CSC |
| electrometer101-sim.enabled | bool | `false` | Enable the Electrometer:11 simulator CSC |
| electrometer101.enabled | bool | `false` | Enable the Electrometer:101 CSC |
| electrometer102-sim.enabled | bool | `false` | Enable the Electrometer:102 simulator CSC |
| electrometer102.enabled | bool | `false` | Enable the Electrometer:102 CSC |
| electrometer201-sim.enabled | bool | `false` | Enable the Electrometer:201 simulator CSC |
| electrometer201.enabled | bool | `false` | Enable the Electrometer:201 CSC |
| gcheaderservice1.enabled | bool | `false` | Enable the GCHeaderService:1 CSC |
| global.baseUrl | string | Set by Argo CD | Base URL for the environment |
Expand All @@ -22,10 +27,16 @@ Deployment for the Calibration System CSCs
| global.controlSystem.topicName | string | Set by ArgoCD | Topic name tag for the control system deployment |
| global.host | string | Set by Argo CD | Host name for ingress |
| global.vaultSecretsPath | string | Set by Argo CD | Base path for Vault secrets |
| ledprojector-sim.enabled | bool | `false` | Enabled the LedProjector:0 simulator CSC |
| ledprojector.enabled | bool | `false` | Enabled the LedProjector:0 CSC |
| linearstage101-sim.enabled | bool | `false` | Enable the LinearStage:101 simulator CSC |
| linearstage101.enabled | bool | `false` | Enable the LinearStage:101 CSC |
| linearstage102-sim.enabled | bool | `false` | Enable the LinearStage:102 simulator CSC |
| linearstage102.enabled | bool | `false` | Enable the LinearStage:102 CSC |
| linearstage103-sim.enabled | bool | `false` | Enable the LinearStage:103 simulator CSC |
| linearstage103.enabled | bool | `false` | Enable the LinearStage:103 CSC |
| linearstage104-sim.enabled | bool | `false` | Enable the LinearStage:104 simulator CSC |
| linearstage104.enabled | bool | `false` | Enable the LinearStage:104 CSC |
| simulation-gencam.enabled | bool | `false` | Enabled the GenericCamera:1 CSC |
| tunablelaser-sim.enabled | bool | `false` | Enabled the TunableLaser:0 simulator CSC |
| tunablelaser.enabled | bool | `false` | Enabled the TunableLaser:0 CSC |
Loading

0 comments on commit b839405

Please sign in to comment.