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.

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

Better handling of /etc/profile.d/juju-proxy.sh script creation #14841

Merged
merged 1 commit into from Oct 28, 2022
Merged

Better handling of /etc/profile.d/juju-proxy.sh script creation #14841

merged 1 commit into from Oct 28, 2022

Conversation

ghost
Copy link

@ghost ghost commented Oct 28, 2022

Better handling of /etc/profile.d/juju-proxy.sh script creation, so that both the controller direct script and non-controller cloud-init script behave as desired.

Checklist

  • Code style: imports ordered, good names, simple structure, etc
    - [] Comments saying why design decisions were made
  • Go unit tests, with comments saying what you're testing
    - [] Integration tests, with comments saying what you're testing
    - [] doc.go added or updated in changed packages

QA steps

Confirm there is no "command not found" output when doing juju ssh to a bootstrapped controller or a deployed unit and that the content of /etc/profile.d/juju-proxy.sh is as desired.

$ juju bootstrap lxd


$ juju ssh -m controller 0
[no "command not found" error]


$ juju ssh -m controller 0 'cat /etc/profile.d/juju-proxy.sh'

# Added by juju
[ -f "/etc/juju-proxy.conf" ] && . "/etc/juju-proxy.conf"


$ juju deploy -m default ubuntu


$ juju ssh -m default 0
[no "command not found" error]


$ juju ssh -m default 0 'cat /etc/profile.d/juju-proxy.sh'

# Added by juju
[ -f "/etc/juju-proxy.conf" ] && . "/etc/juju-proxy.conf"

Bug reference

https://bugs.launchpad.net/juju/+bug/1994911

@jujubot
Copy link
Collaborator

jujubot commented Oct 28, 2022

Thanks for opening a pull request! Please follow the instructions here to ensure your pull request is ready for review. Then, a maintainer will review your patch.

@hpidcock @anvial @juanmanuel-tirado

2 similar comments
@jujubot
Copy link
Collaborator

jujubot commented Oct 28, 2022

Thanks for opening a pull request! Please follow the instructions here to ensure your pull request is ready for review. Then, a maintainer will review your patch.

@hpidcock @anvial @juanmanuel-tirado

@jujubot
Copy link
Collaborator

jujubot commented Oct 28, 2022

Thanks for opening a pull request! Please follow the instructions here to ensure your pull request is ready for review. Then, a maintainer will review your patch.

@hpidcock @anvial @juanmanuel-tirado

@wallyworld
Copy link
Member

/merge

@jujubot jujubot merged commit 02966ef into juju:2.9 Oct 28, 2022
@jack-w-shaw jack-w-shaw mentioned this pull request Oct 31, 2022
jujubot added a commit that referenced this pull request Oct 31, 2022
jujubot added a commit that referenced this pull request Nov 2, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
3 participants