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 <[email protected]>

Author: dweomer

driver/kubernetes/manifest/manifest.go

@@ -144,21 +144,21 @@ 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{
 						Name: cc.Name,
 					},
 				},
 			},
-		}}
+		})
 		c = append(c, cc)
 	}