From 577e5c127358fb948c33ff30877c76b526136419 Mon Sep 17 00:00:00 2001 From: joshsiv-mulga Date: Mon, 11 May 2026 15:46:48 +1000 Subject: [PATCH] fix(ddil): default guest SSH user to ec2-user MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Shell E2E SSHes the same ami-ubuntu-* images as ec2-user (tests/e2e/run-multinode-e2e.sh:650). DDIL harness defaulted to ubuntu and hit 'unable to authenticate, attempted methods [none publickey]' — authorized_keys is provisioned under the AMI default account, which is ec2-user, not ubuntu. Continues mulga-siv-57. --- tests/e2e/ddil/harness/witness.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tests/e2e/ddil/harness/witness.go b/tests/e2e/ddil/harness/witness.go index 45d5ff0e2..d8cdc2ec1 100644 --- a/tests/e2e/ddil/harness/witness.go +++ b/tests/e2e/ddil/harness/witness.go @@ -62,7 +62,9 @@ type Witness struct { // names that change between releases. // - DDIL_WITNESS_KEY_NAME (default spinifex-key) — EC2 key pair name // the daemon injects via cloud-init. -// - DDIL_GUEST_SSH_USER (default ubuntu) — user for guest SSH. +// - DDIL_GUEST_SSH_USER (default ec2-user) — user for guest SSH; matches +// the default account on the cluster's ami-ubuntu-* images (shell E2E +// uses the same login at tests/e2e/run-multinode-e2e.sh:650). // - DDIL_GUEST_SSH_KEY (required) — private key for guest SSH; must // pair with the public material registered under DDIL_WITNESS_KEY_NAME // so authorized_keys on the cloud-init guest accepts it. @@ -114,7 +116,7 @@ func NewWitness(cluster *Cluster, transport SSH) (*Witness, error) { ssh: transport, hostSigner: hostSigner, guestSigner: guestSigner, - guestUser: envDefault("DDIL_GUEST_SSH_USER", "ubuntu"), + guestUser: envDefault("DDIL_GUEST_SSH_USER", "ec2-user"), ami: os.Getenv("DDIL_WITNESS_AMI"), instanceType: os.Getenv("DDIL_WITNESS_INSTANCE_TYPE"), keyName: envDefault("DDIL_WITNESS_KEY_NAME", "spinifex-key"),