Merge pull request #3998 from lsst-sqre/tickets/DM-47896-9

tickets/DM-47896-9
lsst-sqre · Dec 16, 2024 · 466c81b · 466c81b
2 parents a3fb2a2 + 4f74c8f
commit 466c81b
Show file tree

Hide file tree

Showing 17 changed files with 102 additions and 43 deletions.
diff --git a/applications/eas/Chart.yaml → applications/envsys/Chart.yaml b/applications/eas/Chart.yaml → applications/envsys/Chart.yaml
@@ -1,5 +1,5 @@
 apiVersion: v2
-name: eas
+name: envsys
 version: 1.0.0
 description: Deployment for the Environmental Awareness Systems CSCs
 dependencies:
@@ -126,6 +126,16 @@ dependencies:
   version: 1.0.0
   condition: dsm2-sim.enabled
   repository: file://../../charts/csc
+- name: csc
+  alias: eas
+  version: 1.0.0
+  condition: eas.enabled
+  repository: file://../../charts/csc
+- name: csc
+  alias: eas-sim
+  version: 1.0.0
+  condition: eas-sim.enabled
+  repository: file://../../charts/csc
 - name: csc
   alias: epm1
   version: 1.0.0

diff --git a/applications/eas/README.md → applications/envsys/README.md b/applications/eas/README.md → applications/envsys/README.md
@@ -1,4 +1,4 @@
-# eas
+# envsys
 
 Deployment for the Environmental Awareness Systems CSCs
 
@@ -24,10 +24,14 @@ Deployment for the Environmental Awareness Systems CSCs
 | dimm1.enabled | bool | `false` | Enable the DIMM:1 CSC |
 | dimm2-sim.enabled | bool | `false` | Enable the DIMM:2 simulator CSC |
 | dimm2.enabled | bool | `false` | Enable the DIMM:2 CSC |
+| dream-sim.enabled | bool | `false` | Enable the DREAM simulator CSC |
+| dream.enabled | bool | `false` | Enable the DREAM CSC |
 | dsm1-sim.enabled | bool | `false` | Enable the DSM:1 simulator CSC |
 | 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 |
+| eas-sim.enabled | bool | `false` | Enable the EAS simulator CSC |
+| eas.enabled | bool | `false` | Enable the EAS 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 |

diff --git a/applications/eas/secrets.yaml → applications/envsys/secrets.yaml b/applications/eas/secrets.yaml → applications/envsys/secrets.yaml
diff --git a/applications/eas/values-base.yaml → applications/envsys/values-base.yaml b/applications/eas/values-base.yaml → applications/envsys/values-base.yaml
@@ -180,6 +180,14 @@ dsm2-sim:
       cpu: 100m
       memory: 900Mi
 
+eas-sim:
+  enabled: true
+  image:
+    repository: ts-dockerhub.lsst.org/eas
+    pullPolicy: Always
+  env:
+    RUN_ARG: --simulate
+
 epm1-sim:
   enabled: true
   classifier: epm1

diff --git a/...ications/eas/values-tucson-teststand.yaml → ...tions/envsys/values-tucson-teststand.yaml b/...ications/eas/values-tucson-teststand.yaml → ...tions/envsys/values-tucson-teststand.yaml
@@ -140,6 +140,14 @@ dimm2-sim:
       cpu: 230m
       memory: 1070Mi
 
+dream-sim:
+  enabled: true
+  image:
+    repository: ts-dockerhub.lsst.org/dream
+    pullPolicy: Always
+  env:
+    RUN_ARG: --simulate
+
 dsm1-sim:
   enabled: true
   image:
@@ -172,6 +180,14 @@ dsm2-sim:
       cpu: 100m
       memory: 900Mi
 
+eas-sim:
+  enabled: true
+  image:
+    repository: ts-dockerhub.lsst.org/eas
+    pullPolicy: Always
+  env:
+    RUN_ARG: --simulate
+
 epm1-sim:
   enabled: true
   classifier: epm1

diff --git a/applications/eas/values.yaml → applications/envsys/values.yaml b/applications/eas/values.yaml → applications/envsys/values.yaml
@@ -70,6 +70,14 @@ dimm2-sim:
   # -- Enable the DIMM:2 simulator CSC
   enabled: false
 
+dream:
+  # -- Enable the DREAM CSC
+  enabled: false
+
+dream-sim:
+  # -- Enable the DREAM simulator CSC
+  enabled: false
+
 dsm1:
   # -- Enable the DSM:1 CSC
   enabled: false
@@ -86,6 +94,14 @@ dsm2-sim:
   # -- Enable the DSM:2 simulator CSC
   enabled: false
 
+eas:
+  # -- Enable the EAS CSC
+  enabled: false
+
+eas-sim:
+  # -- Enable the EAS simulator CSC
+  enabled: false
+
 epm1:
   # -- Enable the EPM:1 CSC
   enabled: false

diff --git a/applications/love/values-base.yaml b/applications/love/values-base.yaml
@@ -464,6 +464,8 @@ love-producer:
   - name: dsm2
     csc: DSM:2 --log-level 10
     WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription
+  - name: eas
+    csc: EAS:0 --log-level 10
   - name: electrometer101
     csc: Electrometer:101 --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
@@ -438,6 +438,9 @@ love-producer:
   - name: dsm2
     csc: DSM:2 --log-level 10
     WEBSOCKET_HOST: love-nginx-service/love/manager/producers/ws/subscription
+  - name: eas
+    csc: EAS:0 --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

diff --git a/docs/applications/eas/index.rst b/docs/applications/eas/index.rst
diff --git a/docs/applications/eas/values.md b/docs/applications/eas/values.md
diff --git a/docs/applications/envsys/index.rst b/docs/applications/envsys/index.rst
@@ -0,0 +1,18 @@
+.. px-app:: envsys
+
+#################################################################
+envsys — Environmental Awareness System Control System Components
+#################################################################
+
+The envsys application houses CSCs associated with the Environmental Awareness System. Simulation environments use simulators for all CSCs except the WeatherForecast CSC.
+
+.. jinja:: envsys
+   :file: applications/_summary.rst.jinja
+
+Guides
+======
+
+.. toctree::
+   :maxdepth: 1
+
+   values
diff --git a/docs/applications/envsys/values.md b/docs/applications/envsys/values.md
@@ -0,0 +1,12 @@
+```{px-app-values} envsys
+```
+
+# EnvSys Helm values reference
+
+Helm values reference table for the {px-app}`envsys` application.
+
+```{include} ../../../applications/envsys/README.md
+---
+start-after: "## Values"
+---
+```
diff --git a/docs/applications/telescope.rst b/docs/applications/telescope.rst
@@ -13,7 +13,7 @@ Argo CD project: ``telescope``
    auxtel/index
    calsys/index
    control-system-test/index
-   eas/index
+   envsys/index
    love/index
    obsenv-management/index
    obssys/index

diff --git a/environments/README.md b/environments/README.md
@@ -16,7 +16,7 @@
 | applications.cm-service | bool | `false` | Enable the cm-service application |
 | applications.control-system-test | bool | `false` | Enable the control-system-test application |
 | applications.datalinker | bool | `false` | Eanble the datalinker application |
-| applications.eas | bool | `false` | Enable the eas control system application |
+| applications.envsys | bool | `false` | Enable the envsys control system application |
 | applications.exposurelog | bool | `false` | Enable the exposurelog application |
 | applications.fastapi-bootcamp | bool | `false` | Enable the fastapi-bootcamp application |
 | applications.filestore-backup | bool | `false` | Enable the filestore-backup application |

diff --git a/...templates/applications/telescope/eas.yaml → ...plates/applications/telescope/envsys.yaml b/...templates/applications/telescope/eas.yaml → ...plates/applications/telescope/envsys.yaml
@@ -1,26 +1,26 @@
-{{- if (index .Values "applications" "eas") -}}
+{{- if (index .Values "applications" "envsys") -}}
 apiVersion: v1
 kind: Namespace
 metadata:
-  name: "eas"
+  name: "envsys"
 spec:
   finalizers:
     - "kubernetes"
 ---
 apiVersion: argoproj.io/v1alpha1
 kind: Application
 metadata:
-  name: "eas"
+  name: "envsys"
   namespace: "argocd"
   finalizers:
     - "resources-finalizer.argocd.argoproj.io"
 spec:
   destination:
-    namespace: "eas"
+    namespace: "envsys"
     server: "https://kubernetes.default.svc"
   project: "telescope"
   source:
-    path: "applications/eas"
+    path: "applications/envsys"
     repoURL: {{ .Values.repoUrl | quote }}
     targetRevision: {{ .Values.targetRevision | quote }}
     helm:
@@ -32,7 +32,7 @@ spec:
         - name: "global.vaultSecretsPath"
           value: {{ .Values.vaultPathPrefix | quote }}
         - name: "global.controlSystem.appNamespace"
-          value: "eas"
+          value: "envsys"
         - name: "global.controlSystem.imageTag"
           value: {{ .Values.controlSystem.imageTag | quote }}
         - name: "global.controlSystem.siteTag"

diff --git a/environments/values-base.yaml b/environments/values-base.yaml
@@ -15,7 +15,7 @@ applications:
   calsys: true
   consdb: true
   control-system-test: true
-  eas: true
+  envsys: true
   exposurelog: true
   love: true
   mobu: true

diff --git a/environments/values.yaml b/environments/values.yaml
@@ -66,8 +66,8 @@ applications:
   # -- Eanble the datalinker application
   datalinker: false
 
-  # -- Enable the eas control system application
-  eas: false
+  # -- Enable the envsys control system application
+  envsys: false
 
   # -- Enable the exposurelog application
   exposurelog: false