kubernetes
/
minikube
mirror of https://github.com/kubernetes/minikube.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fix inverted certificate symlink logic

pull/6889/head
Thomas Stromberg 2020-03-04 13:53:11 -08:00
parent aa91f39ffb
commit 3f40bdcc47
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/minikube/bootstrapper/certs.go
View File

@ -130,9 +130,8 @@ func SetupCerts(cmd command.Runner, k8s config.KubernetesConfig, n config.Node)
} }
} }
// configure CA certificates if err := installCertSymlinks(cmd, caCerts); err != nil {
if err := configureCACerts(cmd, caCerts); err != nil { return errors.Wrapf(err, "certificate symlinks")
return errors.Wrapf(err, "Configuring CA certs")
} }
return nil return nil
} }
@ -318,9 +317,9 @@ func getSubjectHash(cr command.Runner, filePath string) (string, error) {
return stringHash, nil return stringHash, nil
} }
// configureCACerts looks up and installs all uploaded PEM certificates in /usr/share/ca-certificates to system-wide certificate store (/etc/ssl/certs). // installCertSymlinks installs certs in /usr/share/ca-certificates into system-wide certificate store (/etc/ssl/certs).
// OpenSSL binary required in minikube ISO // OpenSSL binary required in minikube ISO
func configureCACerts(cr command.Runner, caCerts map[string]string) error { func installCertSymlinks(cr command.Runner, caCerts map[string]string) error {
hasSSLBinary := true hasSSLBinary := true
_, err := cr.RunCmd(exec.Command("openssl", "version")) _, err := cr.RunCmd(exec.Command("openssl", "version"))
if err != nil { if err != nil {
@ -334,7 +333,8 @@ func configureCACerts(cr command.Runner, caCerts map[string]string) error {
for _, caCertFile := range caCerts { for _, caCertFile := range caCerts {
dstFilename := path.Base(caCertFile) dstFilename := path.Base(caCertFile)
certStorePath := path.Join(vmpath.GuestCertStoreDir, dstFilename) certStorePath := path.Join(vmpath.GuestCertStoreDir, dstFilename)
cmd := fmt.Sprintf("test -f %s || ln -fs %s %s", caCertFile, certStorePath, caCertFile) // If the cert really exists, add a named symlink
cmd := fmt.Sprintf("test -f %s && ln -fs %s %s", caCertFile, caCertFile, certStorePath)
if _, err := cr.RunCmd(exec.Command("sudo", "/bin/bash", "-c", cmd)); err != nil { if _, err := cr.RunCmd(exec.Command("sudo", "/bin/bash", "-c", cmd)); err != nil {
return errors.Wrapf(err, "create symlink for %s", caCertFile) return errors.Wrapf(err, "create symlink for %s", caCertFile)
} }