Merge pull request #3461 from lsst-sqre/tickets/SITCOM-1222-4

tickets/SITCOM-1222-4

applications/eas/Chart.yaml

@@ -7,64 +7,64 @@ dependencies:
   version: 1.0.0
   repository: file://../../charts/csc_shared
 - name: csc
-  alias: auxtel-ess01
+  alias: auxtel-ess201
   version: 1.0.0
-  condition: auxtel-ess01.enabled
+  condition: auxtel-ess201.enabled
   repository: file://../../charts/csc
 - name: csc
-  alias: auxtel-ess01-sim
+  alias: auxtel-ess201-sim
   version: 1.0.0
-  condition: auxtel-ess01-sim.enabled
+  condition: auxtel-ess201-sim.enabled
   repository: file://../../charts/csc
 - name: csc
-  alias: auxtel-ess02
+  alias: auxtel-ess202
   version: 1.0.0
-  condition: auxtel-ess02.enabled
+  condition: auxtel-ess202.enabled
   repository: file://../../charts/csc
 - name: csc
-  alias: auxtel-ess02-sim
+  alias: auxtel-ess202-sim
   version: 1.0.0
-  condition: auxtel-ess02-sim.enabled
+  condition: auxtel-ess202-sim.enabled
   repository: file://../../charts/csc
 - name: csc
-  alias: auxtel-ess03
+  alias: auxtel-ess203
   version: 1.0.0
-  condition: auxtel-ess03.enabled
+  condition: auxtel-ess203.enabled
   repository: file://../../charts/csc
 - name: csc
-  alias: auxtel-ess03-sim
+  alias: auxtel-ess203-sim
   version: 1.0.0
-  condition: auxtel-ess03-sim.enabled
+  condition: auxtel-ess203-sim.enabled
   repository: file://../../charts/csc
 - name: csc
-  alias: auxtel-ess04
+  alias: auxtel-ess204
   version: 1.0.0
-  condition: auxtel-ess04.enabled
+  condition: auxtel-ess204.enabled
   repository: file://../../charts/csc
 - name: csc
-  alias: auxtel-ess04-sim
+  alias: auxtel-ess204-sim
   version: 1.0.0
-  condition: auxtel-ess04-sim.enabled
+  condition: auxtel-ess204-sim.enabled
   repository: file://../../charts/csc
 - name: csc
-  alias: auxtel-ess05
+  alias: auxtel-ess205
   version: 1.0.0
-  condition: auxtel-ess05.enabled
+  condition: auxtel-ess205.enabled
   repository: file://../../charts/csc
 - name: csc
-  alias: auxtel-ess05-sim
+  alias: auxtel-ess205-sim
   version: 1.0.0
-  condition: auxtel-ess05-sim.enabled
+  condition: auxtel-ess205-sim.enabled
   repository: file://../../charts/csc
 - name: csc
-  alias: calibhill-ess01
+  alias: calibhill-ess301
   version: 1.0.0
-  condition: calibhill-ess01.enabled
+  condition: calibhill-ess301.enabled
   repository: file://../../charts/csc
 - name: csc
-  alias: calibhill-ess01-sim
+  alias: calibhill-ess301-sim
   version: 1.0.0
-  condition: calibhill-ess01-sim.enabled
+  condition: calibhill-ess301-sim.enabled
   repository: file://../../charts/csc
 - name: csc
   alias: dimm1
@@ -106,6 +106,16 @@ dependencies:
   version: 1.0.0
   condition: dsm2-sim.enabled
   repository: file://../../charts/csc
+- name: csc
+  alias: epm1
+  version: 1.0.0
+  condition: epm1.enabled
+  repository: file://../../charts/csc
+- name: csc
+  alias: epm1-sim
+  version: 1.0.0
+  condition: epm1-sim.enabled
+  repository: file://../../charts/csc
 - name: csc
   alias: m2-ess106
   version: 1.0.0
@@ -117,44 +127,64 @@ dependencies:
   condition: m2-ess106-sim.enabled
   repository: file://../../charts/csc
 - name: csc
-  alias: mtdome-ess01
+  alias: mtdome-ess101
+  version: 1.0.0
+  condition: mtdome-ess101.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
+  version: 1.0.0
+  condition: mtdome-ess102.enabled
+  repository: file://../../charts/csc
+- name: csc
+  alias: mtdome-ess102-sim
+  version: 1.0.0
+  condition: mtdome-ess102-sim.enabled
+  repository: file://../../charts/csc
+- name: csc
+  alias: mtdome-ess103
   version: 1.0.0
-  condition: mtdome-ess01.enabled
+  condition: mtdome-ess103.enabled
   repository: file://../../charts/csc
 - name: csc
-  alias: mtdome-ess01-sim
+  alias: mtdome-ess103-sim
   version: 1.0.0
-  condition: mtdome-ess01-sim.enabled
+  condition: mtdome-ess103-sim.enabled
   repository: file://../../charts/csc
 - name: csc
-  alias: mtdome-ess02
+  alias: mtdome-ess107
   version: 1.0.0
-  condition: mtdome-ess02.enabled
+  condition: mtdome-ess107.enabled
   repository: file://../../charts/csc
 - name: csc
-  alias: mtdome-ess02-sim
+  alias: mtdome-ess107-sim
   version: 1.0.0
-  condition: mtdome-ess02-sim.enabled
+  condition: mtdome-ess107-sim.enabled
   repository: file://../../charts/csc
 - name: csc
-  alias: mtdome-ess03
+  alias: mtdome-ess108
   version: 1.0.0
-  condition: mtdome-ess03.enabled
+  condition: mtdome-ess108.enabled
   repository: file://../../charts/csc
 - name: csc
-  alias: mtdome-ess03-sim
+  alias: mtdome-ess108-sim
   version: 1.0.0
-  condition: mtdome-ess03-sim.enabled
+  condition: mtdome-ess108-sim.enabled
   repository: file://../../charts/csc
 - name: csc
-  alias: tma-ess01
+  alias: tma-ess001
   version: 1.0.0
-  condition: tma-ess01.enabled
+  condition: tma-ess001.enabled
   repository: file://../../charts/csc
 - name: csc
-  alias: tma-ess01-sim
+  alias: tma-ess001-sim
   version: 1.0.0
-  condition: tma-ess01-sim.enabled
+  condition: tma-ess001-sim.enabled
   repository: file://../../charts/csc
 - name: csc
   alias: tma-ess104

applications/eas/README.md

@@ -6,18 +6,18 @@ Deployment for the Environmental Awareness Systems CSCs
 
 | Key | Type | Default | Description |
 |-----|------|---------|-------------|
-| auxtel-ess01-sim.enabled | bool | `false` | Enable the ESS:201 simulator CSC |
-| auxtel-ess01.enabled | bool | `false` | Enable the ESS:201 CSC |
-| auxtel-ess02-sim.enabled | bool | `false` | Enable the ESS:202 simulator CSC |
-| auxtel-ess02.enabled | bool | `false` | Enable the ESS:202 CSC |
-| auxtel-ess03-sim.enabled | bool | `false` | Enable the ESS:203 simulator CSC |
-| auxtel-ess03.enabled | bool | `false` | Enable the ESS:203 CSC |
-| auxtel-ess04-sim.enabled | bool | `false` | Enable the ESS:204 simulator CSC |
-| auxtel-ess04.enabled | bool | `false` | Enable the ESS:204 CSC |
-| auxtel-ess05-sim.enabled | bool | `false` | Enable the ESS:205 simulator CSC |
-| auxtel-ess05.enabled | bool | `false` | Enable the ESS:205 CSC |
-| calibhill-ess01-sim.enabled | bool | `false` | Enable the ESS:301 simulator CSC |
-| calibhill-ess01.enabled | bool | `false` | Enable the ESS:301 CSC |
+| auxtel-ess201-sim.enabled | bool | `false` | Enable the ESS:201 simulator CSC |
+| auxtel-ess201.enabled | bool | `false` | Enable the ESS:201 CSC |
+| auxtel-ess202-sim.enabled | bool | `false` | Enable the ESS:202 simulator CSC |
+| auxtel-ess202.enabled | bool | `false` | Enable the ESS:202 CSC |
+| auxtel-ess203-sim.enabled | bool | `false` | Enable the ESS:203 simulator CSC |
+| 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 |
 | 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 |
@@ -26,6 +26,8 @@ Deployment for the Environmental Awareness Systems CSCs
 | dsm1.enabled | bool | `false` | Enable the DSM:1 CSC |
 | dsm2-sim.enabled | bool | `false` | Enable the DSM:2 simulator CSC |
 | dsm2.enabled | bool | `false` | Enable the DSM:2 CSC |
+| epm1-sim.enabled | bool | `false` | Enable the EPM:1 simulator CSC |
+| epm1.enabled | bool | `false` | Enable the EPM: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 |
 | global.controlSystem.imageTag | string | Set by ArgoCD | Image tag for the control system deployment |
@@ -39,14 +41,18 @@ Deployment for the Environmental Awareness Systems CSCs
 | global.vaultSecretsPath | string | Set by Argo CD | Base path for Vault secrets |
 | m2-ess106-sim.enabled | bool | `false` | Enable the ESS:106 simulator CSC |
 | m2-ess106.enabled | bool | `false` | Enable the ESS:106 CSC |
-| mtdome-ess01-sim.enabled | bool | `false` | Enable the ESS:101 simulator CSC |
-| mtdome-ess01.enabled | bool | `false` | Enable the ESS:101 CSC |
-| mtdome-ess02-sim.enabled | bool | `false` | Enable the ESS:102 simulator CSC |
-| mtdome-ess02.enabled | bool | `false` | Enable the ESS:102 CSC |
-| mtdome-ess03-sim.enabled | bool | `false` | Enable the ESS:103 simulator CSC |
-| mtdome-ess03.enabled | bool | `false` | Enable the ESS:103 CSC |
-| tma-ess01-sim.enabled | bool | `false` | Enable the ESS:1 simulator CSC |
-| tma-ess01.enabled | bool | `false` | Enable the ESS:1 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 |
+| 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 |
+| mtdome-ess108.enabled | bool | `false` | Enable the ESS:108 CSC |
+| tma-ess001-sim.enabled | bool | `false` | Enable the ESS:1 simulator CSC |
+| tma-ess001.enabled | bool | `false` | Enable the ESS:1 CSC |
 | tma-ess104-sim.enabled | bool | `false` | Enable the ESS:104 simulator CSC |
 | tma-ess104.enabled | bool | `false` | Enable the ESS:104 CSC |
 | tma-ess105-sim.enabled | bool | `false` | Enable the ESS:105 simulator CSC |

applications/eas/values-tucson-teststand.yaml

@@ -1,4 +1,4 @@
-auxtel-ess01-sim:
+auxtel-ess201-sim:
   enabled: true
   classifier: ess201
   image:
@@ -14,7 +14,7 @@ auxtel-ess01-sim:
       cpu: 190m
       memory: 900Mi
 
-auxtel-ess02-sim:
+auxtel-ess202-sim:
   enabled: true
   classifier: ess202
   image:
@@ -30,7 +30,7 @@ auxtel-ess02-sim:
       cpu: 190m
       memory: 900Mi
 
-auxtel-ess03-sim:
+auxtel-ess203-sim:
   enabled: true
   classifier: ess203
   image:
@@ -46,7 +46,7 @@ auxtel-ess03-sim:
       cpu: 190m
       memory: 900Mi
 
-auxtel-ess04-sim:
+auxtel-ess204-sim:
   enabled: true
   classifier: ess204
   image:
@@ -62,7 +62,7 @@ auxtel-ess04-sim:
       cpu: 190m
       memory: 900Mi
 
-auxtel-ess05-sim:
+auxtel-ess205-sim:
   enabled: true
   classifier: ess205
   image:
@@ -78,7 +78,7 @@ auxtel-ess05-sim:
       cpu: 190m
       memory: 900Mi
 
-calibhill-ess01-sim:
+calibhill-ess301-sim:
   enabled: true
   classifier: ess301
   image:
@@ -156,6 +156,22 @@ dsm2-sim:
       cpu: 100m
       memory: 900Mi
 
+epm1-sim:
+  enabled: true
+  classifier: epm1
+  image:
+    repository: ts-dockerhub.lsst.org/epm
+    pullPolicy: Always
+  env:
+    RUN_ARG: 1 --simulate
+  resources:
+    requests:
+      cpu: 19m
+      memory: 90Mi
+    limits:
+      cpu: 190m
+      memory: 900Mi
+
 m2-ess106-sim:
   enabled: true
   classifier: ess106
@@ -172,7 +188,7 @@ m2-ess106-sim:
       cpu: 190m
       memory: 900Mi
 
-mtdome-ess01-sim:
+mtdome-ess101-sim:
   enabled: true
   classifier: ess101
   image:
@@ -188,7 +204,7 @@ mtdome-ess01-sim:
       cpu: 190m
       memory: 900Mi
 
-mtdome-ess02-sim:
+mtdome-ess102-sim:
   enabled: true
   classifier: ess102
   image:
@@ -204,7 +220,7 @@ mtdome-ess02-sim:
       cpu: 190m
       memory: 900Mi
 
-mtdome-ess03-sim:
+mtdome-ess103-sim:
   enabled: true
   classifier: ess103
   image:
@@ -220,7 +236,39 @@ mtdome-ess03-sim:
       cpu: 190m
       memory: 900Mi
 
-tma-ess01-sim:
+mtdome-ess107-sim:
+  enabled: true
+  classifier: ess107
+  image:
+    repository: ts-dockerhub.lsst.org/ess
+    pullPolicy: Always
+  env:
+    RUN_ARG: 107 --simulate
+  resources:
+    requests:
+      cpu: 19m
+      memory: 90Mi
+    limits:
+      cpu: 190m
+      memory: 900Mi
+
+mtdome-ess108-sim:
+  enabled: true
+  classifier: ess108
+  image:
+    repository: ts-dockerhub.lsst.org/ess
+    pullPolicy: Always
+  env:
+    RUN_ARG: 108 --simulate
+  resources:
+    requests:
+      cpu: 19m
+      memory: 90Mi
+    limits:
+      cpu: 190m
+      memory: 900Mi
+
+tma-ess001-sim:
   enabled: true
   classifier: ess1
   image: