diff --git a/applications/auxtel/README.md b/applications/auxtel/README.md index ee0124b77..c63b02218 100644 --- a/applications/auxtel/README.md +++ b/applications/auxtel/README.md @@ -17,6 +17,7 @@ Deployment for the Auxiliary Telescope 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 | +| atbuilding.enabled | bool | `false` | Enable the ATBuilding CSC | | atdome-sim.enabled | bool | `false` | Enable the ATDome simulator CSC | | atdome.enabled | bool | `false` | Enable the ATDome CSC | | athexapod-sim.enabled | bool | `false` | Enable the ATHexapod simulator CSC | diff --git a/applications/auxtel/values.yaml b/applications/auxtel/values.yaml index 04d33fcfa..84e414538 100644 --- a/applications/auxtel/values.yaml +++ b/applications/auxtel/values.yaml @@ -2,6 +2,10 @@ hexapod-sim: # -- Enable the hexapod controller simulator enabled: false +atbuilding: + # -- Enable the ATBuilding CSC + enabled: false + atdome: # -- Enable the ATDome CSC enabled: false diff --git a/applications/calsys/Chart.yaml b/applications/calsys/Chart.yaml index 1d0cb5b62..c5a01fd80 100644 --- a/applications/calsys/Chart.yaml +++ b/applications/calsys/Chart.yaml @@ -6,13 +6,113 @@ dependencies: - name: csc_shared version: 1.0.0 repository: file://../../charts/csc_shared +- name: csc + alias: cbp + version: 1.0.0 + condition: cbp.enabled + repository: file://../../charts/csc +- name: csc + alias: cbp-sim + version: 1.0.0 + condition: cbp-sim.enabled + repository: file://../../charts/csc +- name: csc + alias: electrometer101 + version: 1.0.0 + condition: electrometer101.enabled + repository: file://../../charts/csc +- name: csc + alias: electrometer101-sim + version: 1.0.0 + condition: electrometer101-sim.enabled + repository: file://../../charts/csc +- name: csc + alias: electrometer102 + version: 1.0.0 + condition: electrometer102.enabled + repository: file://../../charts/csc +- name: csc + alias: electrometer102-sim + version: 1.0.0 + condition: electrometer102-sim.enabled + repository: file://../../charts/csc +- name: csc + alias: electrometer201 + version: 1.0.0 + condition: electrometer201.enabled + repository: file://../../charts/csc +- name: csc + alias: electrometer201-sim + version: 1.0.0 + condition: electrometer201-sim.enabled + repository: file://../../charts/csc - name: csc alias: gcheaderservice1 version: 1.0.0 condition: gcheaderservice1.enabled repository: file://../../charts/csc +- name: csc + alias: ledprojector + version: 1.0.0 + condition: ledprojector.enabled + repository: file://../../charts/csc +- name: csc + alias: ledprojector-sim + version: 1.0.0 + condition: ledprojector-sim.enabled + repository: file://../../charts/csc +- name: csc + alias: linearstage101 + version: 1.0.0 + condition: linearstage101.enabled + repository: file://../../charts/csc +- name: csc + alias: linearstage101-sim + version: 1.0.0 + condition: linearstage101-sim.enabled + repository: file://../../charts/csc +- name: csc + alias: linearstage102 + version: 1.0.0 + condition: linearstage102.enabled + repository: file://../../charts/csc +- name: csc + alias: linearstage102-sim + version: 1.0.0 + condition: linearstage102-sim.enabled + repository: file://../../charts/csc +- name: csc + alias: linearstage103 + version: 1.0.0 + condition: linearstage103.enabled + repository: file://../../charts/csc +- name: csc + alias: linearstage103-sim + version: 1.0.0 + condition: linearstage103-sim.enabled + repository: file://../../charts/csc +- name: csc + alias: linearstage104 + version: 1.0.0 + condition: linearstage104.enabled + repository: file://../../charts/csc +- name: csc + alias: linearstage104-sim + version: 1.0.0 + condition: linearstage104-sim.enabled + repository: file://../../charts/csc - name: csc alias: simulation-gencam version: 1.0.0 condition: simulation-gencam.enabled repository: file://../../charts/csc +- name: csc + alias: tunablelaser + version: 1.0.0 + condition: tunablelaser.enabled + repository: file://../../charts/csc +- name: csc + alias: tunablelaser-sim + version: 1.0.0 + condition: tunablelaser-sim.enabled + repository: file://../../charts/csc diff --git a/applications/calsys/README.md b/applications/calsys/README.md index 845d3eb5d..07c7dfc67 100644 --- a/applications/calsys/README.md +++ b/applications/calsys/README.md @@ -6,6 +6,10 @@ Deployment for the Calibration System CSCs | Key | Type | Default | Description | |-----|------|---------|-------------| +| cbp.enabled | bool | `false` | Enable the CBP:0 CSC | +| electrometer101.enabled | bool | `false` | Enable the Electrometer:101 CSC | +| electrometer102.enabled | bool | `false` | Enable the Electrometer:102 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 | | global.controlSystem.appNamespace | string | Set by ArgoCD | Application namespace for the control system deployment | @@ -18,4 +22,10 @@ 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.enabled | bool | `false` | Enabled the LedProjector:0 CSC | +| linearstage101.enabled | bool | `false` | Enable the LinearStage:101 CSC | +| linearstage102.enabled | bool | `false` | Enable the LinearStage:102 CSC | +| linearstage103.enabled | bool | `false` | Enable the LinearStage:103 CSC | +| linearstage104.enabled | bool | `false` | Enable the LinearStage:104 CSC | | simulation-gencam.enabled | bool | `false` | Enabled the GenericCamera:1 CSC | +| tunablelaser.enabled | bool | `false` | Enabled the TunableLaser:0 CSC | diff --git a/applications/calsys/values-base.yaml b/applications/calsys/values-base.yaml index 63f765076..9cf2857bd 100644 --- a/applications/calsys/values-base.yaml +++ b/applications/calsys/values-base.yaml @@ -1,3 +1,62 @@ +cbp-sim: + enabled: true + image: + repository: ts-dockerhub.lsst.org/cbp + pullPolicy: Always + env: + RUN_ARG: --simulate + +electrometer101-sim: + enabled: true + image: + repository: ts-dockerhub.lsst.org/electrometer + pullPolicy: Always + env: + RUN_ARG: 101 --simulate + 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 + +electrometer102-sim: + enabled: true + image: + repository: ts-dockerhub.lsst.org/electrometer + pullPolicy: Always + env: + RUN_ARG: 102 --simulate + 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 + +electrometer201-sim: + enabled: true + image: + repository: ts-dockerhub.lsst.org/electrometer + pullPolicy: Always + env: + RUN_ARG: 201 --simulate + 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 + gcheaderservice1: enabled: true image: @@ -24,6 +83,46 @@ gcheaderservice1: cpu: 14m memory: 130Mi +ledprojector-sim: + enabled: true + image: + repository: ts-dockerhub.lsst.org/ledprojector + pullPolicy: Always + env: + RUN_ARG: --simulate + +linearstage101-sim: + enabled: true + image: + repository: ts-dockerhub.lsst.org/linearstage + pullPolicy: Always + env: + RUN_ARG: 101 --simulate + +linearstage102-sim: + enabled: true + image: + repository: ts-dockerhub.lsst.org/linearstage + pullPolicy: Always + env: + RUN_ARG: 102 --simulate + +linearstage103-sim: + enabled: true + image: + repository: ts-dockerhub.lsst.org/linearstage + pullPolicy: Always + env: + RUN_ARG: 103 --simulate + +linearstage104-sim: + enabled: true + image: + repository: ts-dockerhub.lsst.org/linearstage + pullPolicy: Always + env: + RUN_ARG: 104 --simulate + simulation-gencam: enabled: true classifier: genericcamera1 @@ -52,3 +151,11 @@ simulation-gencam: requests: cpu: 12m memory: 120Mi + +tunablelaser-sim: + enabled: true + image: + repository: ts-dockerhub.lsst.org/tunablelaser + pullPolicy: Always + env: + RUN_ARG: --simulate diff --git a/applications/calsys/values.yaml b/applications/calsys/values.yaml index 9342d2ad5..1ac27eea4 100644 --- a/applications/calsys/values.yaml +++ b/applications/calsys/values.yaml @@ -1,11 +1,51 @@ +cbp: + # -- Enable the CBP:0 CSC + enabled: false + +electrometer101: + # -- Enable the Electrometer:101 CSC + enabled: false + +electrometer102: + # -- Enable the Electrometer:102 CSC + enabled: false + +electrometer201: + # -- Enable the Electrometer:201 CSC + enabled: false + gcheaderservice1: # -- Enable the GCHeaderService:1 CSC enabled: false +ledprojector: + # -- Enabled the LedProjector:0 CSC + enabled: false + +linearstage101: + # -- Enable the LinearStage:101 CSC + enabled: false + +linearstage102: + # -- Enable the LinearStage:102 CSC + enabled: false + +linearstage103: + # -- Enable the LinearStage:103 CSC + enabled: false + +linearstage104: + # -- Enable the LinearStage:104 CSC + enabled: false + simulation-gencam: # -- Enabled the GenericCamera:1 CSC enabled: false +tunablelaser: + # -- Enabled the TunableLaser:0 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: diff --git a/applications/love/values-base.yaml b/applications/love/values-base.yaml index 193b926f4..2a96fc86e 100644 --- a/applications/love/values-base.yaml +++ b/applications/love/values-base.yaml @@ -255,6 +255,7 @@ love-manager: pullPolicy: IfNotPresent config: | timeout 60 + save "" viewBackup: enabled: true image: @@ -379,6 +380,9 @@ love-producer: - name: ataos csc: ATAOS:0 --log-level 10 WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription + - name: atbuilding + csc: ATBuilding:0 --log-level 10 + WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription - name: atcamera csc: ATCamera:0 --log-level 10 WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription @@ -439,6 +443,12 @@ love-producer: - name: camerahexapod csc: MTHexapod:1 --log-level 10 WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription + - name: cbp + csc: CBP:0 --log-level 10 + WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription + - name: dream + csc: DREAM:0 --log-level 10 + WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription - name: cleanroomess109 csc: ESS:109 --log-level 10 WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription @@ -454,6 +464,15 @@ love-producer: - name: dsm2 csc: DSM:2 --log-level 10 WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription + - name: electrometer101 + csc: Electrometer:101 --log-level 10 + WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription + - name: electrometer102 + csc: Electrometer:102 --log-level 10 + WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription + - name: electrometer201 + csc: Electrometer:201 --log-level 10 + WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription - name: epm1 csc: EPM:1 --log-level 10 WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription @@ -466,6 +485,21 @@ love-producer: - name: lasertracker1 csc: LaserTracker:1 --log-level 10 WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription + - name: ledprojector + csc: LEDProjector:0 --log-level 10 + WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription + - name: linearstage101 + csc: LinearStage:101 --log-level 10 + WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription + - name: linearstage102 + csc: LinearStage:102 --log-level 10 + WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription + - name: linearstage103 + csc: LinearStage:103 --log-level 10 + WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription + - name: linearstage104 + csc: LinearStage:104 --log-level 10 + WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription - name: love csc: LOVE:0 --log-level 10 WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription @@ -557,6 +591,9 @@ love-producer: - name: tmaess110 csc: ESS:110 --log-level 10 WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription + - name: tunablelaser + csc: TunableLaser:0 --log-level 10 + WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription - name: watcher csc: Watcher:0 --log-level 10 WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription