From 60df88be9bb25ba28888825355bd679abe4bd7d0 Mon Sep 17 00:00:00 2001 From: Jacob Weinstock Date: Wed, 21 Feb 2024 07:25:53 -0700 Subject: [PATCH 1/2] Update to latest stack helm chart version Signed-off-by: Jacob Weinstock --- vagrant/.env | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vagrant/.env b/vagrant/.env index 7c9b5ff0..5f508e3b 100644 --- a/vagrant/.env +++ b/vagrant/.env @@ -5,6 +5,6 @@ MACHINE1_IP=192.168.56.43 MACHINE1_MAC=08:00:27:9e:f5:3a # https://github.com/tinkerbell/charts/pkgs/container/charts%2Fstack -HELM_CHART_VERSION=0.4.2 +HELM_CHART_VERSION=0.4.3 KUBECTL_VERSION=1.28.3 K3D_VERSION=v5.6.0 From 7aa606f16818ac328e8f7e892dcfc283a6f5d54a Mon Sep 17 00:00:00 2001 From: Jacob Weinstock Date: Wed, 21 Feb 2024 07:25:58 -0700 Subject: [PATCH 2/2] Enable password auth differently: The previous sed command wasnt working. The new ubuntu cloud image seems to write a different file for ssh settings. This fixes the issue of ssh not allowing password logins. Signed-off-by: Jacob Weinstock --- vagrant/template.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/vagrant/template.yaml b/vagrant/template.yaml index 89e76985..17369ba9 100644 --- a/vagrant/template.yaml +++ b/vagrant/template.yaml @@ -57,7 +57,7 @@ spec: FS_TYPE: ext4 CHROOT: y DEFAULT_INTERPRETER: "/bin/sh -c" - CMD_LINE: "ssh-keygen -A; systemctl enable ssh.service; sed -i 's/^PasswordAuthentication no/PasswordAuthentication yes/g' /etc/ssh/sshd_config" + CMD_LINE: "ssh-keygen -A; systemctl enable ssh.service; echo 'PasswordAuthentication yes' > /etc/ssh/sshd_config.d/60-cloudimg-settings.conf" - name: "disable-apparmor" image: quay.io/tinkerbell-actions/cexec:v1.0.0 timeout: 90