kubelet: Fix ConfigMap on Windows.

2016-11-16 09:40:29 -05:00
parent 68f123dfa0
commit 0cbf75c400
5 changed files with 136 additions and 48 deletions
--- a/pkg/kubelet/kubelet_pods_windows_test.go
+++ b/pkg/kubelet/kubelet_pods_windows_test.go
@@ -0,0 +1,100 @@
+// +build windows
+
+/*
+Copyright 2017 The Kubernetes Authors.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
+package kubelet
+
+import (
+	"testing"
+
+	"github.com/stretchr/testify/assert"
+	"k8s.io/kubernetes/pkg/api/v1"
+	kubecontainer "k8s.io/kubernetes/pkg/kubelet/container"
+)
+
+func TestMakeMountsWindows(t *testing.T) {
+	container := v1.Container{
+		VolumeMounts: []v1.VolumeMount{
+			{
+				MountPath: "c:/etc/hosts",
+				Name:      "disk",
+				ReadOnly:  false,
+			},
+			{
+				MountPath: "c:/mnt/path3",
+				Name:      "disk",
+				ReadOnly:  true,
+			},
+			{
+				MountPath: "c:/mnt/path4",
+				Name:      "disk4",
+				ReadOnly:  false,
+			},
+			{
+				MountPath: "c:/mnt/path5",
+				Name:      "disk5",
+				ReadOnly:  false,
+			},
+		},
+	}
+
+	podVolumes := kubecontainer.VolumeMap{
+		"disk":  kubecontainer.VolumeInfo{Mounter: &stubVolume{path: "c:/mnt/disk"}},
+		"disk4": kubecontainer.VolumeInfo{Mounter: &stubVolume{path: "c:/mnt/host"}},
+		"disk5": kubecontainer.VolumeInfo{Mounter: &stubVolume{path: "c:/var/lib/kubelet/podID/volumes/empty/disk5"}},
+	}
+
+	pod := v1.Pod{
+		Spec: v1.PodSpec{
+			HostNetwork: true,
+		},
+	}
+
+	mounts, _ := makeMounts(&pod, "/pod", &container, "fakepodname", "", "", podVolumes)
+
+	expectedMounts := []kubecontainer.Mount{
+		{
+			Name:           "disk",
+			ContainerPath:  "c:/etc/hosts",
+			HostPath:       "c:/mnt/disk",
+			ReadOnly:       false,
+			SELinuxRelabel: false,
+		},
+		{
+			Name:           "disk",
+			ContainerPath:  "c:/mnt/path3",
+			HostPath:       "c:/mnt/disk",
+			ReadOnly:       true,
+			SELinuxRelabel: false,
+		},
+		{
+			Name:           "disk4",
+			ContainerPath:  "c:/mnt/path4",
+			HostPath:       "c:/mnt/host",
+			ReadOnly:       false,
+			SELinuxRelabel: false,
+		},
+		{
+			Name:           "disk5",
+			ContainerPath:  "c:/mnt/path5",
+			HostPath:       "c:/var/lib/kubelet/podID/volumes/empty/disk5",
+			ReadOnly:       false,
+			SELinuxRelabel: false,
+		},
+	}
+	assert.Equal(t, expectedMounts, mounts, "mounts of container %+v", container)
+}