Merge pull request #222 from wlan0/master

use default mountPropagation of HostToContainer and support for MountPropagationNone
koki · May 25, 2018 · bfbff4b · bfbff4b
2 parents 1cf4f3c + ea84f00
commit bfbff4b
Show file tree

Hide file tree

Showing 9 changed files with 15 additions and 9 deletions.
diff --git a/converter/converters/koki_pod_to_kube_v1_pod.go b/converter/converters/koki_pod_to_kube_v1_pod.go
@@ -1546,14 +1546,16 @@ func revertVolumeMounts(mounts []types.VolumeMount) []v1.VolumeMount {
 }
 
 func revertMountPropagation(prop types.MountPropagation) *v1.MountPropagationMode {
-	var mode v1.MountPropagationMode
+	mode := v1.MountPropagationHostToContainer
 
-	if prop == types.MountPropagationHostToContainer {
-		mode = v1.MountPropagationHostToContainer
-	}
 	if prop == types.MountPropagationBidirectional {
 		mode = v1.MountPropagationBidirectional
 	}
+
+	if prop == types.MountPropagationNone {
+		mode = v1.MountPropagationNone
+	}
+
 	return &mode
 }
 

diff --git a/converter/converters/kube_v1_pod_to_koki.go b/converter/converters/kube_v1_pod_to_koki.go
@@ -1268,6 +1268,8 @@ func convertMountPropagation(p v1.MountPropagationMode) (types.MountPropagation,
 		return types.MountPropagationHostToContainer, nil
 	} else if p == v1.MountPropagationBidirectional {
 		return types.MountPropagationBidirectional, nil
+	} else if p == v1.MountPropagationNone {
+		return types.MountPropagationNone, nil
 	}
 	return "", serrors.InvalidInstanceError(p)
 }

diff --git a/testdata/pod_preset/pod_preset.short.yaml b/testdata/pod_preset/pod_preset.short.yaml
@@ -4,6 +4,7 @@ pod_preset:
   mounts:
   - mount: /cache
     store: cache-volume
+    propagation: host-to-container
   name: allow-database
   selector:
     role: frontend

diff --git a/testdata/pod_preset/pod_preset.yaml b/testdata/pod_preset/pod_preset.yaml
@@ -11,7 +11,7 @@ spec:
       role: frontend
   volumeMounts:
   - mountPath: /cache
-    mountPropagation: ""
+    mountPropagation: "HostToContainer"
     name: cache-volume
   volumes:
   - emptyDir: {}

diff --git a/testdata/stateful_sets/stateful_set.rekube.yaml b/testdata/stateful_sets/stateful_set.rekube.yaml
@@ -25,7 +25,7 @@ spec:
         resources: {}
         volumeMounts:
         - mountPath: /usr/share/nginx/html
-          mountPropagation: ""
+          mountPropagation: "HostToContainer"
           name: www
       terminationGracePeriodSeconds: 10
   updateStrategy:

diff --git a/testdata/storage_class/storage_class.short.yaml b/testdata/storage_class/storage_class.short.yaml
@@ -8,5 +8,5 @@ storage_class:
     secretNamespace: ""
   provisioner: kubernetes.io/glusterfs
   version: storage.k8s.io/v1
-  binding_mode: wait-for-first-customer
+  binding_mode: wait-for-first-consumer
 
diff --git a/testdata/storage_class/storage_class.yaml b/testdata/storage_class/storage_class.yaml
@@ -9,4 +9,4 @@ parameters:
   secretNamespace: ""
   secretName: ""
 allowVolumeExpansion: true
-volumeBindingMode: WaitForFirstCustomer
+volumeBindingMode: WaitForFirstConsumer
diff --git a/tests/functional_test.go b/tests/functional_test.go
@@ -107,7 +107,7 @@ func TestStatefulSets(t *testing.T) {
 }
 
 func TestStorageClass(t *testing.T) {
-	err := testResource("stateful_sets", testFuncGenerator(t))
+	err := testResource("storage_class", testFuncGenerator(t))
 	if err != nil {
 		t.Fatal(err)
 	}

diff --git a/types/container.go b/types/container.go
@@ -79,6 +79,7 @@ type MountPropagation string
 const (
 	MountPropagationHostToContainer MountPropagation = "host-to-container"
 	MountPropagationBidirectional   MountPropagation = "bidirectional"
+	MountPropagationNone            MountPropagation = "none"
 )
 
 type TerminationMessagePolicy string