Rename properly + move volume path and name to const

Signed-off-by: Samuel Archambault <[email protected]>

Author: Samuel Archambault

driver/kubernetes/factory.go

@@ -288,7 +288,7 @@ func (f *factory) processDriverOpts(deploymentName string, namespace string, cfg
 			}
 		case "buildkit-root-volume-memory":
 			if v != "" {
-				deploymentOpt.BuildKitRootFolderMemory = v
+				deploymentOpt.BuildKitRootVolumeMemory = v
 			}
 		case "default-load":
 			defaultLoad, err = strconv.ParseBool(v)

driver/kubernetes/manifest/manifest.go

@@ -32,7 +32,7 @@ type DeploymentOpt struct {
 	// files mounted at /etc/buildkitd
 	ConfigFiles map[string][]byte
 
-	BuildKitRootFolderMemory string
+	BuildKitRootVolumeMemory string
 	Rootless                 bool
 	NodeSelector             map[string]string
 	CustomAnnotations        map[string]string
@@ -51,7 +51,8 @@ const (
 	containerName      = "buildkitd"
 	AnnotationPlatform = "buildx.docker.com/platform"
 	LabelApp           = "app"
-	rootVolumeName   = "buildkit-root"
+	rootVolumeName     = "buildkit-memory"
+	rootVolumePath     = "/var/lib/buildkit"
 )
 
 type ErrReservedAnnotationPlatform struct{}
@@ -249,23 +250,23 @@ func NewDeployment(opt *DeploymentOpt) (d *appsv1.Deployment, c []*corev1.Config
 		d.Spec.Template.Spec.Containers[0].Resources.Limits[corev1.ResourceEphemeralStorage] = limEphemeralStorage
 	}
 
-	if opt.BuildKitRootFolderMemory != "" {
-		buildKitRootFolderMemory, err := resource.ParseQuantity(opt.BuildKitRootFolderMemory)
+	if opt.BuildKitRootVolumeMemory != "" {
+		buildKitRootVolumeMemory, err := resource.ParseQuantity(opt.BuildKitRootVolumeMemory)
 		if err != nil {
 			return nil, nil, err
 		}
 		d.Spec.Template.Spec.Volumes = append(d.Spec.Template.Spec.Volumes, corev1.Volume{
-			Name: "buildkit-memory",
+			Name: rootVolumeName,
 			VolumeSource: corev1.VolumeSource{
 				EmptyDir: &corev1.EmptyDirVolumeSource{
 					Medium:    "Memory",
-					SizeLimit: &buildKitRootFolderMemory,
+					SizeLimit: &buildKitRootVolumeMemory,
 				},
 			},
 		})
 		d.Spec.Template.Spec.Containers[0].VolumeMounts = append(d.Spec.Template.Spec.Containers[0].VolumeMounts, corev1.VolumeMount{
-			Name:      "buildkit-memory",
-			MountPath: "/var/lib/buildkit",
+			Name:      rootVolumeName,
+			MountPath: rootVolumePath,
 		})
 	}