fix config path broken in kubeadm

4ec40e37 · xilabao · fe44d1f5 · 4ec40e37 · 4ec40e37
Commit 4ec40e37 authored Apr 21, 2017 by xilabao
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

manifests.go cmd/kubeadm/app/master/manifests.go +1 -1

manifests_test.go cmd/kubeadm/app/master/manifests_test.go +1 -1

No files found.
--- a/cmd/kubeadm/app/master/manifests.go
+++ b/cmd/kubeadm/app/master/manifests.go
@@ -242,7 +242,7 @@ func k8sVolume(cfg *kubeadmapi.MasterConfiguration) api.Volume {
 func k8sVolumeMount() api.VolumeMount {
 	return api.VolumeMount{
 		Name:      "k8s",
-		MountPath: "/etc/kubernetes/",
+		MountPath: kubeadmapi.GlobalEnvParams.KubernetesDir,
 		ReadOnly:  true,
 	}
 }

--- a/cmd/kubeadm/app/master/manifests_test.go
+++ b/cmd/kubeadm/app/master/manifests_test.go
@@ -299,7 +299,7 @@ func TestK8sVolumeMount(t *testing.T) {
 		{
 			expected: api.VolumeMount{
 				Name:      "k8s",
-				MountPath: "/etc/kubernetes/",
+				MountPath: kubeadmapi.GlobalEnvParams.KubernetesDir,
 				ReadOnly:  true,
 			},
 		},