Skip to content
This repository was archived by the owner on Apr 24, 2023. It is now read-only.

Commit 9b9e532

Browse files
author
Scott Crosby
committed
Revert "Gross hack"
This reverts commit cbe92f5.
1 parent cbe92f5 commit 9b9e532

File tree

1 file changed

+2
-11
lines changed
  • scheduler/src/cook/kubernetes

1 file changed

+2
-11
lines changed

scheduler/src/cook/kubernetes/api.clj

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1581,15 +1581,7 @@
15811581
(when use-checkpoint-injection?
15821582
(let [{:keys [command]} checkpoint-container
15831583
container (V1Container.)
1584-
resources (V1ResourceRequirements.)
1585-
; Gross hack becuase init containers are running in the wrong order, fetch the tickets early.
1586-
ticket-volumemount
1587-
(doto (V1VolumeMount.)
1588-
(.setName "kerberos-ticket-volume")
1589-
(.setMountPath "/var/secret")
1590-
(.readOnly true))
1591-
]
1592-
1584+
resources (V1ResourceRequirements.)]
15931585
; container
15941586
(.setName container cook-container-name-for-checkpoint-injection)
15951587
(.setImage container image)
@@ -1598,8 +1590,7 @@
15981590
(.setWorkingDir container init-container-workdir)
15991591
(.setEnv container main-env-vars)
16001592
(.setVolumeMounts container (filterv some? (concat [(init-container-workdir-volume-mount-fn false)
1601-
(scratch-space-volume-mount-fn false)
1602-
ticket-volumemount]
1593+
(scratch-space-volume-mount-fn false)]
16031594
init-container-checkpoint-volume-mounts)))
16041595
(set-mem-cpu-resources resources total-memory-request total-memory-limit total-cpu-request total-cpu-limit)
16051596
(.setResources container resources)

0 commit comments

Comments
 (0)