github/kubernetes
1
0
Fork 0
mirror of https://github.com/k3s-io/kubernetes.git synced 2025-07-27 21:47:07 +00:00
Code Issues Projects Releases Wiki Activity

kubeadm: change etcd data dir to match host path.

Browse Source 
Fixes https://github.com/kubernetes/kubeadm/issues/80
This commit is contained in:
Paulo Pires 2017-01-04 16:43:12 +00:00
parent f143ce01e9
commit 241c530648
No known key found for this signature in database
GPG Key ID: F3F6ED5C522EAA71
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/kubeadm/app/master/manifests.go
View File

@ -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",
}
}

2
cmd/kubeadm/app/master/manifests_test.go
View File

@ -103,7 +103,7 @@ func TestEtcdVolumeMount(t *testing.T) {
{
expected: api.VolumeMount{
Name: "etcd",
MountPath: "/var/etcd",
MountPath: "/var/lib/etcd",
},
},
}