fix: use ed25519 ssh keys when juju sshing #17900
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
hpidcock
added
do not merge
hpidcock
force-pushed
the
fix-ed25519-keys
branch
from
821a47c to
4f636ce
Compare
|
/merge |
hpidcock
removed
the
do not merge
jujubot
added a commit
that referenced
this pull request
Aug 15, 2024
#17930 Merge 3.5 into 3.6, contains: * #17929 from hmlanigan/update-juju-client-backup-download * #17904 from hpidcock/merge-3.4-3.5-20240812 * #17900 from hpidcock/fix-ed25519-keys * #17769 from barrettj12/autogen-matrix Conflicts in: * .github/workflows/static-analysis.yml * apiserver/common/tools_test.go * go.mod * go.sum * tests/suites/static_analysis/lint_go.sh
jujubot
added a commit
that referenced
this pull request
Aug 19, 2024
#17938 Changes: - Drops v6 Client facade in favour of v8 Client facade (also in 3.6) - Drops v7 Client facade in favour of v8 Client facade (also in 3.6) Forward ports: - #17756 - #17700 - #17772 - #17747 - #17789 - #17792 - #17788 - #17793 - #17794 - #17811 - #17816 - #17825 - #17826 - #17867 - #17871 - #17868 - #17870 - #17769 - #17877 - #17879 - #17836 - #17889 - #17845 - #17896 - #17512 - #17900 - #17891 - #17901 - #17684 - #17903 - #17904 - #17929 - #17930 - #17833 - #17897 - #17806 Conflicts: - api/agent/fanconfigurer/facade.go - api/state_test.go - apiserver/common/tools_test.go - apiserver/facades/client/client/backend.go - apiserver/facades/client/client/client.go - apiserver/facades/client/client/client_test.go - apiserver/facades/client/client/export_test.go - apiserver/facades/client/client/register.go - apiserver/facades/client/client/status.go - apiserver/facades/client/client/statushistory_test.go - cmd/juju/backups/download.go - cmd/juju/model/destroy.go - core/lxdprofile/name.go - go.mod - go.sum - internal/provider/azure/doc.go - internal/provider/azure/internal/errorutils/errors_test.go - internal/proxy/config/fanconfigurer_test.go - internal/proxy/config/package_mock_test.go - internal/proxy/config/package_test.go - internal/worker/instancemutater/mutater.go - internal/worker/instancemutater/mutater_test.go - internal/worker/instancemutater/worker_test.go - internal/worker/peergrouper/worker.go - internal/worker/provisioner/provisioner_task.go - internal/worker/uniter/runner/runner.go - internal/worker/uniter/runner/runner_test.go - internal/worker/uniter/util_test.go - snap/snapcraft.yaml - state/cloudcredentials.go - state/cloudcredentials_test.go - state/migration_import.go - state/migration_import_test.go - tests/suites/static_analysis/lint_go.sh - worker/fanconfigurer/fanconfigurer.go - worker/peergrouper/worker_test.go
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
OpenSSH shim in juju/utils was only finding rsa, dsa and ecdsa private keys. This PR updates juju/utils/v3 to v3.2.0 with changes to also find ed25519 keys.
See juju/utils#338
QA steps
ssh-keygen -t ed25519If you can ssh to the controller machine then this has been fixed. Can also confirm the ed25519 key is the only one in the model with
juju ssh-keys --fullDocumentation changes
N/A
Links
Launchpad bug: https://bugs.launchpad.net/juju/+bug/2012208
Jira card: JUJU-6515