Skip to content
This repository was archived by the owner on Mar 9, 2025. It is now read-only.

Commit 16e2e5a

Browse files
committed
Docker config volume WIP
1 parent 0aa6214 commit 16e2e5a

File tree

1 file changed

+22
-17
lines changed

1 file changed

+22
-17
lines changed

cmd/agent/imagebuild.go

+22-17
Original file line numberDiff line numberDiff line change
@@ -285,7 +285,7 @@ func dockerfileImageBuild(
285285
func generateJob(trigger dx.ImageBuildRequest, name, sourceUrl string) *batchv1.Job {
286286
var ttlSecondsAfterFinished int32 = 60
287287
var backOffLimit int32 = 0
288-
return &batchv1.Job{
288+
job := &batchv1.Job{
289289
TypeMeta: meta_v1.TypeMeta{
290290
Kind: "Job",
291291
APIVersion: "batch/v1",
@@ -330,11 +330,6 @@ func generateJob(trigger dx.ImageBuildRequest, name, sourceUrl string) *batchv1.
330330
MountPath: "/workspace",
331331
Name: "workspace",
332332
},
333-
// TODO test purpose
334-
{
335-
MountPath: "/kaniko/.docker",
336-
Name: "docker-config",
337-
},
338333
},
339334
},
340335
},
@@ -350,23 +345,33 @@ func generateJob(trigger dx.ImageBuildRequest, name, sourceUrl string) *batchv1.
350345
},
351346
},
352347
},
353-
{
354-
// TODO test purpose
355-
Name: "docker-config",
356-
VolumeSource: corev1.VolumeSource{
357-
ConfigMap: &corev1.ConfigMapVolumeSource{
358-
LocalObjectReference: corev1.LocalObjectReference{
359-
Name: "docker-config",
360-
},
361-
},
362-
},
363-
},
364348
},
365349
},
366350
},
367351
BackoffLimit: &backOffLimit,
368352
},
369353
}
354+
355+
// TODO
356+
if !strings.HasPrefix(trigger.Image, "127.0.0.1:32447") {
357+
job.Spec.Template.Spec.Containers[0].VolumeMounts = append(job.Spec.Template.Spec.Containers[0].VolumeMounts, corev1.VolumeMount{
358+
MountPath: "/kaniko/.docker",
359+
Name: "docker-config",
360+
})
361+
362+
job.Spec.Template.Spec.Volumes = append(job.Spec.Template.Spec.Volumes, corev1.Volume{
363+
Name: "docker-config",
364+
VolumeSource: corev1.VolumeSource{
365+
ConfigMap: &corev1.ConfigMapVolumeSource{
366+
LocalObjectReference: corev1.LocalObjectReference{
367+
Name: "docker-config",
368+
},
369+
},
370+
},
371+
})
372+
}
373+
374+
return job
370375
}
371376

372377
func streamInitContainerLogs(kubeEnv *agent.KubeEnv,

0 commit comments

Comments
 (0)