fix #17 and #16

DODAS-TS · Apr 12, 2022 · 0f7b620 · 0f7b620
1 parent f2bae26
commit 0f7b620
Show file tree

Hide file tree

Showing 5 changed files with 56 additions and 43 deletions.
diff --git a/stable/htcondor-aas/Chart.yaml b/stable/htcondor-aas/Chart.yaml
@@ -4,7 +4,7 @@ apiVersion: v1
 appVersion: 8.9.9
 description: A Helm chart for the deployment of HTCondor cluster
 name: htcondor
-version: 2.1.14
+version: 2.1.15
 icon: https://research.cs.wisc.edu/htcondor/images/HTCondor_wiki_logo_small.png
 maintainers:
   - name: ttedesch

diff --git a/stable/htcondor-aas/templates/deployment_master.yaml b/stable/htcondor-aas/templates/deployment_master.yaml
@@ -15,15 +15,9 @@ spec:
     spec:
       priorityClassName: system-node-critical
       affinity:
-        podAntiAffinity:
-          requiredDuringSchedulingIgnoredDuringExecution:
-          - labelSelector:
-              matchExpressions:
-              - key: app.kubernetes.io/name
-                operator: In
-                values:
-                - master
-            topologyKey: kubernetes.io/hostname
+{{- if .Values.master.affinity}}
+{{ .Values.master.affinity  | indent 8 }}
+{{- end }}
       #hostNetwork: true
       containers:
       - name: ccb

diff --git a/stable/htcondor-aas/templates/deployment_schedd.yaml b/stable/htcondor-aas/templates/deployment_schedd.yaml
@@ -16,15 +16,9 @@ spec:
       priorityClassName: system-node-critical
       #hostNetwork: true
       affinity:
-        podAntiAffinity:
-          requiredDuringSchedulingIgnoredDuringExecution:
-          - labelSelector:
-              matchExpressions:
-              - key: app.kubernetes.io/name
-                operator: In
-                values:
-                - schedd
-            topologyKey: kubernetes.io/hostname
+{{- if .Values.schedd.affinity}}
+{{ .Values.schedd.affinity  | indent 8 }}
+{{- end }}
       hostAliases:                                                                                                           
       - hostnames:                                                                                                           
         - {{ .Values.schedd.hostname }}
@@ -45,6 +39,8 @@ spec:
         volumeMounts:
           - mountPath: "/etc/condor/config.d"
             name: configd
+          - name: spool
+            mountPath: /var/lib/condor/spool
           #- mountPath: "/etc/ca"
           #  name: cafile
           - name: clustersecret

diff --git a/stable/htcondor-aas/templates/deployment_wn.yaml b/stable/htcondor-aas/templates/deployment_wn.yaml
@@ -15,30 +15,9 @@ spec:
     spec:
       priorityClassName: system-node-critical
       affinity:
-        #podAntiAffinity:
-          # requiredDuringSchedulingIgnoredDuringExecution:
-          # - labelSelector:
-          #     matchExpressions:
-          #     - key: app.kubernetes.io/name
-          #       operator: NotIn
-          #       values:
-          #       - master
-          #       - schedd
-          #       - wn
-          #  topologyKey: kubernetes.io/hostname
-        {{- if .Values.cvmfs.enabled }}
-        podAffinity:
-          requiredDuringSchedulingIgnoredDuringExecution:
-          - labelSelector:
-              matchExpressions:
-              - key: app.kubernetes.io/name
-                operator: In
-                values:
-                {{- if .Values.cvmfs.enabled }}
-                - cvmfs
-                {{- end }}
-            topologyKey: kubernetes.io/hostname
-        {{- end }}
+{{- if .Values.wn.affinity}}
+{{ .Values.wn.affinity  | indent 8 }}
+{{- end }}
       #hostNetwork: true
       {{- if .Values.ttsCache.enabled }}
       serviceAccountName: tts-account-{{ .Release.Namespace}}

diff --git a/stable/htcondor-aas/values.yaml b/stable/htcondor-aas/values.yaml
@@ -7,6 +7,18 @@ cluster:
 
 schedd: 
   enabled: true
+  affinity: |
+    podAntiAffinity:
+      requiredDuringSchedulingIgnoredDuringExecution:
+      - labelSelector:
+          matchExpressions:
+          - key: app.kubernetes.io/name
+            operator: In
+            values:
+            - schedd
+            - master
+            - wn
+        topologyKey: kubernetes.io/hostname  
   mapfile: |
     SCITOKENS https:\/\/dodas-iam.cloud.cnaf.infn.it\/,(.*) \[email protected]
     PASSWORD (*.) condor
@@ -32,6 +44,27 @@ schedd:
 
 master:
   enabled: true
+  affinity: |
+    podAntiAffinity:
+      requiredDuringSchedulingIgnoredDuringExecution:
+      - labelSelector:
+          matchExpressions:
+          - key: app.kubernetes.io/name
+            operator: In
+            values:
+            - schedd
+            - master
+            - wn
+        topologyKey: kubernetes.io/hostname
+    podAffinity:
+      requiredDuringSchedulingIgnoredDuringExecution:
+      - labelSelector:
+          matchExpressions:
+          - key: app.kubernetes.io/name
+            operator: In
+            values:
+            - cvmfs
+        topologyKey: kubernetes.io/hostname
   publicIP: <master public IP>
   extraconfig: ""
   hostname: <master public IP>.myip.cloud.infn.it
@@ -49,6 +82,17 @@ master:
 
 wn:
   enabled: true
+  affinity: |
+    podAntiAffinity:
+      requiredDuringSchedulingIgnoredDuringExecution:
+      - labelSelector:
+          matchExpressions:
+          - key: app.kubernetes.io/name
+            operator: In
+            values:
+            - schedd
+            - master
+        topologyKey: kubernetes.io/hostname  
   replicas: 1
   image:
     name:  ttedesch/htcondor-execute