Merge pull request #240 from lsst-ts/tickets/SITCOM-1135

tickets/SITCOM-1135
lsst-ts · Dec 14, 2023 · a8b6a08 · a8b6a08
2 parents 2f6fe63 + b8041ca
commit a8b6a08
Show file tree

Hide file tree

Showing 56 changed files with 106 additions and 56 deletions.
diff --git a/apps/ataos/Chart.yaml b/apps/ataos/Chart.yaml
@@ -1,4 +1,4 @@
 name: ataos
 apiVersion: v2
-version: 0.12.0
+version: 0.12.1
 description: A Helm chart for deploying the ATAOS CSC.
diff --git a/apps/atdome/Chart.yaml b/apps/atdome/Chart.yaml
@@ -1,4 +1,4 @@
 name: atdome
 apiVersion: v2
-version: 0.12.0
+version: 0.12.1
 description: A Helm chart for deploying the ATDome CSC.
diff --git a/apps/atdometrajectory/Chart.yaml b/apps/atdometrajectory/Chart.yaml
@@ -1,4 +1,4 @@
 name: atdometrajectory
 apiVersion: v2
-version: 0.12.0
+version: 0.12.1
 description: A Helm chart for deploying the ATDomeTrajectory CSC.
diff --git a/apps/atheaderservice/Chart.yaml b/apps/atheaderservice/Chart.yaml
@@ -1,4 +1,4 @@
 name: atheaderservice
 apiVersion: v2
-version: 0.12.0
+version: 0.12.1
 description: A Helm chart for deploying the ATHeaderService CSC.
diff --git a/apps/athexapod/Chart.yaml b/apps/athexapod/Chart.yaml
@@ -1,4 +1,4 @@
 name: athexapod
 apiVersion: v2
-version: 0.12.0
+version: 0.12.1
 description: A Helm chart for deploying the ATHexapod CSC.
diff --git a/apps/atmcs/Chart.yaml b/apps/atmcs/Chart.yaml
@@ -1,4 +1,4 @@
 name: atmcs
 apiVersion: v2
-version: 0.12.0
+version: 0.12.1
 description: A Helm chart for deploying the ATMCS CSC.
diff --git a/apps/atmonochromator/Chart.yaml b/apps/atmonochromator/Chart.yaml
@@ -1,4 +1,4 @@
 name: atmonochromator
 apiVersion: v2
-version: 0.12.0
+version: 0.12.1
 description: A Helm chart for deploying the ATMonochromator CSC.
diff --git a/apps/atocps/Chart.yaml b/apps/atocps/Chart.yaml
@@ -1,4 +1,4 @@
 name: atocps
 apiVersion: v2
-version: 0.12.0
+version: 0.12.1
 description: A Helm chart for deploying the ATOCPS CSC.
diff --git a/apps/atoods/Chart.yaml b/apps/atoods/Chart.yaml
@@ -1,4 +1,4 @@
 name: atoods
 apiVersion: v2
-version: 0.12.0
+version: 0.12.1
 description: A Helm chart for deploying the ATOODS CSC.
diff --git a/apps/atpneumatics/Chart.yaml b/apps/atpneumatics/Chart.yaml
@@ -1,4 +1,4 @@
 name: atpneumatics
 apiVersion: v2
-version: 0.12.0
+version: 0.12.1
 description: A Helm chart for deploying the ATPneumatics CSC.
diff --git a/apps/atptg/Chart.yaml b/apps/atptg/Chart.yaml
@@ -1,4 +1,4 @@
 name: atptg
 apiVersion: v2
-version: 0.12.0
+version: 0.12.1
 description: A Helm chart for deploying the ATPtg CSC.
diff --git a/apps/atqueue/Chart.yaml b/apps/atqueue/Chart.yaml
@@ -1,4 +1,4 @@
 name: atqueue
 apiVersion: v2
-version: 0.12.0
+version: 0.12.1
 description: A Helm chart for deploying the ATScriptQueue CSC.
diff --git a/apps/atqueue/values-base-teststand.yaml b/apps/atqueue/values-base-teststand.yaml
@@ -58,3 +58,14 @@ nfsMountpoint:
   readOnly: true
   server: nfs-obsenv.ls.lsst.org
   serverPath: /obs-env
+affinity:
+  podAntiAffinity:
+    requiredDuringSchedulingIgnoredDuringExecution:
+    - labelSelector:
+        matchExpressions:
+        - key: "csc"
+          operator: In
+          values:
+          - atqueue
+          - mtqueue
+      topologyKey: "kubernetes.io/hostname"
diff --git a/apps/atscheduler/Chart.yaml b/apps/atscheduler/Chart.yaml
@@ -1,4 +1,4 @@
 name: atscheduler
 apiVersion: v2
-version: 0.12.0
+version: 0.12.1
 description: A Helm chart for deploying the ATScheduler CSC.
diff --git a/apps/atscheduler/values-base-teststand.yaml b/apps/atscheduler/values-base-teststand.yaml
@@ -37,3 +37,14 @@ nfsMountpoint:
   readOnly: true
   server: nfs-obsenv.ls.lsst.org
   serverPath: /obs-env
+affinity:
+  podAntiAffinity:
+    requiredDuringSchedulingIgnoredDuringExecution:
+    - labelSelector:
+        matchExpressions:
+        - key: "csc"
+          operator: In
+          values:
+          - atscheduler
+          - mtscheduler
+      topologyKey: "kubernetes.io/hostname"
diff --git a/apps/atspectrograph/Chart.yaml b/apps/atspectrograph/Chart.yaml
@@ -1,4 +1,4 @@
 name: atspectrograph
 apiVersion: v2
-version: 0.12.0
+version: 0.12.1
 description: A Helm chart for deploying the ATSpectrograph CSC.
diff --git a/apps/atwhitelight/Chart.yaml b/apps/atwhitelight/Chart.yaml
@@ -1,4 +1,4 @@
 name: atwhitelight
 apiVersion: v2
-version: 0.12.0
+version: 0.12.1
 description: A Helm chart for deploying the ATWhiteLight CSC.
diff --git a/apps/authorize/Chart.yaml b/apps/authorize/Chart.yaml
@@ -1,4 +1,4 @@
 name: authorize
 apiVersion: v2
-version: 0.12.0
+version: 0.12.1
 description: A Helm chart for deploying the Authorize CSC.
diff --git a/apps/ccheaderservice/Chart.yaml b/apps/ccheaderservice/Chart.yaml
@@ -1,4 +1,4 @@
 name: ccheaderservice
 apiVersion: v2
-version: 0.12.0
+version: 0.12.1
 description: A Helm chart for deploying the CCHeaderService CSC.
diff --git a/apps/ccocps/Chart.yaml b/apps/ccocps/Chart.yaml
@@ -1,4 +1,4 @@
 name: ccocps
 apiVersion: v2
-version: 0.12.0
+version: 0.12.1
 description: A Helm chart for deploying the CCOCPS CSC.
diff --git a/apps/ccoods/Chart.yaml b/apps/ccoods/Chart.yaml
@@ -1,4 +1,4 @@
 name: ccoods
 apiVersion: v2
-version: 0.12.0
+version: 0.12.1
 description: A Helm chart for deploying the CCOODS CSC.
diff --git a/apps/dimm/Chart.yaml b/apps/dimm/Chart.yaml
@@ -1,4 +1,4 @@
 name: dimm
 apiVersion: v2
-version: 0.12.0
+version: 0.12.1
 description: A Helm chart for deploying the DIMM CSC.
diff --git a/apps/dsm/Chart.yaml b/apps/dsm/Chart.yaml
@@ -1,4 +1,4 @@
 name: dsm
 apiVersion: v2
-version: 0.12.0
+version: 0.12.1
 description: A Helm chart for deploying the DSM CSC.
diff --git a/apps/electrometer/Chart.yaml b/apps/electrometer/Chart.yaml
@@ -1,4 +1,4 @@
 name: electrometer
 apiVersion: v2
-version: 0.12.0
+version: 0.12.1
 description: A Helm chart for deploying the Electrometer CSC.
diff --git a/apps/ess/Chart.yaml b/apps/ess/Chart.yaml
@@ -1,4 +1,4 @@
 name: ess
 apiVersion: v2
-version: 0.12.0
+version: 0.12.1
 description: A Helm chart for deploying the ESS CSC.
diff --git a/apps/gcheaderservice/Chart.yaml b/apps/gcheaderservice/Chart.yaml
@@ -1,4 +1,4 @@
 name: gcheaderservice
 apiVersion: v2
-version: 0.12.0
+version: 0.12.1
 description: A Helm chart for deploying the GCHeaderService CSC.
diff --git a/apps/genericcamera/Chart.yaml b/apps/genericcamera/Chart.yaml
@@ -1,4 +1,4 @@
 name: genericcamera
 apiVersion: v2
-version: 0.12.0
+version: 0.12.1
 description: A Helm chart for deploying the GenericCamera CSC.
diff --git a/apps/gis/Chart.yaml b/apps/gis/Chart.yaml
@@ -1,4 +1,4 @@
 name: gis
 apiVersion: v2
-version: 0.12.0
+version: 0.12.1
 description: A Helm chart for deploying the GIS CSC.
diff --git a/apps/hvac/Chart.yaml b/apps/hvac/Chart.yaml
@@ -1,4 +1,4 @@
 name: hvac
 apiVersion: v2
-version: 0.12.0
+version: 0.12.1
 description: A Helm chart for deploying the HVAC CSC.
diff --git a/apps/integrationtests/Chart.yaml b/apps/integrationtests/Chart.yaml
@@ -1,4 +1,5 @@
 name: integrationtests
 apiVersion: v2
-version: 0.12.0
-description: A Helm chart for deploying test applications using the IntegrationTests package.
+version: 0.12.1
+description: A Helm chart for deploying test applications using the IntegrationTests
+  package.
diff --git a/apps/lasertracker/Chart.yaml b/apps/lasertracker/Chart.yaml
@@ -1,4 +1,4 @@
 name: lasertracker
 apiVersion: v2
-version: 0.12.0
+version: 0.12.1
 description: A Helm chart for deploying the LaserTracker CSC.
diff --git a/apps/love-commander/Chart.yaml b/apps/love-commander/Chart.yaml
@@ -1,4 +1,4 @@
 name: love-commander
 apiVersion: v2
-version: 0.12.0
+version: 0.12.1
 description: A Helm chart for deploying the LOVE Commander app.
diff --git a/apps/mtaircompressor/Chart.yaml b/apps/mtaircompressor/Chart.yaml
@@ -1,4 +1,4 @@
 name: mtaircompressor
 apiVersion: v2
-version: 0.12.0
+version: 0.12.1
 description: A Helm chart for deploying the MTAirCompressor CSC.
diff --git a/apps/mtaos/Chart.yaml b/apps/mtaos/Chart.yaml
@@ -1,4 +1,4 @@
 name: mtaos
 apiVersion: v2
-version: 0.12.0
+version: 0.12.1
 description: A Helm chart for deploying the MTAOS CSC.
diff --git a/apps/mtcamhexapod/Chart.yaml b/apps/mtcamhexapod/Chart.yaml
@@ -1,4 +1,4 @@
 name: mtcamhexapod
 apiVersion: v2
-version: 0.12.0
+version: 0.12.1
 description: A Helm chart for deploying the MTCamHexapod CSC.
diff --git a/apps/mtdome/Chart.yaml b/apps/mtdome/Chart.yaml
@@ -1,4 +1,4 @@
 name: mtdome
 apiVersion: v2
-version: 0.12.0
+version: 0.12.1
 description: A Helm chart for deploying the MTDome CSC.
diff --git a/apps/mtdometrajectory/Chart.yaml b/apps/mtdometrajectory/Chart.yaml
@@ -1,4 +1,4 @@
 name: mtdometrajectory
 apiVersion: v2
-version: 0.12.0
+version: 0.12.1
 description: A Helm chart for deploying the MTDomeTrajectory CSC.
diff --git a/apps/mtheaderservice/Chart.yaml b/apps/mtheaderservice/Chart.yaml
@@ -1,4 +1,4 @@
 name: mtheaderservice
 apiVersion: v2
-version: 0.12.0
+version: 0.12.1
 description: A Helm chart for deploying the MTHeaderService CSC.
diff --git a/apps/mtm1m3/Chart.yaml b/apps/mtm1m3/Chart.yaml
@@ -1,4 +1,4 @@
 name: mtm1m3
 apiVersion: v2
-version: 0.12.0
+version: 0.12.1
 description: A Helm chart for deploying the MTM1M3 CSC.
diff --git a/apps/mtm2/Chart.yaml b/apps/mtm2/Chart.yaml
@@ -1,4 +1,4 @@
 name: mtm2
 apiVersion: v2
-version: 0.12.0
+version: 0.12.1
 description: A Helm chart for deploying the MTM2 CSC.
diff --git a/apps/mtm2hexapod/Chart.yaml b/apps/mtm2hexapod/Chart.yaml
@@ -1,4 +1,4 @@
 name: mtm2hexapod
 apiVersion: v2
-version: 0.12.0
+version: 0.12.1
 description: A Helm chart for deploying the MTM2Hexapod CSC.
diff --git a/apps/mtmount/Chart.yaml b/apps/mtmount/Chart.yaml
@@ -1,4 +1,4 @@
 name: mtmount
 apiVersion: v2
-version: 0.12.0
+version: 0.12.1
 description: A Helm chart for deploying the MTMount CSC.
diff --git a/apps/mtoods/Chart.yaml b/apps/mtoods/Chart.yaml
@@ -1,4 +1,4 @@
 name: mtoods
 apiVersion: v2
-version: 0.12.0
+version: 0.12.1
 description: A Helm chart for deploying the MTOODS CSC.
diff --git a/apps/mtptg/Chart.yaml b/apps/mtptg/Chart.yaml
@@ -1,4 +1,4 @@
 name: mtptg
 apiVersion: v2
-version: 0.12.0
+version: 0.12.1
 description: A Helm chart for deploying the MTPtg CSC.
diff --git a/apps/mtqueue/Chart.yaml b/apps/mtqueue/Chart.yaml
@@ -1,4 +1,4 @@
 name: mtqueue
 apiVersion: v2
-version: 0.12.0
+version: 0.12.1
 description: A Helm chart for deploying the MTScriptQueue CSC.
diff --git a/apps/mtqueue/values-base-teststand.yaml b/apps/mtqueue/values-base-teststand.yaml
@@ -58,3 +58,14 @@ nfsMountpoint:
   readOnly: true
   server: nfs-obsenv.ls.lsst.org
   serverPath: /obs-env
+affinity:
+  podAntiAffinity:
+    requiredDuringSchedulingIgnoredDuringExecution:
+    - labelSelector:
+        matchExpressions:
+        - key: "csc"
+          operator: In
+          values:
+          - atqueue
+          - mtqueue
+      topologyKey: "kubernetes.io/hostname"
diff --git a/apps/mtrotator/Chart.yaml b/apps/mtrotator/Chart.yaml
@@ -1,4 +1,4 @@
 name: mtrotator
 apiVersion: v2
-version: 0.12.0
+version: 0.12.1
 description: A Helm chart for deploying the MTRotator CSC.
diff --git a/apps/mtscheduler/Chart.yaml b/apps/mtscheduler/Chart.yaml
@@ -1,4 +1,4 @@
 name: mtscheduler
 apiVersion: v2
-version: 0.12.0
+version: 0.12.1
 description: A Helm chart for deploying the MTScheduler CSC.
diff --git a/apps/mtscheduler/values-base-teststand.yaml b/apps/mtscheduler/values-base-teststand.yaml
@@ -37,3 +37,14 @@ nfsMountpoint:
   readOnly: true
   server: nfs-obsenv.ls.lsst.org
   serverPath: /obs-env
+affinity:
+  podAntiAffinity:
+    requiredDuringSchedulingIgnoredDuringExecution:
+    - labelSelector:
+        matchExpressions:
+        - key: "csc"
+          operator: In
+          values:
+          - atscheduler
+          - mtscheduler
+      topologyKey: "kubernetes.io/hostname"
diff --git a/apps/pmd/Chart.yaml b/apps/pmd/Chart.yaml
@@ -1,4 +1,4 @@
 name: pmd
 apiVersion: v2
-version: 0.12.0
+version: 0.12.1
 description: A Helm chart for deploying the PMD CSC.
diff --git a/apps/test-csc/Chart.yaml b/apps/test-csc/Chart.yaml
@@ -1,4 +1,4 @@
 name: test-csc
 apiVersion: v2
-version: 0.12.0
+version: 0.12.1
 description: A Helm chart for deploying the Test CSC.
diff --git a/apps/watcher/Chart.yaml b/apps/watcher/Chart.yaml
@@ -1,4 +1,4 @@
 name: watcher
 apiVersion: v2
-version: 0.12.0
+version: 0.12.1
 description: A Helm chart for deploying the Watcher CSC.
diff --git a/apps/weatherforecast/Chart.yaml b/apps/weatherforecast/Chart.yaml
@@ -1,4 +1,4 @@
 name: weatherforecast
 apiVersion: v2
-version: 0.12.0
+version: 0.12.1
 description: A Helm chart for deploying the WeatherForecast CSC.
diff --git a/apps/weatherstation/Chart.yaml b/apps/weatherstation/Chart.yaml
@@ -1,4 +1,4 @@
 name: weatherstation
 apiVersion: v2
-version: 0.12.0
+version: 0.12.1
 description: A Helm chart for deploying the WeatherStation CSC.
diff --git a/charts/csc/job.yaml b/charts/csc/job.yaml
@@ -85,9 +85,9 @@ spec:
               readOnly: {{ $values.readOnly }}
           {{- end}}
           {{- end}}
-          {{- with $.Values.resources }}
+          {{- with .Values.resources }}
           resources:
-            {{- toYaml $.Values.resources | nindent 12 }}
+            {{- toYaml .Values.resources | nindent 12 }}
           {{- end }}
       {{- if or .Values.ddsRouteFixer .Values.secretPermFixer }}
       initContainers:
@@ -195,13 +195,13 @@ spec:
       hostPID: {{ or $.Values.useHostPid (eq ( $.Values.useHostPid | toString ) "<nil>" ) }}
       {{- with $.Values.nodeSelector }}
       nodeSelector:
-        {{- toYaml $ | nindent 8 }}
+        {{- toYaml . | nindent 8 }}
       {{- end }}
       {{- with $.Values.affinity }}
       affinity:
-        {{- toYaml $ | nindent 8 }}
+        {{- toYaml . | nindent 8 }}
       {{- end }}
       {{- with $.Values.tolerations }}
       tolerations:
-        {{- toYaml $ | nindent 8 }}
+        {{- toYaml . | nindent 8 }}
       {{- end }}