cm-service: configure htcondor

lsst-sqre · Jan 24, 2025 · 517b8e1 · 517b8e1
1 parent 61bb25b
commit 517b8e1
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 25 deletions.
diff --git a/applications/cm-service/templates/api-deployment.yaml b/applications/cm-service/templates/api-deployment.yaml
@@ -54,12 +54,13 @@ spec:
               drop:
                 - "all"
             readOnlyRootFilesystem: true
+          # TODO: we hopefully do not actually need this mounted on the API
           volumeMounts:
-            - mountPath: "/output"
+            {{- with .Values.config.outputVolume }}
+            - mountPath: {{ .mountPath }}
               name: "output-volume"
-              {{- with .Values.config.outputVolume.subPath }}
-              subPath: {{ . }}
-              {{- end }}
+              subPath: {{ .subPath }}
+            {{- end }}
       volumes:
         - name: output-volume
           persistentVolumeClaim:

diff --git a/applications/cm-service/templates/configmap.yaml b/applications/cm-service/templates/configmap.yaml
@@ -21,8 +21,12 @@ metadata:
   labels:
     {{- include "application.labels" . | nindent 4 }}
 data:
-  CONDOR_CONFIG: /home/lsstsvc1/.config/condor/condor-config
   DAF_BUTLER_PASSWORD: placeholder_for_secret
+  HTCONDOR__schedd_host: sdfiana012.sdf.slac.stanford.edu
+  HTCONDOR__collector_host: sdfiana012.sdf.slac.stanford.edu
+  HTCONDOR__condor_home: /opt/htcondor
   HTCONDOR__condor_submit_bin: /opt/htcondor/bin/condor_submit
   HTCONDOR__condor_q_bin: /opt/htcondor/bin/condor_q
-  HTCONDOR__alias_path: /sdf/group/rubin/{{ .Values.config.outputVolume.subPath }}
+  HTCONDOR__working_directory: /sdf/group/rubin/{{ .Values.config.outputVolume.subPath }}
+  HTCONDOR__fs_remote_dir: /sdf/group/rubin/services/htcondor/shared
+# CONDOR_CONFIG: /home/lsstsvc1/.config/condor/condor_config
diff --git a/applications/cm-service/templates/worker-deployment.yaml b/applications/cm-service/templates/worker-deployment.yaml
@@ -57,18 +57,18 @@ spec:
                 - "all"
             readOnlyRootFilesystem: true
           volumeMounts:
-            - mountPath: "/output"
+            {{- with .Values.config.outputVolume }}
+            - mountPath: {{ .mountPath }}
               name: "output-volume"
-              {{- with .Values.config.outputVolume.subPath }}
-              subPath: {{ . }}
-              {{- end }}
+              subPath: {{ .subPath }}
+            {{- end }}
             - mountPath: "/tmp"
               name: "tmp-volume"
-            {{- with .Values.worker.htcondor.config }}
-            - mountPath: {{ .mountPath }}
-              name: "condor-config-volume"
-              readOnly: true
-            {{- end }}
+            # {{- with .Values.worker.htcondor.config }}
+            # - mountPath: {{ .mountPath }}
+            #   name: "condor-config-volume"
+            #   readOnly: true
+            # {{- end }}
             {{- with .Values.worker.butler }}
             - mountPath: {{ .mountPath }}
               name: "butler-auth-volume"
@@ -77,9 +77,7 @@ spec:
             {{- with .Values.worker.htcondor.fsRemoteDir }}
             - mountPath: {{ .mountPath }}
               name: "condor-remote-volume"
-              {{- with .subPath }}
-              subPath: {{ . }}
-              {{- end }}
+              subPath: {{ .subPath }}
             {{- end }}
       volumes:
         - name: output-volume
@@ -88,12 +86,12 @@ spec:
         - name: tmp-volume
           emptyDir:
             sizeLimit: 500Mi
-        - name: condor-config-volume
-          configMap:
-            name: {{ $.Chart.Name }}-config-worker
-            items:
-              - key: config
-                path: condor-config
+        # - name: condor-config-volume
+        #   configMap:
+        #     name: {{ $.Chart.Name }}-config-worker
+        #     items:
+        #       - key: config
+        #         path: condor_config
         - name: condor-remote-volume
           persistentVolumeClaim:
             claimName: {{ $.Chart.Name }}-htcondor

diff --git a/applications/cm-service/values-usdf-cm-dev.yaml b/applications/cm-service/values-usdf-cm-dev.yaml
@@ -1,3 +1,9 @@
+# service writes artifacts that eventually resolve to the path
+#   /sdf/group/rubin/shared/campaigns/users/usdf-cm-dev/<production>/<campaign>/
+# outputVolume: mounted at the container's path /output
+#  sdf-data-rubin == /sdf/group/rubin
+#  sdf-group-rubin == /sdf/group/rubin
+---
 internalDB: true
 config:
   logLevel: "INFO"
@@ -8,6 +14,7 @@ config:
   outputVolume:
     storageClassName: "sdf-data-rubin"
     subPath: "shared/campaigns/users/usdf-cm-dev"
+    mountPath: "/sdf/group/rubin/shared/campaigns/users/usdf-cm-dev"
 image:
   tag: "tickets-DM-48099-release"
   pullPolicy: Always
@@ -21,7 +28,7 @@ worker:
     dbUsername: rubin
   htcondor:
     config:
-      mountPath: "/home/lsstsvc1/.config/condor"
+      mountPath: "/usr/local/etc"
       contents: |
         CONDOR_HOST = sdfiana012.sdf.slac.stanford.edu
         COLLECTOR_HOST = sdfiana012.sdf.slac.stanford.edu