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

Merge pull request #26 from kube-hetzner/revert-22-optional-private-key

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

6
agents.tf
View File

@ -28,8 +28,7 @@ resource "hcloud_server" "agents" {
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
}
}
@ -40,8 +39,7 @@ resource "hcloud_server" "agents" {
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
}
}

8
master.tf
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
}

6
servers.tf
View File

@ -27,8 +27,7 @@ resource "hcloud_server" "control_planes" {
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
}
}
@ -39,8 +38,7 @@ resource "hcloud_server" "control_planes" {
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
}
}

1
variables.tf
View File

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