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

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

Browse Source 
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
This commit is contained in:
Kubernetes Submit Queue 2017-04-25 13:52:39 -07:00 committed by GitHub
commit fb72285a78
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -264,7 +264,7 @@ func k8sVolume(cfg *kubeadmapi.MasterConfiguration) api.Volume {
func k8sVolumeMount() api.VolumeMount { func k8sVolumeMount() api.VolumeMount {
return api.VolumeMount{ return api.VolumeMount{
Name: "k8s", Name: "k8s",
MountPath: "/etc/kubernetes/", MountPath: kubeadmapi.GlobalEnvParams.KubernetesDir,
ReadOnly: true, ReadOnly: true,
} }
} }

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

@ -370,7 +370,7 @@ func TestK8sVolumeMount(t *testing.T) {
{ {
expected: api.VolumeMount{ expected: api.VolumeMount{
Name: "k8s", Name: "k8s",
MountPath: "/etc/kubernetes/", MountPath: kubeadmapi.GlobalEnvParams.KubernetesDir,
ReadOnly: true, ReadOnly: true,
}, },
}, },