kjuulh/terraform-hcloud-kube-hetzner
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases Wiki Activity

Merge pull request #22 from phaer/optional-private-key

Browse Source 
make private key optional to support hardware tokens for SSH
This commit is contained in:
Karim Naufal 2022-01-25 13:11:51 +01:00 committed by GitHub
commit 214d0bf98b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
agents.tf
View File

@ -28,7 +28,8 @@ resource "hcloud_server" "agents" {
connection { connection {
user = "root" user = "root"
private_key = file(var.private_key) private_key = var.private_key == null ? null : file(var.private_key)
agent_identity = var.private_key == null ? file(var.public_key) : null
host = self.ipv4_address host = self.ipv4_address
} }
} }
@ -39,7 +40,8 @@ resource "hcloud_server" "agents" {
connection { connection {
user = "root" user = "root"
private_key = file(var.private_key) private_key = var.private_key == null ? null : file(var.private_key)
agent_identity = var.private_key == null ? file(var.public_key) : null
host = self.ipv4_address host = self.ipv4_address
} }
} }

8
master.tf
View File

@ -24,7 +24,8 @@ resource "hcloud_server" "first_control_plane" {
connection { connection {
user = "root" user = "root"
private_key = file(var.private_key) private_key = var.private_key == null ? null : file(var.private_key)
agent_identity = var.private_key == null ? file(var.public_key) : null
host = self.ipv4_address host = self.ipv4_address
} }
} }
@ -35,7 +36,8 @@ resource "hcloud_server" "first_control_plane" {
connection { connection {
user = "root" user = "root"
private_key = file(var.private_key) private_key = var.private_key == null ? null : file(var.private_key)
agent_identity = var.private_key == null ? file(var.public_key) : null
host = self.ipv4_address host = self.ipv4_address
} }
} }
@ -43,7 +45,7 @@ resource "hcloud_server" "first_control_plane" {
# Wait for k3os to be ready and fetch kubeconfig.yaml # Wait for k3os to be ready and fetch kubeconfig.yaml
provisioner "local-exec" { provisioner "local-exec" {
command = <<-EOT 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} 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 == null ? var.public_key : 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 sed -i -e 's/127.0.0.1/${self.ipv4_address}/g' ${path.module}/kubeconfig.yaml
EOT EOT
} }

6
servers.tf
View File

@ -27,7 +27,8 @@ resource "hcloud_server" "control_planes" {
connection { connection {
user = "root" user = "root"
private_key = file(var.private_key) private_key = var.private_key == null ? null : file(var.private_key)
agent_identity = var.private_key == null ? file(var.public_key) : null
host = self.ipv4_address host = self.ipv4_address
} }
} }
@ -38,7 +39,8 @@ resource "hcloud_server" "control_planes" {
connection { connection {
user = "root" user = "root"
private_key = file(var.private_key) private_key = var.private_key == null ? null : file(var.private_key)
agent_identity = var.private_key == null ? file(var.public_key) : null
host = self.ipv4_address host = self.ipv4_address
} }
} }

1
variables.tf
View File

@ -12,6 +12,7 @@ variable "public_key" {
variable "private_key" { variable "private_key" {
description = "SSH private Key." description = "SSH private Key."
type = string type = string
default = null
} }
variable "location" { variable "location" {