Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix calling appendKnownHelper when not needed #17030

Merged
merged 3 commits into from
Aug 16, 2023
Merged

Fix calling appendKnownHelper when not needed #17030

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0fb13b8
Fix calling appendKnownHelper when not needed
spowelljr Aug 9, 2023
a54049c
only add envs to command is using containerd
spowelljr Aug 9, 2023
a3fe75d
temp: only run on containerd to fix regression
spowelljr Aug 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
17 changes: 12 additions & 5 deletions cmd/minikube/cmd/docker-env.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,16 +414,23 @@ docker-cli install instructions: https://minikube.sigs.k8s.io/docs/tutorials/doc
}
cmd := exec.Command(path, d.GetSSHKeyPath())
cmd.Stderr = os.Stderr
cmd.Env = append(cmd.Env, fmt.Sprintf("SSH_AUTH_SOCK=%s", co.Config.SSHAuthSock))
cmd.Env = append(cmd.Env, fmt.Sprintf("SSH_AGENT_PID=%d", co.Config.SSHAgentPID))

// TODO: refactor to work with docker, temp fix to resolve regression
if cr == constants.Containerd {
cmd.Env = append(cmd.Env, fmt.Sprintf("SSH_AUTH_SOCK=%s", co.Config.SSHAuthSock))
cmd.Env = append(cmd.Env, fmt.Sprintf("SSH_AGENT_PID=%d", co.Config.SSHAgentPID))
}
err = cmd.Run()
if err != nil {
exit.Error(reason.IfSSHClient, "Error with ssh-add", err)
}
}

// eventually, run something similar to ssh --append-known
appendKnownHelper(nodeName, true)
// TODO: refactor to work with docker, temp fix to resolve regression
if cr == constants.Containerd {
// eventually, run something similar to ssh --append-known
appendKnownHelper(nodeName, true)
}
}
},
}

Expand Down