diff --git a/applications/auxtel/README.md b/applications/auxtel/README.md index 776d27f8ae..ee0124b771 100644 --- a/applications/auxtel/README.md +++ b/applications/auxtel/README.md @@ -28,8 +28,12 @@ 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 | +| 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 | | hexapod-sim.image.repository | string | `"ts-dockerhub.lsst.org/hexapod_simulator"` | The Docker registry name of the container image | | hexapod-sim.image.tag | string | `"latest"` | The tag of the container image | | hexapod-sim.namespace | string | `"auxtel"` | This is the namespace in which the hexapod controller simulator will be placed | +| hexapod-sim.nodeSelector | object | `{}` | This allows the specification of using specific nodes to run the pod | +| hexapod-sim.resources | object | `{}` | This allows the specification of resources (CPU, memory) requires to run the container | +| hexapod-sim.tolerations | list | `[]` | This specifies the tolerations of the pod for any system taints | diff --git a/applications/auxtel/charts/hexapod-sim/README.md b/applications/auxtel/charts/hexapod-sim/README.md index b5a01ae11b..07accd9bd1 100644 --- a/applications/auxtel/charts/hexapod-sim/README.md +++ b/applications/auxtel/charts/hexapod-sim/README.md @@ -6,8 +6,12 @@ Chart for the hexapod simulator that supports the ATHexapod | Key | Type | Default | Description | |-----|------|---------|-------------| +| affinity | object | `{}` | This specifies the scheduling constraints of the pod | | image | object | `{"pullPolicy":"Always","repository":"ts-dockerhub.lsst.org/hexapod_simulator","tag":"latest"}` | This section holds the configuration of the container image | | image.pullPolicy | string | `"Always"` | The policy to apply when pulling an image for deployment | | image.repository | string | `"ts-dockerhub.lsst.org/hexapod_simulator"` | The Docker registry name of the container image | | image.tag | string | `"latest"` | The tag of the container image | | namespace | string | `"auxtel"` | This is the namespace in which the hexapod controller simulator will be placed | +| nodeSelector | object | `{}` | This allows the specification of using specific nodes to run the pod | +| resources | object | `{}` | This allows the specification of resources (CPU, memory) requires to run the container | +| tolerations | list | `[]` | This specifies the tolerations of the pod for any system taints | diff --git a/applications/auxtel/charts/hexapod-sim/templates/deployment.yaml b/applications/auxtel/charts/hexapod-sim/templates/deployment.yaml index 5b874eed64..b03ba53a04 100644 --- a/applications/auxtel/charts/hexapod-sim/templates/deployment.yaml +++ b/applications/auxtel/charts/hexapod-sim/templates/deployment.yaml @@ -23,5 +23,21 @@ spec: imagePullPolicy: {{ .Values.image.pullPolicy }} stdin: true tty: true + {{- with .Values.resources }} + resources: + {{- toYaml . | nindent 12 }} + {{- end }} imagePullSecrets: - name: pull-secret + {{- with .Values.nodeSelector }} + nodeSelector: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.affinity }} + affinity: + {{- toYaml . | nindent 8 }} + {{- end }} + {{- with .Values.tolerations }} + tolerations: + {{- toYaml . | nindent 8 }} + {{- end }} diff --git a/applications/auxtel/charts/hexapod-sim/values.yaml b/applications/auxtel/charts/hexapod-sim/values.yaml index e3daccc617..70ed9d97e1 100644 --- a/applications/auxtel/charts/hexapod-sim/values.yaml +++ b/applications/auxtel/charts/hexapod-sim/values.yaml @@ -8,3 +8,11 @@ image: tag: latest # -- The policy to apply when pulling an image for deployment pullPolicy: Always +# -- This allows the specification of resources (CPU, memory) requires to run the container +resources: {} +# -- This allows the specification of using specific nodes to run the pod +nodeSelector: {} +# -- This specifies the tolerations of the pod for any system taints +tolerations: [] +# -- This specifies the scheduling constraints of the pod +affinity: {} diff --git a/applications/auxtel/values-base.yaml b/applications/auxtel/values-base.yaml index c7350107ab..de3ccbcd9d 100644 --- a/applications/auxtel/values-base.yaml +++ b/applications/auxtel/values-base.yaml @@ -45,6 +45,8 @@ atmcs-sim: image: repository: ts-dockerhub.lsst.org/atmcs_sim pullPolicy: Always + env: + RUN_ARG: --simulate atoods: image: @@ -126,6 +128,8 @@ atpneumatics-sim: image: repository: ts-dockerhub.lsst.org/at_pneumatics_sim pullPolicy: Always + env: + RUN_ARG: --simulate atptg: image: @@ -144,3 +148,10 @@ atspectrograph-sim: hexapod-sim: enabled: true + resources: + limits: + cpu: 100m + memory: 500Mi + requests: + cpu: 20m + memory: 200Mi diff --git a/applications/auxtel/values-tucson-teststand.yaml b/applications/auxtel/values-tucson-teststand.yaml index da292e8617..2f11bee094 100644 --- a/applications/auxtel/values-tucson-teststand.yaml +++ b/applications/auxtel/values-tucson-teststand.yaml @@ -45,6 +45,8 @@ atmcs-sim: image: repository: ts-dockerhub.lsst.org/atmcs_sim pullPolicy: Always + env: + RUN_ARG: --simulate atoods: image: @@ -126,6 +128,8 @@ atpneumatics-sim: image: repository: ts-dockerhub.lsst.org/at_pneumatics_sim pullPolicy: Always + env: + RUN_ARG: --simulate atptg: image: diff --git a/applications/eas/Chart.yaml b/applications/eas/Chart.yaml index 8b77c6ca92..cb8006fe6b 100644 --- a/applications/eas/Chart.yaml +++ b/applications/eas/Chart.yaml @@ -47,24 +47,34 @@ dependencies: condition: auxtel-ess204-sim.enabled repository: file://../../charts/csc - name: csc - alias: auxtel-ess205 + alias: calibhill-ess301 version: 1.0.0 - condition: auxtel-ess205.enabled + condition: calibhill-ess301.enabled repository: file://../../charts/csc - name: csc - alias: auxtel-ess205-sim + alias: calibhill-ess301-sim version: 1.0.0 - condition: auxtel-ess205-sim.enabled + condition: calibhill-ess301-sim.enabled repository: file://../../charts/csc - name: csc - alias: calibhill-ess301 + alias: camera-ess111 version: 1.0.0 - condition: calibhill-ess301.enabled + condition: camera-ess111.enabled repository: file://../../charts/csc - name: csc - alias: calibhill-ess301-sim + alias: camera-ess111-sim version: 1.0.0 - condition: calibhill-ess301-sim.enabled + condition: camera-ess111-sim.enabled + repository: file://../../charts/csc +- name: csc + alias: cleanroom-ess109 + version: 1.0.0 + condition: cleanroom-ess109.enabled + repository: file://../../charts/csc +- name: csc + alias: cleanroom-ess109-sim + version: 1.0.0 + condition: cleanroom-ess109-sim.enabled repository: file://../../charts/csc - name: csc alias: dimm1 @@ -117,44 +127,34 @@ dependencies: condition: epm1-sim.enabled repository: file://../../charts/csc - name: csc - alias: m2-ess106 - version: 1.0.0 - condition: m2-ess106.enabled - repository: file://../../charts/csc -- name: csc - alias: m2-ess106-sim + alias: m1m3-ess113 version: 1.0.0 - condition: m2-ess106-sim.enabled + condition: m1m3-ess113.enabled repository: file://../../charts/csc - name: csc - alias: mtdome-ess101 + alias: m1m3-ess113-sim version: 1.0.0 - condition: mtdome-ess101.enabled + condition: m1m3-ess113-sim.enabled repository: file://../../charts/csc - name: csc - alias: mtdome-ess101-sim - version: 1.0.0 - condition: mtdome-ess101-sim.enabled - repository: file://../../charts/csc -- name: csc - alias: mtdome-ess102 + alias: m2-ess106 version: 1.0.0 - condition: mtdome-ess102.enabled + condition: m2-ess106.enabled repository: file://../../charts/csc - name: csc - alias: mtdome-ess102-sim + alias: m2-ess106-sim version: 1.0.0 - condition: mtdome-ess102-sim.enabled + condition: m2-ess106-sim.enabled repository: file://../../charts/csc - name: csc - alias: mtdome-ess103 + alias: m2-ess112 version: 1.0.0 - condition: mtdome-ess103.enabled + condition: m2-ess112.enabled repository: file://../../charts/csc - name: csc - alias: mtdome-ess103-sim + alias: m2-ess112-sim version: 1.0.0 - condition: mtdome-ess103-sim.enabled + condition: m2-ess112-sim.enabled repository: file://../../charts/csc - name: csc alias: mtdome-ess107 @@ -206,6 +206,16 @@ dependencies: version: 1.0.0 condition: tma-ess105-sim.enabled repository: file://../../charts/csc +- name: csc + alias: tma-ess110 + version: 1.0.0 + condition: tma-ess110.enabled + repository: file://../../charts/csc +- name: csc + alias: tma-ess110-sim + version: 1.0.0 + condition: tma-ess110-sim.enabled + repository: file://../../charts/csc - name: csc alias: weatherforecast version: 1.0.0 diff --git a/applications/eas/README.md b/applications/eas/README.md index e03edc0f9f..0523a891d1 100644 --- a/applications/eas/README.md +++ b/applications/eas/README.md @@ -14,10 +14,12 @@ Deployment for the Environmental Awareness Systems CSCs | auxtel-ess203.enabled | bool | `false` | Enable the ESS:203 CSC | | auxtel-ess204-sim.enabled | bool | `false` | Enable the ESS:204 simulator CSC | | auxtel-ess204.enabled | bool | `false` | Enable the ESS:204 CSC | -| auxtel-ess205-sim.enabled | bool | `false` | Enable the ESS:205 simulator CSC | -| auxtel-ess205.enabled | bool | `false` | Enable the ESS:205 CSC | | calibhill-ess301-sim.enabled | bool | `false` | Enable the ESS:301 simulator CSC | | calibhill-ess301.enabled | bool | `false` | Enable the ESS:301 CSC | +| camera-ess111-sim.enabled | bool | `false` | Enable the ESS:111 simulator CSC | +| camera-ess111.enabled | bool | `false` | Enable the ESS:111 CSC | +| cleanroom-ess109-sim.enabled | bool | `false` | Enable the ESS:109 simulator CSC | +| cleanroom-ess109.enabled | bool | `false` | Enable the ESS:109 CSC | | dimm1-sim.enabled | bool | `false` | Enable the DIMM:1 simulator CSC | | dimm1.enabled | bool | `false` | Enable the DIMM:1 CSC | | dimm2-sim.enabled | bool | `false` | Enable the DIMM:2 simulator CSC | @@ -39,14 +41,12 @@ Deployment for the Environmental Awareness Systems 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 | +| m1m3-ess113-sim.enabled | bool | `false` | Enable the ESS:113 simulator CSC | +| m1m3-ess113.enabled | bool | `false` | Enable the ESS:113 CSC | | m2-ess106-sim.enabled | bool | `false` | Enable the ESS:106 simulator CSC | | m2-ess106.enabled | bool | `false` | Enable the ESS:106 CSC | -| mtdome-ess101-sim.enabled | bool | `false` | Enable the ESS:101 simulator CSC | -| mtdome-ess101.enabled | bool | `false` | Enable the ESS:101 CSC | -| mtdome-ess102-sim.enabled | bool | `false` | Enable the ESS:102 simulator CSC | -| mtdome-ess102.enabled | bool | `false` | Enable the ESS:102 CSC | -| mtdome-ess103-sim.enabled | bool | `false` | Enable the ESS:103 simulator CSC | -| mtdome-ess103.enabled | bool | `false` | Enable the ESS:103 CSC | +| m2-ess112-sim.enabled | bool | `false` | Enable the ESS:112 simulator CSC | +| m2-ess112.enabled | bool | `false` | Enable the ESS:112 CSC | | mtdome-ess107-sim.enabled | bool | `false` | Enable the ESS:107 simulator CSC | | mtdome-ess107.enabled | bool | `false` | Enable the ESS:107 CSC | | mtdome-ess108-sim.enabled | bool | `false` | Enable the ESS:108 simulator CSC | @@ -57,3 +57,5 @@ Deployment for the Environmental Awareness Systems CSCs | tma-ess104.enabled | bool | `false` | Enable the ESS:104 CSC | | tma-ess105-sim.enabled | bool | `false` | Enable the ESS:105 simulator CSC | | tma-ess105.enabled | bool | `false` | Enable the ESS:105 CSC | +| tma-ess110-sim.enabled | bool | `false` | Enable the ESS:110 simulator CSC | +| tma-ess110.enabled | bool | `false` | Enable the ESS:110 CSC | diff --git a/applications/eas/values-base.yaml b/applications/eas/values-base.yaml index 5a3a9c3a69..38497e55c6 100644 --- a/applications/eas/values-base.yaml +++ b/applications/eas/values-base.yaml @@ -62,14 +62,14 @@ auxtel-ess204-sim: cpu: 190m memory: 900Mi -auxtel-ess205-sim: +calibhill-ess301-sim: enabled: true - classifier: ess205 + classifier: ess301 image: repository: ts-dockerhub.lsst.org/ess pullPolicy: Always env: - RUN_ARG: 205 --simulate + RUN_ARG: 301 --simulate resources: requests: cpu: 19m @@ -78,14 +78,14 @@ auxtel-ess205-sim: cpu: 190m memory: 900Mi -calibhill-ess301-sim: +camera-ess111-sim: enabled: true - classifier: ess301 + classifier: ess111 image: repository: ts-dockerhub.lsst.org/ess pullPolicy: Always env: - RUN_ARG: 301 --simulate + RUN_ARG: 111 --simulate resources: requests: cpu: 19m @@ -172,30 +172,14 @@ epm1-sim: cpu: 190m memory: 900Mi -m2-ess106-sim: - enabled: true - classifier: ess106 - image: - repository: ts-dockerhub.lsst.org/ess - pullPolicy: Always - env: - RUN_ARG: 106 --simulate - resources: - requests: - cpu: 19m - memory: 90Mi - limits: - cpu: 190m - memory: 900Mi - -mtdome-ess101-sim: +m1m3-ess113-sim: enabled: true - classifier: ess101 + classifier: ess113 image: repository: ts-dockerhub.lsst.org/ess pullPolicy: Always env: - RUN_ARG: 101 --simulate + RUN_ARG: 113 --simulate resources: requests: cpu: 19m @@ -204,14 +188,14 @@ mtdome-ess101-sim: cpu: 190m memory: 900Mi -mtdome-ess102-sim: +m2-ess106-sim: enabled: true - classifier: ess102 + classifier: ess106 image: repository: ts-dockerhub.lsst.org/ess pullPolicy: Always env: - RUN_ARG: 102 --simulate + RUN_ARG: 106 --simulate resources: requests: cpu: 19m @@ -220,14 +204,14 @@ mtdome-ess102-sim: cpu: 190m memory: 900Mi -mtdome-ess103-sim: +m2-ess112-sim: enabled: true - classifier: ess103 + classifier: ess112 image: repository: ts-dockerhub.lsst.org/ess pullPolicy: Always env: - RUN_ARG: 103 --simulate + RUN_ARG: 112 --simulate resources: requests: cpu: 19m @@ -316,6 +300,22 @@ tma-ess105-sim: cpu: 190m memory: 900Mi +tma-ess110-sim: + enabled: true + classifier: ess110 + image: + repository: ts-dockerhub.lsst.org/ess + pullPolicy: Always + env: + RUN_ARG: 110 --simulate + resources: + requests: + cpu: 19m + memory: 90Mi + limits: + cpu: 190m + memory: 900Mi + weatherforecast: image: repository: ts-dockerhub.lsst.org/weatherforecast diff --git a/applications/eas/values-tucson-teststand.yaml b/applications/eas/values-tucson-teststand.yaml index 5a3a9c3a69..38497e55c6 100644 --- a/applications/eas/values-tucson-teststand.yaml +++ b/applications/eas/values-tucson-teststand.yaml @@ -62,14 +62,14 @@ auxtel-ess204-sim: cpu: 190m memory: 900Mi -auxtel-ess205-sim: +calibhill-ess301-sim: enabled: true - classifier: ess205 + classifier: ess301 image: repository: ts-dockerhub.lsst.org/ess pullPolicy: Always env: - RUN_ARG: 205 --simulate + RUN_ARG: 301 --simulate resources: requests: cpu: 19m @@ -78,14 +78,14 @@ auxtel-ess205-sim: cpu: 190m memory: 900Mi -calibhill-ess301-sim: +camera-ess111-sim: enabled: true - classifier: ess301 + classifier: ess111 image: repository: ts-dockerhub.lsst.org/ess pullPolicy: Always env: - RUN_ARG: 301 --simulate + RUN_ARG: 111 --simulate resources: requests: cpu: 19m @@ -172,30 +172,14 @@ epm1-sim: cpu: 190m memory: 900Mi -m2-ess106-sim: - enabled: true - classifier: ess106 - image: - repository: ts-dockerhub.lsst.org/ess - pullPolicy: Always - env: - RUN_ARG: 106 --simulate - resources: - requests: - cpu: 19m - memory: 90Mi - limits: - cpu: 190m - memory: 900Mi - -mtdome-ess101-sim: +m1m3-ess113-sim: enabled: true - classifier: ess101 + classifier: ess113 image: repository: ts-dockerhub.lsst.org/ess pullPolicy: Always env: - RUN_ARG: 101 --simulate + RUN_ARG: 113 --simulate resources: requests: cpu: 19m @@ -204,14 +188,14 @@ mtdome-ess101-sim: cpu: 190m memory: 900Mi -mtdome-ess102-sim: +m2-ess106-sim: enabled: true - classifier: ess102 + classifier: ess106 image: repository: ts-dockerhub.lsst.org/ess pullPolicy: Always env: - RUN_ARG: 102 --simulate + RUN_ARG: 106 --simulate resources: requests: cpu: 19m @@ -220,14 +204,14 @@ mtdome-ess102-sim: cpu: 190m memory: 900Mi -mtdome-ess103-sim: +m2-ess112-sim: enabled: true - classifier: ess103 + classifier: ess112 image: repository: ts-dockerhub.lsst.org/ess pullPolicy: Always env: - RUN_ARG: 103 --simulate + RUN_ARG: 112 --simulate resources: requests: cpu: 19m @@ -316,6 +300,22 @@ tma-ess105-sim: cpu: 190m memory: 900Mi +tma-ess110-sim: + enabled: true + classifier: ess110 + image: + repository: ts-dockerhub.lsst.org/ess + pullPolicy: Always + env: + RUN_ARG: 110 --simulate + resources: + requests: + cpu: 19m + memory: 90Mi + limits: + cpu: 190m + memory: 900Mi + weatherforecast: image: repository: ts-dockerhub.lsst.org/weatherforecast diff --git a/applications/eas/values.yaml b/applications/eas/values.yaml index f46c764372..a05b191fd9 100644 --- a/applications/eas/values.yaml +++ b/applications/eas/values.yaml @@ -30,14 +30,6 @@ auxtel-ess204-sim: # -- Enable the ESS:204 simulator CSC enabled: false -auxtel-ess205: - # -- Enable the ESS:205 CSC - enabled: false - -auxtel-ess205-sim: - # -- Enable the ESS:205 simulator CSC - enabled: false - calibhill-ess301: # -- Enable the ESS:301 CSC enabled: false @@ -46,6 +38,22 @@ calibhill-ess301-sim: # -- Enable the ESS:301 simulator CSC enabled: false +camera-ess111: + # -- Enable the ESS:111 CSC + enabled: false + +camera-ess111-sim: + # -- Enable the ESS:111 simulator CSC + enabled: false + +cleanroom-ess109: + # -- Enable the ESS:109 CSC + enabled: false + +cleanroom-ess109-sim: + # -- Enable the ESS:109 simulator CSC + enabled: false + dimm1: # -- Enable the DIMM:1 CSC enabled: false @@ -86,36 +94,28 @@ epm1-sim: # -- Enable the EPM:1 simulator CSC enabled: false -m2-ess106: - # -- Enable the ESS:106 CSC - enabled: false - -m2-ess106-sim: - # -- Enable the ESS:106 simulator CSC +m1m3-ess113: + # -- Enable the ESS:113 CSC enabled: false -mtdome-ess101: - # -- Enable the ESS:101 CSC +m1m3-ess113-sim: + # -- Enable the ESS:113 simulator CSC enabled: false -mtdome-ess101-sim: - # -- Enable the ESS:101 simulator CSC - enabled: false - -mtdome-ess102: - # -- Enable the ESS:102 CSC +m2-ess106: + # -- Enable the ESS:106 CSC enabled: false -mtdome-ess102-sim: - # -- Enable the ESS:102 simulator CSC +m2-ess106-sim: + # -- Enable the ESS:106 simulator CSC enabled: false -mtdome-ess103: - # -- Enable the ESS:103 CSC +m2-ess112: + # -- Enable the ESS:112 CSC enabled: false -mtdome-ess103-sim: - # -- Enable the ESS:103 simulator CSC +m2-ess112-sim: + # -- Enable the ESS:112 simulator CSC enabled: false mtdome-ess107: @@ -158,6 +158,14 @@ tma-ess105-sim: # -- Enable the ESS:105 simulator CSC enabled: false +tma-ess110: + # -- Enable the ESS:110 CSC + enabled: false + +tma-ess110-sim: + # -- Enable the ESS:110 simulator 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 5beb740aeb..68afdb0fa0 100644 --- a/applications/love/values-base.yaml +++ b/applications/love/values-base.yaml @@ -430,15 +430,18 @@ love-producer: - name: auxteless204 csc: ESS:204 --log-level 10 WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription - - name: auxteless205 - csc: ESS:205 --log-level 10 - WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription - name: calibhilless301 csc: ESS:301 --log-level 10 WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription + - name: cameraess111 + csc: ESS:111 --log-level 10 + WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription - name: camerahexapod csc: MTHexapod:1 --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 - name: dimm1 csc: DIMM:1 --log-level 10 WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription @@ -466,9 +469,15 @@ love-producer: - name: love csc: LOVE:0 --log-level 10 WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription + - name: m1m3ess113 + csc: ESS:113 --log-level 10 + WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription - name: m2ess106 csc: ESS:106 --log-level 10 WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription + - name: m2ess112 + csc: ESS:112 --log-level 10 + WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription - name: m2hexapod csc: MTHexapod:2 --log-level 10 WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription @@ -484,15 +493,6 @@ love-producer: - name: mtdome csc: MTDome:0 --log-level 10 WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription - - name: mtdomeess101 - csc: ESS:101 --log-level 10 - WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription - - name: mtdomeess102 - csc: ESS:102 --log-level 10 - WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription - - name: mtdomeess103 - csc: ESS:103 --log-level 10 - WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription - name: mtdomeess107 csc: ESS:107 --log-level 10 WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription @@ -507,10 +507,10 @@ love-producer: WEBSOCKET_HOST: love-nginx-service/love/manager/m1m3/ws/subscription resources: requests: - cpu: 10m - memory: 200Mi - limits: cpu: 100m + memory: 220Mi + limits: + cpu: 500m memory: 600Mi - name: mtm2 csc: MTM2:0 --log-level 10 @@ -545,6 +545,9 @@ love-producer: - name: tmaess105 csc: ESS:105 --log-level 10 WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription + - name: tmaess110 + csc: ESS:110 --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 diff --git a/applications/love/values-tucson-teststand.yaml b/applications/love/values-tucson-teststand.yaml index 17839b75b6..6892caa197 100644 --- a/applications/love/values-tucson-teststand.yaml +++ b/applications/love/values-tucson-teststand.yaml @@ -59,19 +59,171 @@ love-manager: initialDelaySeconds: 20 periodSeconds: 10 producers: + - name: general image: repository: ts-dockerhub.lsst.org/love-manager pullPolicy: Always env: + LOVE_SITE: tucson SERVER_URL: tucson-teststand.lsst.codes OLE_API_HOSTNAME: tucson-teststand.lsst.codes AUTH_LDAP_1_SERVER_URI: ldap://ipa1.tu.lsst.org AUTH_LDAP_2_SERVER_URI: ldap://ipa2.tu.lsst.org AUTH_LDAP_3_SERVER_URI: ldap://ipa3.tu.lsst.org + COMMANDER_HOSTNAME: love-commander-service + COMMANDER_PORT: 5000 DB_HOST: postgresdb01.tu.lsst.org + DB_ENGINE: postgresql + DB_NAME: love + DB_PORT: 5432 + DB_USER: love + HEARTBEAT_QUERY_COMMANDER: false + JIRA_API_HOSTNAME: rubinobs.atlassian.net + JIRA_PROJECT_ID: 10063 + REDIS_CONFIG_CAPACITY: 5000 + REDIS_CONFIG_EXPIRY: 5 + REDIS_HOST: love-manager-redis-service + REMOTE_STORAGE: true + URL_SUBPATH: /love + envSecrets: + SECRET_KEY: manager-secret-key + PROCESS_CONNECTION_PASS: process-connection-pass + ADMIN_USER_PASS: admin-user-pass + USER_USER_PASS: user-user-pass + CMD_USER_PASS: cmd-user-pass + AUTHLIST_USER_PASS: authlist-user-pass + AUTH_LDAP_BIND_PASSWORD: auth-ldap-bind-password + DB_PASS: db-pass + REDIS_PASS: redis-pass + replicas: 10 + autoscaling: + enabled: false + minReplicas: 2 + maxReplicas: 25 + targetCPUUtilizationPercentage: 50 + scaleDownPolicy: + policies: + - type: Pods + value: 2 + periodSeconds: 120 + - type: Percent + value: 10 + periodSeconds: 120 + selectPolicy: Min + resources: + requests: + cpu: 150m + memory: 200Mi + limits: + cpu: 1000m + memory: 1500Mi + readinessProbe: + tcpSocket: + port: 8000 + initialDelaySeconds: 20 + periodSeconds: 10 + - name: queue + image: + repository: ts-dockerhub.lsst.org/love-manager + pullPolicy: Always + env: LOVE_SITE: tucson + SERVER_URL: tucson-teststand.lsst.codes + OLE_API_HOSTNAME: tucson-teststand.lsst.codes + AUTH_LDAP_1_SERVER_URI: ldap://ipa1.tu.lsst.org + AUTH_LDAP_2_SERVER_URI: ldap://ipa2.tu.lsst.org + AUTH_LDAP_3_SERVER_URI: ldap://ipa3.tu.lsst.org + COMMANDER_HOSTNAME: love-commander-service + COMMANDER_PORT: 5000 + DB_HOST: postgresdb01.tu.lsst.org + DB_ENGINE: postgresql + DB_NAME: love + DB_PORT: 5432 + DB_USER: love + HEARTBEAT_QUERY_COMMANDER: false + JIRA_API_HOSTNAME: rubinobs.atlassian.net + JIRA_PROJECT_ID: 10063 + REDIS_CONFIG_CAPACITY: 5000 + REDIS_CONFIG_EXPIRY: 5 + REDIS_HOST: love-manager-redis-service + REMOTE_STORAGE: true + URL_SUBPATH: /love + envSecrets: + SECRET_KEY: manager-secret-key + PROCESS_CONNECTION_PASS: process-connection-pass + ADMIN_USER_PASS: admin-user-pass + USER_USER_PASS: user-user-pass + CMD_USER_PASS: cmd-user-pass + AUTHLIST_USER_PASS: authlist-user-pass + AUTH_LDAP_BIND_PASSWORD: auth-ldap-bind-password + DB_PASS: db-pass + REDIS_PASS: redis-pass + replicas: 3 autoscaling: - enabled: true + enabled: false + minReplicas: 2 + maxReplicas: 25 + targetCPUUtilizationPercentage: 50 + scaleDownPolicy: + policies: + - type: Pods + value: 2 + periodSeconds: 120 + - type: Percent + value: 10 + periodSeconds: 120 + selectPolicy: Min + resources: + requests: + cpu: 150m + memory: 200Mi + limits: + cpu: 1000m + memory: 1500Mi + readinessProbe: + tcpSocket: + port: 8000 + initialDelaySeconds: 20 + periodSeconds: 10 + - name: m1m3 + image: + repository: ts-dockerhub.lsst.org/love-manager + pullPolicy: Always + env: + LOVE_SITE: tucson + SERVER_URL: tucson-teststand.lsst.codes + OLE_API_HOSTNAME: tucson-teststand.lsst.codes + AUTH_LDAP_1_SERVER_URI: ldap://ipa1.tu.lsst.org + AUTH_LDAP_2_SERVER_URI: ldap://ipa2.tu.lsst.org + AUTH_LDAP_3_SERVER_URI: ldap://ipa3.tu.lsst.org + COMMANDER_HOSTNAME: love-commander-service + COMMANDER_PORT: 5000 + DB_HOST: postgresdb01.tu.lsst.org + DB_ENGINE: postgresql + DB_NAME: love + DB_PORT: 5432 + DB_USER: love + HEARTBEAT_QUERY_COMMANDER: false + JIRA_API_HOSTNAME: rubinobs.atlassian.net + JIRA_PROJECT_ID: 10063 + REDIS_CONFIG_CAPACITY: 5000 + REDIS_CONFIG_EXPIRY: 5 + REDIS_HOST: love-manager-redis-service + REMOTE_STORAGE: true + URL_SUBPATH: /love + envSecrets: + SECRET_KEY: manager-secret-key + PROCESS_CONNECTION_PASS: process-connection-pass + ADMIN_USER_PASS: admin-user-pass + USER_USER_PASS: user-user-pass + CMD_USER_PASS: cmd-user-pass + AUTHLIST_USER_PASS: authlist-user-pass + AUTH_LDAP_BIND_PASSWORD: auth-ldap-bind-password + DB_PASS: db-pass + REDIS_PASS: redis-pass + replicas: 1 + autoscaling: + enabled: false minReplicas: 2 maxReplicas: 25 targetCPUUtilizationPercentage: 50 @@ -200,8 +352,6 @@ love-producer: image: repository: ts-dockerhub.lsst.org/love-producer pullPolicy: Always - env: - WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription resources: requests: cpu: 10m @@ -212,121 +362,179 @@ love-producer: producers: - name: ataos csc: ATAOS: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 - name: atdome csc: ATDome:0 --log-level 10 + WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription - name: atdometrajectory csc: ATDomeTrajectory:0 --log-level 10 + WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription - name: atheaderservice csc: ATHeaderService:0 --log-level 10 + WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription - name: athexapod csc: ATHexapod:0 --log-level 10 + WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription - name: atmcs csc: ATMCS:0 --log-level 10 + WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription - name: atocps csc: OCPS:1 --log-level 10 + WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription - name: atoods csc: ATOODS:0 --log-level 10 + WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription - name: atpneumatics csc: ATPneumatics:0 --log-level 10 + WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription - name: atptg csc: ATPtg:0 --log-level 10 + WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription - name: atscheduler csc: Scheduler:2 --log-level 10 + WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription - name: atscriptqueue csc: ScriptQueue:2 --log-level 10 + WEBSOCKET_HOST: love-nginx-service/love/manager/queue/ws/subscription - name: atspectrograph csc: ATSpectrograph:0 --log-level 10 + WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription - name: auxteless201 csc: ESS:201 --log-level 10 + WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription - name: auxteless202 csc: ESS:202 --log-level 10 + WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription - name: auxteless203 csc: ESS:203 --log-level 10 + WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription - name: auxteless204 csc: ESS:204 --log-level 10 - - name: auxteless205 - csc: ESS:205 --log-level 10 + WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription - name: calibhilless301 csc: ESS:301 --log-level 10 + WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription + - name: cameraess111 + csc: ESS:111 --log-level 10 + WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription - name: camerahexapod csc: MTHexapod:1 --log-level 10 - - name: cccamera - csc: CCCamera:0 --log-level 10 - - name: ccheaderservice - csc: CCHeaderService:0 --log-level 10 - - name: ccoods - csc: CCOODS:0 --log-level 10 - - name: ccocps - csc: OCPS:2 --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 - name: dimm1 csc: DIMM:1 --log-level 10 + WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription - name: dimm2 csc: DIMM:2 --log-level 10 + WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription - name: dsm1 csc: DSM:1 --log-level 10 + WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription - name: dsm2 csc: DSM:2 --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 - name: gcheaderservice1 csc: GCHeaderService:1 --log-level 10 + WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription - name: genericcamera1 csc: GenericCamera:1 --log-level 10 + WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription - name: lasertracker1 csc: LaserTracker:1 --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 + - name: m1m3ess113 + csc: ESS:113 --log-level 10 + WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription - name: m2ess106 csc: ESS:106 --log-level 10 + WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription + - name: m2ess112 + csc: ESS:112 --log-level 10 + WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription - name: m2hexapod csc: MTHexapod:2 --log-level 10 + WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription - name: mtaircompressor1 csc: MTAirCompressor:1 --log-level 10 + WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription - name: mtaircompressor2 csc: MTAirCompressor:2 --log-level 10 + WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription - name: mtaos csc: MTAOS:0 --log-level 10 + WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription - name: mtdome csc: MTDome:0 --log-level 10 - - name: mtdomeess101 - csc: ESS:101 --log-level 10 - - name: mtdomeess102 - csc: ESS:102 --log-level 10 - - name: mtdomeess103 - csc: ESS:103 --log-level 10 + WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription - name: mtdomeess107 csc: ESS:107 --log-level 10 + WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription - name: mtdomeess108 csc: ESS:108 --log-level 10 + WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription - name: mtdometrajectory csc: MTDomeTrajectory:0 --log-level 10 + WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription - name: mtm1m3 csc: MTM1M3:0 --log-level 10 + WEBSOCKET_HOST: love-nginx-service/love/manager/m1m3/ws/subscription + resources: + requests: + cpu: 100m + memory: 220Mi + limits: + cpu: 500m + memory: 600Mi - name: mtm2 csc: MTM2:0 --log-level 10 + WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription - name: mtmount csc: MTMount:0 --log-level 10 + WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription - name: mtptg csc: MTPtg:0 --log-level 10 + WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription - name: mtrotator csc: MTRotator:0 --log-level 10 + WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription - name: mtscheduler csc: Scheduler:1 --log-level 10 + WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription - name: mtscriptqueue csc: ScriptQueue:1 --log-level 10 + WEBSOCKET_HOST: love-nginx-service/love/manager/queue/ws/subscription - name: ocsscheduler csc: Scheduler:3 --log-level 10 + WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription - name: ocsscriptqueue csc: ScriptQueue:3 --log-level 10 + WEBSOCKET_HOST: love-nginx-service/love/manager/queue/ws/subscription - name: tmaess001 csc: ESS:1 --log-level 10 + WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription - name: tmaess104 csc: ESS:104 --log-level 10 + WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription - name: tmaess105 csc: ESS:105 --log-level 10 + WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription + - name: tmaess110 + csc: ESS:110 --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 - name: weatherforecast csc: WeatherForecast:0 --log-level 10 + WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription