Merge pull request #3934 from lsst-sqre/tickets/DM-45250-8

tickets/DM-45250-8

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 |

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 |

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 }}

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: {}

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

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:

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

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 |

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