Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat(builder): add support for dood container #1508

Merged
merged 1 commit into from
Oct 15, 2020
Merged

feat(builder): add support for dood container #1508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions pkg/workflow/controller/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,6 +116,8 @@ type DindSettings struct {
InsecureRegistries []string `json:"insecure_registries"`
// Bip specifies IP subnet used for docker0 bridge
Bip string `json:"bip"`
// Disable specifies using dood instead of dind
Disable bool `json:"disable"`
}

// Config is Workflow Controller config instance
Expand Down
85 changes: 47 additions & 38 deletions pkg/workflow/workload/pod/builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -485,6 +485,16 @@ func (m *Builder) ResolveInputResources() error {

// ResolveOutputResources add resource resolvers to pod spec.
func (m *Builder) ResolveOutputResources() error {
var dockerSockMountName string
var dockerSockMountPath string
if controller.Config.DindSettings.Disable {
dockerSockMountName = common.HostDockerSockVolumeName
dockerSockMountPath = common.DockerSockFilePath
} else {
dockerSockMountName = common.DockerInDockerSockVolume
dockerSockMountPath = common.DockerSockPath
}

// Indicate whether there is image type resource to output, if so, we need a docker-in-docker
// side-car.
var withImageOutput bool
Expand Down Expand Up @@ -569,62 +579,61 @@ func (m *Builder) ResolveOutputResources() error {
withImageOutput = true

container.VolumeMounts = append(container.VolumeMounts, corev1.VolumeMount{
Name: common.DockerInDockerSockVolume,
MountPath: common.DockerSockPath,
Name: dockerSockMountName,
MountPath: dockerSockMountPath,
})
}

m.pod.Spec.Containers = append(m.pod.Spec.Containers, container)
}

// Add a volume for docker socket file sharing if there are image type resource to output.
if withImageOutput {
m.pod.Spec.Volumes = append(m.pod.Spec.Volumes, corev1.Volume{
Name: common.DockerInDockerSockVolume,
VolumeSource: corev1.VolumeSource{
EmptyDir: &corev1.EmptyDirVolumeSource{},
},
})
}
if !controller.Config.DindSettings.Disable {
// Add a volume for docker socket file sharing if there are image type resource to output.
m.pod.Spec.Volumes = append(m.pod.Spec.Volumes, corev1.Volume{
Name: common.DockerInDockerSockVolume,
VolumeSource: corev1.VolumeSource{
EmptyDir: &corev1.EmptyDirVolumeSource{},
},
})

// Add a docker-in-docker sidecar when there are image type resource to output.
args := []string{"dockerd"}
if len(controller.Config.DindSettings.Bip) > 0 {
args = append(args, "--bip", controller.Config.DindSettings.Bip)
}
for _, r := range controller.Config.DindSettings.InsecureRegistries {
args = append(args, "--insecure-registry", r)
}
// Add a docker-in-docker sidecar when there are image type resource to output.
args := []string{"dockerd"}
if len(controller.Config.DindSettings.Bip) > 0 {
args = append(args, "--bip", controller.Config.DindSettings.Bip)
}
for _, r := range controller.Config.DindSettings.InsecureRegistries {
args = append(args, "--insecure-registry", r)
}

if withImageOutput {
var previleged = true
dind := corev1.Container{
Image: controller.Config.Images[controller.DindImage],
Name: common.DockerInDockerSidecarName,
Args: args,
SecurityContext: &corev1.SecurityContext{
Privileged: &previleged,
},
VolumeMounts: []corev1.VolumeMount{
{
Name: common.DockerInDockerSockVolume,
MountPath: common.DockerSockPath,
var previleged = true
dind := corev1.Container{
Image: controller.Config.Images[controller.DindImage],
Name: common.DockerInDockerSidecarName,
Args: args,
SecurityContext: &corev1.SecurityContext{
Privileged: &previleged,
},
},
VolumeMounts: []corev1.VolumeMount{
{
Name: common.DockerInDockerSockVolume,
MountPath: common.DockerSockPath,
},
},
}
m.pod.Spec.Containers = append(m.pod.Spec.Containers, dind)
}
m.pod.Spec.Containers = append(m.pod.Spec.Containers, dind)
}

// Mount docker socket file to workload container if there are image type resource to output.
if withImageOutput {
// Mount docker socket file to workload container if there are image type resource to output.
for i, c := range m.pod.Spec.Containers {
if common.OnlyCustomContainer(c.Name) {
m.pod.Spec.Containers[i].VolumeMounts = append(m.pod.Spec.Containers[i].VolumeMounts, corev1.VolumeMount{
Name: common.DockerInDockerSockVolume,
MountPath: common.DockerSockPath,
Name: dockerSockMountName,
MountPath: dockerSockMountPath,
})
}
}

}

return nil
Expand Down
3 changes: 2 additions & 1 deletion release/workflow-controller.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,8 @@ _config:
}
},
"dind": {
"bip": "172.18.0.1/16"
"bip": "172.18.0.1/16",
"disable": true
},
"pvc": "cyclone-server-server-v1-0-cyclone-data",
"cyclone_server_addr": "[[ kube_apiserver_endpoint_ip ]]:6008",
Expand Down