Skip to content

Commit

Permalink
Per feedback
Browse files Browse the repository at this point in the history
  • Loading branch information
tedteng committed Sep 8, 2023
1 parent fff5ed4 commit a071555
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 3 additions & 1 deletion pkg/cmd/ssh/connect_information.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ type ConnectInformation struct {

// Nodes is a list of Node objects containing information about the worker nodes.
Nodes []Node `json:"nodes"`
// User is the name of the Shoot cluster node ssh login username
User string
}

var _ fmt.Stringer = &ConnectInformation{}
Expand Down Expand Up @@ -198,7 +200,7 @@ func (p *ConnectInformation) String() string {
p.Bastion.UserKnownHostsFiles,
nodeHostname,
p.NodePrivateKeyFiles,
"",
p.User,
)

fmt.Fprintln(&buf, "Connect to shoot nodes by using the bastion as a proxy/jump host, for example:")
Expand Down
2 changes: 1 addition & 1 deletion pkg/cmd/ssh/options.go
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,7 @@ func (o *SSHOptions) AddFlags(flagSet *pflag.FlagSet) {
flagSet.StringVar(&o.BastionPort, "bastion-port", o.BastionPort, "SSH port of the bastion used for the SSH client command. Defaults to port 22")
flagSet.StringSliceVar(&o.BastionUserKnownHostsFiles, "bastion-user-known-hosts-file", o.BastionUserKnownHostsFiles, "Path to a custom known hosts file for the SSH connection to the bastion. This file is used to verify the public keys of remote hosts when establishing a secure connection.")
flagSet.BoolVarP(&o.ConfirmAccessRestriction, "confirm-access-restriction", "y", o.ConfirmAccessRestriction, "Bypasses the need for confirmation of any access restrictions. Set this flag only if you are fully aware of the access restrictions.")
flagSet.StringVar(&o.User, "user", o.User, "user is the name of the Shoot cluster node ssh login user name.")
flagSet.StringVar(&o.User, "user", o.User, "user is the name of the Shoot cluster node ssh login username.")
o.Options.AddFlags(flagSet)
}

Expand Down

0 comments on commit a071555

Please sign in to comment.