提交 2223c895 编写于 作者: T Thomas Stromberg

Check for etcd, but not /etc

上级 39c0c8be
...@@ -95,14 +95,11 @@ var KubeadmExtraArgsWhitelist = map[int][]string{ ...@@ -95,14 +95,11 @@ var KubeadmExtraArgsWhitelist = map[int][]string{
} }
// remote artifacts that must exist for minikube to function properly. The sign of a previously working installation. // remote artifacts that must exist for minikube to function properly. The sign of a previously working installation.
// NOTE: /etc is not persistent across restarts, so don't bother checking there
var expectedArtifacts = []string{ var expectedArtifacts = []string{
"/etc/kubernetes/scheduler.conf",
"/etc/kubernetes/kubelet.conf",
"/var/lib/kubelet/kubeadm-flags.env", "/var/lib/kubelet/kubeadm-flags.env",
"/var/lib/kubelet/config.yaml", "/var/lib/kubelet/config.yaml",
"/var/lib/minikube", etcdDataDir(),
"/etc/kubernetes/manifests/kube-apiserver.yaml",
"/etc/kubernetes/manifests/etcd.yaml",
} }
// yamlConfigPath is the path to the kubeadm configuration // yamlConfigPath is the path to the kubeadm configuration
...@@ -234,7 +231,8 @@ func (k *Bootstrapper) createCompatSymlinks() error { ...@@ -234,7 +231,8 @@ func (k *Bootstrapper) createCompatSymlinks() error {
} }
func (k *Bootstrapper) existingConfig() error { func (k *Bootstrapper) existingConfig() error {
_, err := k.c.RunCmd(exec.Command("ls", expectedArtifacts...)) args := append([]string{"ls"}, expectedArtifacts...)
_, err := k.c.RunCmd(exec.Command("sudo", args...))
return err return err
} }
...@@ -266,7 +264,7 @@ func (k *Bootstrapper) StartCluster(k8s config.KubernetesConfig) error { ...@@ -266,7 +264,7 @@ func (k *Bootstrapper) StartCluster(k8s config.KubernetesConfig) error {
ignore := []string{ ignore := []string{
fmt.Sprintf("DirAvailable-%s", strings.Replace(vmpath.GuestManifestsDir, "/", "-", -1)), fmt.Sprintf("DirAvailable-%s", strings.Replace(vmpath.GuestManifestsDir, "/", "-", -1)),
fmt.Sprintf("DirAvailable-%s", strings.Replace(vmpath.GuestPersistentDir, "/", "-", -1)), fmt.Sprintf("DirAvailable-%s", strings.Replace(vmpath.GuestPersistentDir, "/", "-", -1)),
fmt.Sprintf("DirAvailable-%s", etcdDataDir(), "/", "-", -1)), fmt.Sprintf("DirAvailable-%s", strings.Replace(etcdDataDir(), "/", "-", -1)),
"FileAvailable--etc-kubernetes-manifests-kube-scheduler.yaml", "FileAvailable--etc-kubernetes-manifests-kube-scheduler.yaml",
"FileAvailable--etc-kubernetes-manifests-kube-apiserver.yaml", "FileAvailable--etc-kubernetes-manifests-kube-apiserver.yaml",
"FileAvailable--etc-kubernetes-manifests-kube-controller-manager.yaml", "FileAvailable--etc-kubernetes-manifests-kube-controller-manager.yaml",
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册