devfile 0.0.13.pre.alpha1 → 0.0.14.pre.alpha1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/bin/devfile +0 -0
- data/ext/volume.go +7 -6
- metadata +1 -1
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 52153772bb9dd4f96de48a6f0f66fb75f53f390c9c9c50c464061f77d39d9806
|
|
4
|
+
data.tar.gz: a3c7135482261fdb043c6c772b5c0410f0ad53e58e0f044339c48edc956814f3
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 64091eac35fb3555bf8ef35cbd0d6bf8317696c8bb6fbd5502e5bda65581fbb2ae1609d2f0d2a22440a5a07b30ce0c20b371d6337484b6594073144bce3b598b
|
|
7
|
+
data.tar.gz: d95abf1569fb1bd487cbaad0f14c08f13de6a004dd7b143030d4625f0965286de930ee95c26eba4d00dcf3f37f5b6a3c2c993b680ccc7569fc31de8512ce89ea
|
data/bin/devfile
CHANGED
|
Binary file
|
data/ext/volume.go
CHANGED
|
@@ -22,31 +22,32 @@ func (d Devfile) getVolumesAndVolumeMounts(containers []corev1.Container, initCo
|
|
|
22
22
|
var volumes []corev1.Volume
|
|
23
23
|
pvcNameToPvcOptions := map[string]pvcOptions{}
|
|
24
24
|
for _, volumeComponent := range volumeComponents {
|
|
25
|
-
|
|
25
|
+
volName := volumeComponent.Name
|
|
26
26
|
if bool(*volumeComponent.Volume.Ephemeral) == true {
|
|
27
|
-
emptyDir, err := getEmptyDir(
|
|
27
|
+
emptyDir, err := getEmptyDir(volName, volumeComponent.Volume.Size)
|
|
28
28
|
if err != nil {
|
|
29
29
|
return nil, nil, err
|
|
30
30
|
}
|
|
31
31
|
volumes = append(volumes, emptyDir)
|
|
32
32
|
} else {
|
|
33
|
-
|
|
33
|
+
pvcName := fmt.Sprintf("%s-%s", volumeNamePrefix, volumeComponent.Name)
|
|
34
34
|
pvcNameToPvcOptions[volumeComponent.Name] = pvcOptions{
|
|
35
|
-
Name:
|
|
35
|
+
Name: pvcName,
|
|
36
36
|
Size: volumeComponent.Volume.Size,
|
|
37
37
|
}
|
|
38
|
+
volumes = append(volumes, getPersistentVolumeClaim(volName, pvcName))
|
|
38
39
|
}
|
|
39
40
|
// containerNameToMountPaths is a map of the Devfile container name to their Devfile Volume Mount Paths for a given Volume Name
|
|
40
41
|
containerNameToMountPaths := make(map[string][]string)
|
|
41
42
|
for _, containerComp := range containerComponents {
|
|
42
43
|
for _, volumeMount := range containerComp.Container.VolumeMounts {
|
|
43
|
-
if
|
|
44
|
+
if volName == volumeMount.Name {
|
|
44
45
|
containerNameToMountPaths[containerComp.Name] = append(containerNameToMountPaths[containerComp.Name], generator.GetVolumeMountPath(volumeMount))
|
|
45
46
|
}
|
|
46
47
|
}
|
|
47
48
|
}
|
|
48
49
|
|
|
49
|
-
addVolumeMountToContainers(containers, initContainers,
|
|
50
|
+
addVolumeMountToContainers(containers, initContainers, volumeComponent.Name, containerNameToMountPaths)
|
|
50
51
|
}
|
|
51
52
|
|
|
52
53
|
return volumes, pvcNameToPvcOptions, nil
|