Merge pull request #8 from lsst-uk/main

Merge updates from lsst:square
lsst-uk · Dec 3, 2024 · 3fb0997 · 3fb0997
2 parents 77e8c38 + 5c20706
commit 3fb0997
Show file tree

Hide file tree

Showing 190 changed files with 1,811 additions and 1,037 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -14,7 +14,7 @@ repos:
           - -c=.yamllint.yml
 
   - repo: https://github.com/python-jsonschema/check-jsonschema
-    rev: 0.29.4
+    rev: 0.30.0
     hooks:
       - id: check-jsonschema
         files: ^applications/.*/secrets(-[^./-]+)?\.yaml
@@ -46,7 +46,7 @@ repos:
           - --template-files=../helm-docs.md.gotmpl
 
   - repo: https://github.com/astral-sh/ruff-pre-commit
-    rev: v0.7.4
+    rev: v0.8.1
     hooks:
       - id: ruff
         args: [--fix, --exit-non-zero-on-fix]

diff --git a/applications/alert-stream-broker/charts/alert-database/templates/ingress.yaml b/applications/alert-stream-broker/charts/alert-database/templates/ingress.yaml
@@ -10,6 +10,7 @@ config:
   scopes:
     all:
       - "read:alertdb"
+  service: "alert-stream-broker"
 template:
   metadata:
     name: {{ template "alertDatabase.fullname" . }}

diff --git a/applications/argo-workflows/Chart.yaml b/applications/argo-workflows/Chart.yaml
@@ -8,5 +8,5 @@ sources:
   - https://github.com/argoproj/argo-helm
 dependencies:
   - name: argo-workflows
-    version: 0.42.7
+    version: 0.45.0
     repository: https://argoproj.github.io/argo-helm
diff --git a/applications/argo-workflows/templates/ingress.yaml b/applications/argo-workflows/templates/ingress.yaml
@@ -4,9 +4,10 @@ metadata:
   name: argo-workflows
 config:
   baseUrl: {{ .Values.global.baseUrl | quote }}
+  loginRedirect: true
   scopes:
     all: {{ .Values.ingress.scopes }}
-  loginRedirect: true
+  service: "argo-workflows"
 template:
   metadata:
     name: argo-workflows

diff --git a/applications/argocd/Chart.yaml b/applications/argocd/Chart.yaml
@@ -8,5 +8,5 @@ sources:
   - https://github.com/argoproj/argo-helm
 dependencies:
   - name: argo-cd
-    version: 7.7.3
+    version: 7.7.7
     repository: https://argoproj.github.io/argo-helm
diff --git a/applications/argocd/values-usdf-cm-dev.yaml b/applications/argocd/values-usdf-cm-dev.yaml
@@ -30,6 +30,7 @@ argo-cd:
         g, [email protected], role:admin
         g, [email protected], role:admin
         g, [email protected], role:admin
+        g, [email protected], role:admin
       scopes: "[email]"
 
   server:

diff --git a/applications/argocd/values-usdf-cm.yaml b/applications/argocd/values-usdf-cm.yaml
@@ -29,6 +29,7 @@ argo-cd:
         g, [email protected], role:admin
         g, [email protected], role:admin
         g, [email protected], role:admin
+        g, [email protected], role:admin
       scopes: "[email]"
 
   server:

diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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/butler/templates/ingress-authenticated.yaml b/applications/butler/templates/ingress-authenticated.yaml
@@ -5,6 +5,9 @@ metadata:
   labels:
     {{- include "butler.labels" . | nindent 4 }}
 config:
+  # The Butler server often services large numbers of small requests,
+  # so this cache reduces the load on Gafaelfawr.
+  authCacheDuration: 5m
   baseUrl: {{ .Values.global.baseUrl | quote }}
   scopes:
     all:
@@ -16,6 +19,7 @@ config:
     internal:
       service: "butler"
       scopes: []
+  service: "butler"
 
 template:
   metadata:

diff --git a/applications/cert-manager/Chart.yaml b/applications/cert-manager/Chart.yaml
@@ -7,5 +7,5 @@ sources:
   - https://github.com/cert-manager/cert-manager
 dependencies:
   - name: cert-manager
-    version: v1.16.1
+    version: v1.16.2
     repository: https://charts.jetstack.io
diff --git a/applications/checkerboard/templates/ingress.yaml b/applications/checkerboard/templates/ingress.yaml
@@ -9,6 +9,7 @@ config:
   scopes:
     all:
       - "read:checkerboard"
+  service: "checkerboard"
 template:
   metadata:
     name: {{ template "checkerboard.fullname" . }}

diff --git a/applications/cm-service/templates/ingress.yaml b/applications/cm-service/templates/ingress.yaml
@@ -10,6 +10,7 @@ config:
   scopes:
     all:
       - "exec:internal-tools"
+  service: "cm-service"
 template:
   metadata:
     name: "cm-service"

diff --git a/applications/consdb/templates/ingress.yaml b/applications/consdb/templates/ingress.yaml
@@ -11,6 +11,7 @@ config:
   scopes:
     all:
       - "read:image"
+  service: "consdb"
 template:
   metadata:
     name: "consdb-pq"

diff --git a/applications/datalinker/templates/ingress-image.yaml b/applications/datalinker/templates/ingress-image.yaml
@@ -9,6 +9,7 @@ config:
   scopes:
     all:
       - "read:image"
+  service: "datalinker"
   # Request a delegated token to use for making calls to Butler server with the
   # end-user's credentials.
   delegate:

diff --git a/applications/datalinker/templates/ingress-tap.yaml b/applications/datalinker/templates/ingress-tap.yaml
@@ -9,6 +9,7 @@ config:
   scopes:
     all:
       - "read:tap"
+  service: "datalinker"
 template:
   metadata:
     name: {{ include "datalinker.fullname" . }}-tap

diff --git 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
@@ -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 |