Merge pull request #39429 from apprenda/kubeadm_80-change_etcd_datadir

Automatic merge from submit-queue kubeadm: change etcd data dir to match host path. **What this PR does / why we need it**: Trivial change that adopts a well-known path for etcd data, following the `hostPath` defined. **Which issue this PR fixes**: Fixes https://github.com/kubernetes/kubeadm/issues/80 **Special notes for your reviewer**: /cc @luxas @kad

Merge pull request #39429 from apprenda/kubeadm_80-change_etcd_datadir
f605bfda · Kubernetes Submit Queue · GitHub · 6cbec8e6 · 241c5306 · f605bfda
Commit f605bfda authored Jan 05, 2017 by Kubernetes Submit Queue Committed by GitHub Jan 05, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 3 additions and 3 deletions

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

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
@@ -113,7 +113,7 @@ func WriteStaticPodManifests(cfg *kubeadmapi.MasterConfiguration) error {
 				"etcd",
 				"--listen-client-urls=http://127.0.0.1:2379",
 				"--advertise-client-urls=http://127.0.0.1:2379",
-				"--data-dir=/var/etcd/data",
+				"--data-dir=/var/lib/etcd",
 			},
 			VolumeMounts:  []api.VolumeMount{certsVolumeMount(), etcdVolumeMount(), k8sVolumeMount()},
 			Image:         images.GetCoreImage(images.KubeEtcdImage, cfg, kubeadmapi.GlobalEnvParams.EtcdImage),
@@ -161,7 +161,7 @@ func etcdVolume(cfg *kubeadmapi.MasterConfiguration) api.Volume {
 func etcdVolumeMount() api.VolumeMount {
 	return api.VolumeMount{
 		Name:      "etcd",
-		MountPath: "/var/etcd",
+		MountPath: "/var/lib/etcd",
 	}
 }


--- a/cmd/kubeadm/app/master/manifests_test.go
+++ b/cmd/kubeadm/app/master/manifests_test.go
@@ -103,7 +103,7 @@ func TestEtcdVolumeMount(t *testing.T) {
 		{
 			expected: api.VolumeMount{
 				Name:      "etcd",
-				MountPath: "/var/etcd",
+				MountPath: "/var/lib/etcd",
 			},
 		},
 	}