Skip to content

fix: add ssh config quotes & deployment recreate strategy #2487

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

Merged
FabianKramm merged 2 commits into from
Jan 9, 2023
Merged

fix: add ssh config quotes & deployment recreate strategy #2487

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ada1921
fix: add ssh config quotes
FabianKramm Jan 9, 2023
f47fc6f
refactor: use deployment strategy replace for replaced pods
FabianKramm Jan 9, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions pkg/devspace/services/podreplace/builder.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,9 @@ func buildDeployment(ctx devspacecontext.Context, name string, target runtime.Ob
deployment.Spec.Selector.MatchExpressions = nil
}
deployment.Spec.Selector.MatchLabels[selector.ReplacedLabel] = "true"
deployment.Spec.Strategy = appsv1.DeploymentStrategy{
Type: appsv1.RecreateDeploymentStrategyType,
}

// make sure labels etc are there
if ctx.Log().GetLevel() == logrus.DebugLevel {
Expand Down
2 changes: 1 addition & 1 deletion pkg/devspace/services/ssh/config.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@ func addHost(path, host, port string) (string, error) {
newLines = append(newLines, " HostName localhost")
newLines = append(newLines, " LogLevel error")
newLines = append(newLines, " Port "+port)
newLines = append(newLines, " IdentityFile "+DevSpaceSSHPrivateKeyFile)
newLines = append(newLines, " IdentityFile \""+DevSpaceSSHPrivateKeyFile+"\"")
newLines = append(newLines, " StrictHostKeyChecking no")
newLines = append(newLines, " UserKnownHostsFile /dev/null")
newLines = append(newLines, " User devspace")
Expand Down