From 9b9e5322a64c1e899e475dc553e30d6cfdff5914 Mon Sep 17 00:00:00 2001 From: Scott Crosby Date: Tue, 22 Mar 2022 12:13:54 -0500 Subject: [PATCH] Revert "Gross hack" This reverts commit cbe92f572cec35a0c771bc22c755a296936e46cc. --- scheduler/src/cook/kubernetes/api.clj | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/scheduler/src/cook/kubernetes/api.clj b/scheduler/src/cook/kubernetes/api.clj index 4c6bd84e80..6c34c1f00b 100644 --- a/scheduler/src/cook/kubernetes/api.clj +++ b/scheduler/src/cook/kubernetes/api.clj @@ -1581,15 +1581,7 @@ (when use-checkpoint-injection? (let [{:keys [command]} checkpoint-container container (V1Container.) - resources (V1ResourceRequirements.) - ; Gross hack becuase init containers are running in the wrong order, fetch the tickets early. - ticket-volumemount - (doto (V1VolumeMount.) - (.setName "kerberos-ticket-volume") - (.setMountPath "/var/secret") - (.readOnly true)) - ] - + resources (V1ResourceRequirements.)] ; container (.setName container cook-container-name-for-checkpoint-injection) (.setImage container image) @@ -1598,8 +1590,7 @@ (.setWorkingDir container init-container-workdir) (.setEnv container main-env-vars) (.setVolumeMounts container (filterv some? (concat [(init-container-workdir-volume-mount-fn false) - (scratch-space-volume-mount-fn false) - ticket-volumemount] + (scratch-space-volume-mount-fn false)] init-container-checkpoint-volume-mounts))) (set-mem-cpu-resources resources total-memory-request total-memory-limit total-cpu-request total-cpu-limit) (.setResources container resources)