Skip to content

Fix(connector): gracefully handle LANG environment setup failures-Update ssh.go #2552

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
merged 4 commits into from
May 6, 2025
Merged

Fix(connector): gracefully handle LANG environment setup failures-Update ssh.go #2552

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
1decb2e
Update ssh.go
zmoon460 May 5, 2025
0395d60
Update ssh.go
zmoon460 May 5, 2025
96fb954
Fix: no sudo env export fail
zmoon460 May 5, 2025
558a386
Update ssh.go
zmoon460 May 5, 2025
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
4 changes: 2 additions & 2 deletions cmd/kk/pkg/core/connector/ssh.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -259,9 +259,9 @@ func (c *connection) session() (*ssh.Session, error) {
}

if err := sess.Setenv("LANG", "en_US.UTF-8"); err != nil { // try make sure work with english language environments
return nil, err
logger.Log.Debugf("Failed to enforce LANG=en_US.UTF-8. (Error: %v)", err)
}

return sess, nil
}

Expand Down
9 changes: 8 additions & 1 deletion cmd/kk/pkg/filesystem/task.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,12 +19,13 @@ package filesystem
import (
"fmt"
"os/exec"

"os"
"github.com/pkg/errors"

"github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/action"
"github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/connector"
"github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/util"
"github.com/kubesphere/kubekey/v3/cmd/kk/pkg/core/logger"
)

type ChownFileAndDir struct {
Expand Down Expand Up @@ -64,6 +65,12 @@ type LocalTaskChown struct {

func (l *LocalTaskChown) Execute(runtime connector.Runtime) error {
if exist := util.IsExist(l.Path); exist {
// Check environment variables first
if os.Getenv("SUDO_UID") == "" || os.Getenv("SUDO_GID") == "" {
logger.Log.Infof("Skip chown for %s: SUDO_UID/GID missing (not using sudo)", l.Path)
return nil
}

if err := exec.Command("/bin/sh", "-c", fmt.Sprintf("chown -R ${SUDO_UID}:${SUDO_GID} %s", l.Path)).Run(); err != nil {
return errors.Wrapf(errors.WithStack(err), "chown %s failed", l.Path)
}
Expand Down