devfile 0.0.12.pre.alpha1-x86_64-linux → 0.0.14.pre.alpha1-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1cc3363280657ceecbb55931395fc354e8d13cb814c2a83b11dd679e0a67edd6
-  data.tar.gz: b8bdad6991ddc7a87cd72c49fc2d684f8fe055245ae8747136e08df8608a7bd0
+  metadata.gz: 383ba06875e6f3c5ffa91aff57a88957b18486ac4bc08e18503a7e23e2386c0c
+  data.tar.gz: 80a6afb162202a4717312ef2b561c21e906a2753db9e6d530762129e83814306
 SHA512:
-  metadata.gz: 928d238a1651d90afb2d1e81e8eafbfbbbb421487a51a21eba8b5262f6649619fcedcbc25ea1bcb4db2632e6e011491eb3abc41bd4736fc3540f2c14fe3b6ef6
-  data.tar.gz: 2dec36f8b4bd994a41cc3b20c2fb7099b54558dc1864dcd80b13594a036d84c55932d688dc595b38652c0479329e616ee92090f09a8fb0388877b638d1213a47
+  metadata.gz: 6d2f882ed4c62d2ed9f22a72e1d5d75cd6832fa847c4aad0059ff9a593fc7b8ac76df9f5f8c0fcb833053e5fc0fb53c9bbf111b706955f7a43cdc0dd186aa2b0
+  data.tar.gz: 523d788b7ce4dd99681a14bddd3789d1f854d27fc8ae7fb4cbe0a03ce01adacbae534e096431d73d19112530defc52c7b09983430821683dfaa83edfcbdc52ed

data/ext/devfile.go

@@ -2,8 +2,6 @@ package main
 
 import (
 	"bytes"
-	"fmt"
-	"sort"
 	"strconv"
 	"text/template"
 
@@ -24,14 +22,21 @@ type Devfile struct {
 	devfileObj parser.DevfileObj
 }
 
-type volumeOptions struct {
-	Info        generator.VolumeInfo
-	Size        string
-	IsEphemeral bool
+type pvcOptions struct {
+	Name string
+	Size string
 }
 
 func (d Devfile) getDeployment(name, namespace string, labels, annotations map[string]string, replicas int) (*appsv1.Deployment, error) {
-	containers, initContainers, volumes, _, err := d.getContainersAndVolumes(name)
+	containers, err := generator.GetContainers(d.devfileObj, common.DevfileOptions{})
+	if err != nil {
+		return nil, err
+	}
+	initContainers, err := generator.GetInitContainers(d.devfileObj)
+	if err != nil {
+		return nil, err
+	}
+	volumes, _, err := d.getVolumesAndVolumeMounts(containers, initContainers, name)
 	if err != nil {
 		return nil, err
 	}
@@ -147,24 +152,29 @@ func (d Devfile) getIngress(name, namespace string, labels, annotations map[stri
 }
 
 func (d Devfile) getPVC(name, namespace string, labels, annotations map[string]string) ([]*corev1.PersistentVolumeClaim, error) {
-	_, _, volumes, volumeNameToVolumeOptions, err := d.getContainersAndVolumes(name)
+	containers, err := generator.GetContainers(d.devfileObj, common.DevfileOptions{})
+	if err != nil {
+		return nil, err
+	}
+	initContainers, err := generator.GetInitContainers(d.devfileObj)
+	if err != nil {
+		return nil, err
+	}
+	_, pvcNameToPvcOptions, err := d.getVolumesAndVolumeMounts(containers, initContainers, name)
 	if err != nil {
 		return nil, err
 	}
+
 	pvcs := make([]*corev1.PersistentVolumeClaim, 0)
-	for _, volume := range volumes {
-		volumeOptions := volumeNameToVolumeOptions[volume.Name]
-		if volumeOptions.IsEphemeral {
-			continue
-		}
-		quantity, err := resource.ParseQuantity(volumeOptions.Size)
+	for _, options := range pvcNameToPvcOptions {
+		quantity, err := resource.ParseQuantity(options.Size)
 		if err != nil {
 			return nil, err
 		}
 		pvcParams := generator.PVCParams{
 			TypeMeta: generator.GetTypeMeta("PersistentVolumeClaim", "v1"),
 			ObjectMeta: metav1.ObjectMeta{
-				Name:        volumeOptions.Info.PVCName,
+				Name:        options.Name,
 				Namespace:   namespace,
 				Labels:      labels,
 				Annotations: annotations,
@@ -212,65 +222,6 @@ func (d Devfile) getAll(name, namespace string, labels, annotations map[string]s
 	return result, nil
 }
 
-func (d Devfile) getContainersAndVolumes(name string) ([]corev1.Container, []corev1.Container, []corev1.Volume, map[string]volumeOptions, error) {
-	containers, err := generator.GetContainers(d.devfileObj, common.DevfileOptions{})
-	if err != nil {
-		return nil, nil, nil, nil, err
-	}
-	initContainers, err := generator.GetInitContainers(d.devfileObj)
-	if err != nil {
-		return nil, nil, nil, nil, err
-	}
-	allContainers := append(containers, initContainers...)
-
-	volumeComponents, err := d.devfileObj.Data.GetDevfileVolumeComponents(common.DevfileOptions{})
-	if err != nil {
-		return nil, nil, nil, nil, err
-	}
-	volumeNameToVolumeOptions := map[string]volumeOptions{}
-	volumeNameToVolumeInfo := map[string]generator.VolumeInfo{}
-	for _, volumeComponent := range volumeComponents {
-		info := generator.VolumeInfo{
-			PVCName:    fmt.Sprintf("%s-%s", name, volumeComponent.Name),
-			VolumeName: volumeComponent.Name,
-		}
-		volumeNameToVolumeInfo[volumeComponent.Name] = info
-		volumeNameToVolumeOptions[volumeComponent.Name] = volumeOptions{
-			Info:        info,
-			Size:        volumeComponent.Volume.Size,
-			IsEphemeral: *volumeComponent.Volume.Ephemeral,
-		}
-	}
-
-	volumeParams := generator.VolumeParams{
-		Containers:             allContainers,
-		VolumeNameToVolumeInfo: volumeNameToVolumeInfo,
-	}
-	options := common.DevfileOptions{}
-	// "containers" and "initContainers" are updated in place with the volume mounts parameters
-	// after the following function is called
-	volumes, err := generator.GetVolumesAndVolumeMounts(d.devfileObj, volumeParams, options)
-	if err != nil {
-		return nil, nil, nil, nil, err
-	}
-	// sort all volumes and volume mounts in the containers and initContainers
-	// to keep the array order deterministic
-	sort.SliceStable(volumes, func(i, j int) bool {
-		return volumes[i].Name < volumes[j].Name
-	})
-	for _, container := range containers {
-		sort.SliceStable(container.VolumeMounts, func(i, j int) bool {
-			return container.VolumeMounts[i].Name < container.VolumeMounts[j].Name
-		})
-	}
-	for _, initContainer := range initContainers {
-		sort.SliceStable(initContainer.VolumeMounts, func(i, j int) bool {
-			return initContainer.VolumeMounts[i].Name < initContainer.VolumeMounts[j].Name
-		})
-	}
-	return containers, initContainers, volumes, volumeNameToVolumeOptions, nil
-}
-
 func (d Devfile) hasContainerComponents() (bool, error) {
 	containers, err := generator.GetContainers(d.devfileObj, common.DevfileOptions{})
 	if err != nil {

data/ext/volume.go

@@ -0,0 +1,118 @@
+package main
+
+import (
+	"fmt"
+	"github.com/devfile/library/v2/pkg/devfile/generator"
+	"github.com/devfile/library/v2/pkg/devfile/parser/data/v2/common"
+	corev1 "k8s.io/api/core/v1"
+	"k8s.io/apimachinery/pkg/api/resource"
+	"strings"
+)
+
+func (d Devfile) getVolumesAndVolumeMounts(containers []corev1.Container, initContainers []corev1.Container, volumeNamePrefix string) ([]corev1.Volume, map[string]pvcOptions, error) {
+	containerComponents, err := d.devfileObj.Data.GetDevfileContainerComponents(common.DevfileOptions{})
+	if err != nil {
+		return nil, nil, err
+	}
+	volumeComponents, err := d.devfileObj.Data.GetDevfileVolumeComponents(common.DevfileOptions{})
+	if err != nil {
+		return nil, nil, err
+	}
+
+	var volumes []corev1.Volume
+	pvcNameToPvcOptions := map[string]pvcOptions{}
+	for _, volumeComponent := range volumeComponents {
+		volName := volumeComponent.Name
+		if bool(*volumeComponent.Volume.Ephemeral) == true {
+			emptyDir, err := getEmptyDir(volName, volumeComponent.Volume.Size)
+			if err != nil {
+				return nil, nil, err
+			}
+			volumes = append(volumes, emptyDir)
+		} else {
+			pvcName := fmt.Sprintf("%s-%s", volumeNamePrefix, volumeComponent.Name)
+			pvcNameToPvcOptions[volumeComponent.Name] = pvcOptions{
+				Name: pvcName,
+				Size: volumeComponent.Volume.Size,
+			}
+			volumes = append(volumes, getPersistentVolumeClaim(volName, pvcName))
+		}
+		// containerNameToMountPaths is a map of the Devfile container name to their Devfile Volume Mount Paths for a given Volume Name
+		containerNameToMountPaths := make(map[string][]string)
+		for _, containerComp := range containerComponents {
+			for _, volumeMount := range containerComp.Container.VolumeMounts {
+				if volName == volumeMount.Name {
+					containerNameToMountPaths[containerComp.Name] = append(containerNameToMountPaths[containerComp.Name], generator.GetVolumeMountPath(volumeMount))
+				}
+			}
+		}
+
+		addVolumeMountToContainers(containers, initContainers, volumeComponent.Name, containerNameToMountPaths)
+	}
+
+	return volumes, pvcNameToPvcOptions, nil
+}
+
+// addVolumeMountToContainers adds the Volume Mounts in containerNameToMountPaths to the containers for a given pvc and volumeName
+// containerNameToMountPaths is a map of a container name to an array of its Mount Paths.
+// To be moved to devfile/library.
+func addVolumeMountToContainers(containers []corev1.Container, initContainers []corev1.Container, volumeName string, containerNameToMountPaths map[string][]string) {
+
+	for containerName, mountPaths := range containerNameToMountPaths {
+		for i := range containers {
+			if containers[i].Name == containerName {
+				for _, mountPath := range mountPaths {
+					containers[i].VolumeMounts = append(containers[i].VolumeMounts, corev1.VolumeMount{
+						Name:      volumeName,
+						MountPath: mountPath,
+						SubPath:   "",
+					},
+					)
+				}
+			}
+		}
+		for i := range initContainers {
+			if strings.HasPrefix(initContainers[i].Name, containerName) {
+				for _, mountPath := range mountPaths {
+					initContainers[i].VolumeMounts = append(initContainers[i].VolumeMounts, corev1.VolumeMount{
+						Name:      volumeName,
+						MountPath: mountPath,
+						SubPath:   "",
+					},
+					)
+				}
+			}
+		}
+	}
+}
+
+// getPersistentVolumeClaim gets a pvc type volume with the given volume name and pvc name.
+func getPersistentVolumeClaim(volumeName, pvcName string) corev1.Volume {
+
+	return corev1.Volume{
+		Name: volumeName,
+		VolumeSource: corev1.VolumeSource{
+			PersistentVolumeClaim: &corev1.PersistentVolumeClaimVolumeSource{
+				ClaimName: pvcName,
+			},
+		},
+	}
+}
+
+// getEmptyDir gets an emptyDir type volume with the given volume name and size.
+// size should be parseable as a Kubernetes `Quantity` or an error will be returned
+func getEmptyDir(volumeName string, size string) (corev1.Volume, error) {
+
+	emptyDir := &corev1.EmptyDirVolumeSource{}
+	qty, err := resource.ParseQuantity(size)
+	if err != nil {
+		return corev1.Volume{}, err
+	}
+	emptyDir.SizeLimit = &qty
+	return corev1.Volume{
+		Name: volumeName,
+		VolumeSource: corev1.VolumeSource{
+			EmptyDir: emptyDir,
+		},
+	}, nil
+}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: devfile
 version: !ruby/object:Gem::Version
-  version: 0.0.12.pre.alpha1
+  version: 0.0.14.pre.alpha1
 platform: x86_64-linux
 authors:
 - GitLab
@@ -24,6 +24,7 @@ files:
 - ext/go.mod
 - ext/go.sum
 - ext/main.go
+- ext/volume.go
 - lib/devfile.rb
 homepage: https://gitlab.com
 licenses: