Skip to content

Commit bf2c180

Browse files
authored
Merge pull request #12 from uc-cdis/feat/config_manifest
PXP-3121 Feat/config manifest
2 parents b9e06b8 + 6bd858e commit bf2c180

File tree

1 file changed

+12
-2
lines changed

1 file changed

+12
-2
lines changed

handlers/jobs.go

+12-2
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ func CreateK8sJob(inputURL string, jobConfig JobConfig) (*JobInfo, error) {
180180
randname := GetRandString(5)
181181
name := fmt.Sprintf("%s-%s", jobConfig.Name, randname)
182182
glog.Infoln("job input URL: ", inputURL)
183-
var deadline int64 = 3600
183+
var deadline int64 = 7200
184184
labels := make(map[string]string)
185185
labels["app"] = "ssjdispatcherjob"
186186

@@ -192,6 +192,16 @@ func CreateK8sJob(inputURL string, jobConfig JobConfig) (*JobInfo, error) {
192192
jobConfig.RequestMem = "0.1Gi"
193193
}
194194

195+
quayImage := jobConfig.Image
196+
val, ok := os.LookupEnv("JOB_IMAGES")
197+
if ok {
198+
quayImageIf, err := GetValueFromJSON([]byte(val), []string{jobConfig.Name})
199+
if err != nil {
200+
return nil, err
201+
}
202+
quayImage = quayImageIf.(string)
203+
}
204+
195205
// For an example of how to create jobs, see this file:
196206
// https://github.com/pachyderm/pachyderm/blob/805e63/src/server/pps/server/api_server.go#L2320-L2345
197207
batchJob := &batchv1.Job{
@@ -220,7 +230,7 @@ func CreateK8sJob(inputURL string, jobConfig JobConfig) (*JobInfo, error) {
220230
Containers: []k8sv1.Container{
221231
{
222232
Name: "job-task",
223-
Image: jobConfig.Image,
233+
Image: quayImage,
224234
SecurityContext: &k8sv1.SecurityContext{
225235
Privileged: &falseVal,
226236
},

0 commit comments

Comments
 (0)