Revert "make private key optional to support hardware tokens for SSH"

This commit is contained in:
Karim Naufal
2022-01-25 13:17:40 +01:00
committed by GitHub
parent 214d0bf98b
commit 1ed7932dc9
4 changed files with 7 additions and 14 deletions

View File

@@ -24,8 +24,7 @@ resource "hcloud_server" "first_control_plane" {
connection {
user = "root"
private_key = var.private_key == null ? null : file(var.private_key)
agent_identity = var.private_key == null ? file(var.public_key) : null
private_key = file(var.private_key)
host = self.ipv4_address
}
}
@@ -36,8 +35,7 @@ resource "hcloud_server" "first_control_plane" {
connection {
user = "root"
private_key = var.private_key == null ? null : file(var.private_key)
agent_identity = var.private_key == null ? file(var.public_key) : null
private_key = file(var.private_key)
host = self.ipv4_address
}
}
@@ -45,7 +43,7 @@ resource "hcloud_server" "first_control_plane" {
# Wait for k3os to be ready and fetch kubeconfig.yaml
provisioner "local-exec" {
command = <<-EOT
sleep 60 && ping ${self.ipv4_address} | grep --line-buffered "bytes from" | head -1 && sleep 100 && scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i ${var.private_key == null ? var.public_key : var.private_key} rancher@${self.ipv4_address}:/etc/rancher/k3s/k3s.yaml ${path.module}/kubeconfig.yaml
sleep 60 && ping ${self.ipv4_address} | grep --line-buffered "bytes from" | head -1 && sleep 100 && scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null -i ${var.private_key} rancher@${self.ipv4_address}:/etc/rancher/k3s/k3s.yaml ${path.module}/kubeconfig.yaml
sed -i -e 's/127.0.0.1/${self.ipv4_address}/g' ${path.module}/kubeconfig.yaml
EOT
}