Merge pull request #44753 from xilabao/fix-config-path-broken

Automatic merge from submit-queue (batch tested with PRs 44583, 44139, 44753) fix config path broken in kubeadm fixes https://github.com/kubernetes/kubeadm/issues/234

Merge pull request #44753 from xilabao/fix-config-path-broken
fb72285a · Kubernetes Submit Queue · GitHub · 81d6fedb · 4ec40e37 · fb72285a
Commit fb72285a authored Apr 25, 2017 by Kubernetes Submit Queue Committed by GitHub Apr 25, 2017
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
@@ -264,7 +264,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
@@ -370,7 +370,7 @@ func TestK8sVolumeMount(t *testing.T) {
 		{
 			expected: api.VolumeMount{
 				Name:      "k8s",
-				MountPath: "/etc/kubernetes/",
+				MountPath: kubeadmapi.GlobalEnvParams.KubernetesDir,
 				ReadOnly:  true,
 			},
 		},