-
Notifications
You must be signed in to change notification settings - Fork 119
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.
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
Libssh in provision #1261
base: main
Are you sure you want to change the base?
Libssh in provision #1261
Conversation
[APPROVALNOTIFIER] This PR is NOT APPROVED This pull-request has been approved by: The full list of commands accepted by this bot can be found here.
Needs approval from an approver in each of these files:
Approvers can indicate their approval by writing |
cc: @dhiller |
/test all |
@@ -38,7 +39,7 @@ func NewProvisionCommand() *cobra.Command { | |||
provision.Flags().StringP("memory", "m", "3096M", "amount of ram per node") | |||
provision.Flags().UintP("cpu", "c", 2, "number of cpu cores per node") | |||
provision.Flags().String("qemu-args", "", "additional qemu args to pass through to the nodes") | |||
provision.Flags().Bool("random-ports", false, "expose all ports on random localhost ports") | |||
provision.Flags().Bool("random-ports", true, "expose all ports on random localhost ports") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I wonder why we have this flag, @brianmcarey ?
@@ -241,7 +257,7 @@ func provisionCluster(cmd *cobra.Command, args []string) (retErr error) { | |||
|
|||
envVars := fmt.Sprintf("version=%s slim=%t", version, slim) | |||
if strings.Contains(phases, "linux") { | |||
err = performPhase(cli, nodeContainer(prefix, nodeName), "/scripts/provision.sh", envVars) | |||
err := sshClient.Command("sudo " + envVars + " /bin/bash /scripts/provision.sh") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Are these scripts copied at this stage?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
no they weren't. i moved the copying to happen earlier
@@ -252,7 +268,7 @@ func provisionCluster(cmd *cobra.Command, args []string) (retErr error) { | |||
if err != nil { | |||
return err | |||
} | |||
err = _cmd(cli, nodeContainer(prefix, nodeName), "if [ -f /scripts/extra-pre-pull-images ]; then scp -o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no -i vagrant.key -P 22 /scripts/extra-pre-pull-images [email protected]:/tmp/extra-pre-pull-images; fi", "copying /scripts/extra-pre-pull-images if existing") | |||
err = _cmd(cli, nodeContainer(prefix, nodeName), "", "copying /scripts/extra-pre-pull-images if existing") |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What do we do here?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I think was left erroneously from when i was testing stuff. i'll remove it
64ba83e
to
56e780e
Compare
Copy all the scripts directory to the vm during provisioning. Modify all instances of ssh.sh to use the sshClient instead. Expose host ports in provisioning by default Signed-off-by: aerosouund <[email protected]>
Signed-off-by: aerosouund <[email protected]>
56e780e
to
d5c3057
Compare
@aerosouund: The following tests failed, say
Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. I understand the commands that are listed here. |
PR needs rebase. Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes-sigs/prow repository. |
What this PR does / why we need it:
Removes occurrences of ssh.sh from the provision command in the gocli, this should have the benefit of ending the timeout during shutdown flake since ssh connection is made directly to the VM without an intermediary
Checklist
This checklist is not enforcing, but it's a reminder of items that could be relevant to every PR.
Approvers are expected to review this list.
Release note: