Skip to content

Commit

Permalink
Merge pull request #290 from lsst-ts/calibration_lab_support
Browse files Browse the repository at this point in the history
Calibration lab support
  • Loading branch information
mareuter authored Jun 28, 2024
2 parents 0901bc3 + 36933c0 commit 1a6bd7d
Show file tree
Hide file tree
Showing 65 changed files with 164 additions and 147 deletions.
2 changes: 1 addition & 1 deletion apps/ataos/values-tucson-teststand.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
namespace: auxtel
image:
repository: ts-dockerhub.lsst.org/ataos
tag: c0032
tag: c0035
pullPolicy: Always
nexus3: nexus3-docker
env:
Expand Down
2 changes: 1 addition & 1 deletion apps/atdome/values-tucson-teststand.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
namespace: auxtel
image:
repository: ts-dockerhub.lsst.org/atdome
tag: c0032
tag: c0035
pullPolicy: Always
nexus3: nexus3-docker
env:
Expand Down
2 changes: 1 addition & 1 deletion apps/atdometrajectory/values-tucson-teststand.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
namespace: auxtel
image:
repository: ts-dockerhub.lsst.org/atdometrajectory
tag: c0032
tag: c0035
pullPolicy: Always
nexus3: nexus3-docker
env:
Expand Down
2 changes: 1 addition & 1 deletion apps/atheaderservice/values-tucson-teststand.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
namespace: auxtel
image:
repository: ts-dockerhub.lsst.org/headerservice
tag: c0032
tag: c0035
pullPolicy: Always
nexus3: nexus3-docker
env:
Expand Down
2 changes: 1 addition & 1 deletion apps/athexapod/values-tucson-teststand.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
namespace: auxtel
image:
repository: ts-dockerhub.lsst.org/athexapod
tag: c0032
tag: c0035
pullPolicy: Always
nexus3: nexus3-docker
env:
Expand Down
2 changes: 1 addition & 1 deletion apps/atmcs/values-tucson-teststand.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
namespace: auxtel
image:
repository: ts-dockerhub.lsst.org/atmcs_sim
tag: c0032
tag: c0035
pullPolicy: Always
nexus3: nexus3-docker
env:
Expand Down
2 changes: 1 addition & 1 deletion apps/atocps/values-tucson-teststand.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
namespace: uws
image:
repository: ts-dockerhub.lsst.org/dmocps
tag: c0032
tag: c0035
pullPolicy: Always
nexus3: nexus3-docker
env:
Expand Down
2 changes: 1 addition & 1 deletion apps/atoods/values-tucson-teststand.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
namespace: auxtel
image:
repository: ts-dockerhub.lsst.org/atoods
tag: c0032
tag: c0035
pullPolicy: Always
nexus3: nexus3-docker
env:
Expand Down
2 changes: 1 addition & 1 deletion apps/atpneumatics/values-tucson-teststand.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
namespace: auxtel
image:
repository: ts-dockerhub.lsst.org/at_pneumatics_sim
tag: c0032
tag: c0035
pullPolicy: Always
nexus3: nexus3-docker
env:
Expand Down
2 changes: 1 addition & 1 deletion apps/atptg/values-tucson-teststand.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
namespace: auxtel
image:
repository: ts-dockerhub.lsst.org/ptkernel
tag: c0032
tag: c0035
pullPolicy: Always
nexus3: nexus3-docker
env:
Expand Down
2 changes: 1 addition & 1 deletion apps/atqueue/values-tucson-teststand.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
namespace: obssys
image:
repository: ts-dockerhub.lsst.org/scriptqueue
tag: c0032
tag: c0035
pullPolicy: Always
nexus3: nexus3-docker
env:
Expand Down
2 changes: 1 addition & 1 deletion apps/atscheduler/values-tucson-teststand.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
namespace: obssys
image:
repository: ts-dockerhub.lsst.org/scheduler
tag: c0032
tag: c0035
pullPolicy: Always
nexus3: nexus3-docker
env:
Expand Down
2 changes: 1 addition & 1 deletion apps/atspectrograph/values-tucson-teststand.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
namespace: auxtel
image:
repository: ts-dockerhub.lsst.org/atspec
tag: c0032
tag: c0035
pullPolicy: Always
nexus3: nexus3-docker
env:
Expand Down
2 changes: 1 addition & 1 deletion apps/atwhitelight/values-tucson-teststand.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
namespace: calsys
image:
repository: ts-dockerhub.lsst.org/atwhitelight
tag: c0032
tag: c0035
pullPolicy: Always
nexus3: nexus3-docker
env:
Expand Down
2 changes: 1 addition & 1 deletion apps/authorize/values-tucson-teststand.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
namespace: obssys
image:
repository: ts-dockerhub.lsst.org/authorize
tag: c0032
tag: c0035
pullPolicy: Always
nexus3: nexus3-docker
env:
Expand Down
4 changes: 4 additions & 0 deletions apps/calsys-lab/Chart.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
apiVersion: v2
description: Parent application to bootstrap Calibration Sytems CSC deployment
name: calsys-lab
version: 0.3.0
16 changes: 16 additions & 0 deletions apps/calsys-lab/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
# calsys-lab

Parent application to bootstrap Calibration Sytems CSC deployment

## Values

| Key | Type | Default | Description |
|-----|------|---------|-------------|
| cscs | list | `[]` | The list of applications (CSCs) to deploy via the collector app |
| env | string | `nil` | The environment (location) to set for the configuration. This picks the Helm values file to use in the deployment. |
| isSim | list | `[]` | The list of applications that are run as simulators |
| namespace | string | `nil` | The namespace for the child applications |
| renameMap | object | `{}` | A dictionary of _app name_: _new name_ used to set the application name to _new name_ |
| spec.destination.server | string | `"https://kubernetes.default.svc"` | The URL for the Kubernetes server |
| spec.source.repoURL | string | `"https://github.com/lsst-ts/argocd-csc"` | The repository URL that contains the configuration |
| spec.source.targetRevision | string | `"HEAD"` | The target revision (repository branch) to use for the configuration |
1 change: 1 addition & 0 deletions apps/calsys-lab/templates
9 changes: 9 additions & 0 deletions apps/calsys-lab/values-tucson-teststand.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
env: tucson-teststand
spec:
source:
targetRevision: calibration_lab_support
namespace: calsys-lab
cscs:
- linearstage1
- linearstage2
- linearstage3
1 change: 1 addition & 0 deletions apps/calsys-lab/values.yaml
2 changes: 1 addition & 1 deletion apps/ccheaderservice/values-tucson-teststand.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
namespace: maintel
image:
repository: ts-dockerhub.lsst.org/headerservice
tag: c0032
tag: c0035
pullPolicy: Always
nexus3: nexus3-docker
env:
Expand Down
2 changes: 1 addition & 1 deletion apps/ccocps/values-tucson-teststand.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
namespace: uws
image:
repository: ts-dockerhub.lsst.org/dmocps
tag: c0032
tag: c0035
pullPolicy: Always
nexus3: nexus3-docker
env:
Expand Down
2 changes: 1 addition & 1 deletion apps/ccoods/values-tucson-teststand.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
namespace: maintel
image:
repository: ts-dockerhub.lsst.org/ccoods
tag: c0032
tag: c0035
pullPolicy: Always
nexus3: nexus3-docker
env:
Expand Down
30 changes: 5 additions & 25 deletions apps/cluster-config/values-tucson-teststand.yaml
Original file line number Diff line number Diff line change
@@ -1,35 +1,15 @@
vaultPathPrefix: secret/k8s_operator/tucson-teststand.lsst.codes
vaultPathPrefix: secret/phalanx/tucson-teststand
namespaces:
- ospl-daemon
- kafka-producers
- calsys-lab
secrets:
- name: nexus3-docker
key: pull-secret
type: kubernetes.io/dockerconfigjson
namespaces:
- namespaces
- uws
- name: lfa
key: ts/software/lfa
namespaces:
- auxtel
- calsys
- love
- maintel
- obssys
- dds-test
- name: ts-salkafka
key: ts/software/ts-salkafka
namespaces:
- kafka-producers
- name: butler-secret
key: butler-secret
namespaces:
- auxtel
- maintel
- obssys
- name: love
key: ts/software/love
namespaces:
- obssys
- name: meteoblue
key: ts/software/meteoblue
namespaces:
- eas
2 changes: 1 addition & 1 deletion apps/dimm/values-tucson-teststand.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
namespace: eas
image:
repository: ts-dockerhub.lsst.org/dimm
tag: c0032
tag: c0035
pullPolicy: Always
nexus3: nexus3-docker
env:
Expand Down
2 changes: 1 addition & 1 deletion apps/dsm/values-tucson-teststand.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
namespace: eas
image:
repository: ts-dockerhub.lsst.org/dsm
tag: c0032
tag: c0035
pullPolicy: Always
nexus3: nexus3-docker
env:
Expand Down
2 changes: 1 addition & 1 deletion apps/ess/values-tucson-teststand.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
namespace: eas
image:
repository: ts-dockerhub.lsst.org/ess
tag: c0032
tag: c0035
pullPolicy: Always
nexus3: nexus3-docker
env:
Expand Down
2 changes: 1 addition & 1 deletion apps/gcheaderservice/values-tucson-teststand.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
image:
repository: ts-dockerhub.lsst.org/headerservice
tag: c0032
tag: c0035
pullPolicy: Always
nexus3: nexus3-docker
env:
Expand Down
2 changes: 1 addition & 1 deletion apps/genericcamera/values-tucson-teststand.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
image:
repository: ts-dockerhub.lsst.org/genericcamera
tag: c0032
tag: c0035
pullPolicy: Always
nexus3: nexus3-docker
env:
Expand Down
2 changes: 1 addition & 1 deletion apps/integrationtests/values-tucson-teststand.yaml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
namespace: dds-test
image:
repository: ts-dockerhub.lsst.org/integrationtests
tag: c0032
tag: c0035
pullPolicy: Always
nexus3: nexus3-docker
env:
Expand Down
70 changes: 2 additions & 68 deletions apps/kafka-producers/values-tucson-teststand.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
image:
repository: ts-dockerhub.lsst.org/salkafka
tag: c0032
tag: c0037
pullPolicy: Always
nexus3: nexus3-docker
env:
Expand All @@ -18,80 +18,14 @@ env:
shmemDir: /run/ospl
osplVersion: V6.10.4
producers:
auxtel:
cscs: >-
ATAOS
ATDome
ATDomeTrajectory
ATHexapod
ATPneumatics
ATPtg
ATMCS
maintel:
cscs: >-
MTAOS
MTDome
MTDomeTrajectory
MTPtg
mtmount:
cscs: >-
MTMount
comcam:
cscs: >-
CCCamera
CCHeaderService
CCOODS
latiss:
cscs: >-
ATCamera
ATHeaderService
ATOODS
ATSpectrograph
m1m3:
cscs: >-
--file m1m3.yaml
vms:
cscs: >-
MTVMS
m2:
cscs: >-
MTHexapod
MTM2
MTRotator
obssys:
cscs: >-
Scheduler
Script
ScriptQueue
Watcher
ocps:
cscs: >-
OCPS
test:
cscs: >-
Test
pmd:
cscs: >-
PMD
calsys:
cscs: >-
ATMonochromator
ATWhiteLight
CBP
Electrometer
FiberSpectrograph
LEDProjector
LinearStage
TunableLaser
mtaircompressor:
cscs: MTAirCompressor
eas:
cscs: DIMM DSM ESS WeatherForecast
authorize:
cscs: Authorize
lasertracker:
cscs: LaserTracker
genericcamera:
cscs: GCHeaderService GenericCamera
existingSecret: kafka-producers-ts-salkafka
startupProbe:
use: true
Expand Down
2 changes: 1 addition & 1 deletion apps/lasertracker/values-tucson-teststand.yaml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
image:
repository: ts-dockerhub.lsst.org/lasertracker
tag: c0032
tag: c0035
pullPolicy: Always
nexus3: nexus3-docker
env:
Expand Down
4 changes: 4 additions & 0 deletions apps/linearstage/Chart.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
name: linearstage
apiVersion: v2
version: 0.12.1
description: A Helm chart for deploying the LinearStage CSC.
Loading

0 comments on commit 1a6bd7d

Please sign in to comment.