From fb61e12ec3de99fb21d56f2ffa42a06e2f51a117 Mon Sep 17 00:00:00 2001 From: Jacob Blain Christen Date: Fri, 17 May 2024 03:25:22 -0700 Subject: [PATCH] kubernetes: fix configmap volumes Use the ConfigMap name as the volume/volumeMount name so that files discovered while parsing buildkitd.toml, such as references to tls ca/cert/key, will be mounted in the builder Deployment. Signed-off-by: Jacob Blain Christen --- driver/kubernetes/manifest/manifest.go | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/driver/kubernetes/manifest/manifest.go b/driver/kubernetes/manifest/manifest.go index e45a734a3003..170cc6210ea2 100644 --- a/driver/kubernetes/manifest/manifest.go +++ b/driver/kubernetes/manifest/manifest.go @@ -148,13 +148,13 @@ func NewDeployment(opt *DeploymentOpt) (d *appsv1.Deployment, c []*corev1.Config Data: cfg.files, } - d.Spec.Template.Spec.Containers[0].VolumeMounts = []corev1.VolumeMount{{ - Name: cfg.name, + d.Spec.Template.Spec.Containers[0].VolumeMounts = append(d.Spec.Template.Spec.Containers[0].VolumeMounts, corev1.VolumeMount{ + Name: cc.Name, MountPath: path.Join("/etc/buildkit", cfg.path), - }} + }) - d.Spec.Template.Spec.Volumes = []corev1.Volume{{ - Name: "config", + d.Spec.Template.Spec.Volumes = append(d.Spec.Template.Spec.Volumes, corev1.Volume{ + Name: cc.Name, VolumeSource: corev1.VolumeSource{ ConfigMap: &corev1.ConfigMapVolumeSource{ LocalObjectReference: corev1.LocalObjectReference{ @@ -162,7 +162,7 @@ func NewDeployment(opt *DeploymentOpt) (d *appsv1.Deployment, c []*corev1.Config }, }, }, - }} + }) c = append(c, cc) }