Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add support for provisioning without logging in as root #49

Merged
merged 2 commits into from
Apr 28, 2021
Merged

Add support for provisioning without logging in as root #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2eb34cf
Add support for provisioning without logging in as root
caleb-devops Feb 28, 2021
5b2a11e
use sudo if not root
caleb-devops Mar 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
27 changes: 18 additions & 9 deletions agent_nodes.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,8 +164,10 @@ resource "null_resource" "agents_drain" {
}

provisioner "remote-exec" {
when = destroy
inline = ["kubectl drain ${self.triggers.agent_name} --delete-local-data --force --ignore-daemonsets --timeout=${self.triggers.drain_timeout}"]
when = destroy
inline = [
"kubectl drain ${self.triggers.agent_name} --delete-local-data --force --ignore-daemonsets --timeout=${self.triggers.drain_timeout}"
]
}
}

Expand Down Expand Up @@ -219,13 +221,15 @@ resource "null_resource" "agents_annotation" {
provisioner "remote-exec" {
inline = [
"until kubectl get node ${self.triggers.agent_name}; do sleep 1; done",
"kubectl annotate --overwrite node ${self.triggers.agent_name} ${self.triggers.annotation_name}=${self.triggers.on_value_changes}"]
"kubectl annotate --overwrite node ${self.triggers.agent_name} ${self.triggers.annotation_name}=${self.triggers.on_value_changes}"
]
}

provisioner "remote-exec" {
when = destroy
inline = [
"kubectl annotate node ${self.triggers.agent_name} ${self.triggers.annotation_name}-"]
"kubectl annotate node ${self.triggers.agent_name} ${self.triggers.annotation_name}-"
]
}
}

Expand Down Expand Up @@ -279,13 +283,15 @@ resource "null_resource" "agents_label" {
provisioner "remote-exec" {
inline = [
"until kubectl get node ${self.triggers.agent_name}; do sleep 1; done",
"kubectl label --overwrite node ${self.triggers.agent_name} ${self.triggers.label_name}=${self.triggers.on_value_changes}"]
"kubectl label --overwrite node ${self.triggers.agent_name} ${self.triggers.label_name}=${self.triggers.on_value_changes}"
]
}

provisioner "remote-exec" {
when = destroy
inline = [
"kubectl label node ${self.triggers.agent_name} ${self.triggers.label_name}-"]
"kubectl label node ${self.triggers.agent_name} ${self.triggers.label_name}-"
]
}
}

Expand Down Expand Up @@ -339,11 +345,14 @@ resource "null_resource" "agents_taint" {
provisioner "remote-exec" {
inline = [
"until kubectl get node ${self.triggers.agent_name}; do sleep 1; done",
"kubectl taint node ${self.triggers.agent_name} ${self.triggers.taint_name}=${self.triggers.on_value_changes} --overwrite"]
"kubectl taint node ${self.triggers.agent_name} ${self.triggers.taint_name}=${self.triggers.on_value_changes} --overwrite"
]
}

provisioner "remote-exec" {
when = destroy
inline = ["kubectl taint node ${self.triggers.agent_name} ${self.triggers.taint_name}-"]
when = destroy
inline = [
"kubectl taint node ${self.triggers.agent_name} ${self.triggers.taint_name}-"
]
}
}
37 changes: 24 additions & 13 deletions server_nodes.tf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,12 +143,15 @@ resource "null_resource" "k8s_ca_certificates_install" {
}

provisioner "remote-exec" {
inline = ["mkdir -p /var/lib/rancher/k3s/server/tls/"]
}
inline = [
<<-EOT
# --- use sudo if we are not already root ---
[ $(id -u) -eq 0 ] || exec sudo -n $0 $@

provisioner "file" {
content = local.certificates_files[count.index].file_content
destination = "/var/lib/rancher/k3s/server/tls/${local.certificates_files[count.index].file_name}"
mkdir -p /var/lib/rancher/k3s/server/tls/
echo '${local.certificates_files[count.index].file_content}' > /var/lib/rancher/k3s/server/tls/${local.certificates_files[count.index].file_name}
EOT
]
}
}

Expand Down Expand Up @@ -249,8 +252,10 @@ resource "null_resource" "servers_drain" {
}

provisioner "remote-exec" {
when = destroy
inline = ["kubectl drain ${self.triggers.server_name} --delete-local-data --force --ignore-daemonsets --timeout=${self.triggers.drain_timeout}"]
when = destroy
inline = [
"kubectl drain ${self.triggers.server_name} --delete-local-data --force --ignore-daemonsets --timeout=${self.triggers.drain_timeout}"
]
}
}

Expand Down Expand Up @@ -300,13 +305,15 @@ resource "null_resource" "servers_annotation" {

provisioner "remote-exec" {
inline = [
"kubectl annotate --overwrite node ${self.triggers.server_name} ${self.triggers.annotation_name}=${self.triggers.on_value_changes}"]
"kubectl annotate --overwrite node ${self.triggers.server_name} ${self.triggers.annotation_name}=${self.triggers.on_value_changes}"
]
}

provisioner "remote-exec" {
when = destroy
inline = [
"kubectl annotate node ${self.triggers.server_name} ${self.triggers.annotation_name}-"]
"kubectl annotate node ${self.triggers.server_name} ${self.triggers.annotation_name}-"
]
}
}

Expand Down Expand Up @@ -356,13 +363,15 @@ resource "null_resource" "servers_label" {

provisioner "remote-exec" {
inline = [
"kubectl label --overwrite node ${self.triggers.server_name} ${self.triggers.label_name}=${self.triggers.on_value_changes}"]
"kubectl label --overwrite node ${self.triggers.server_name} ${self.triggers.label_name}=${self.triggers.on_value_changes}"
]
}

provisioner "remote-exec" {
when = destroy
inline = [
"kubectl label node ${self.triggers.server_name} ${self.triggers.label_name}-"]
"kubectl label node ${self.triggers.server_name} ${self.triggers.label_name}-"
]
}
}

Expand Down Expand Up @@ -413,12 +422,14 @@ resource "null_resource" "servers_taint" {

provisioner "remote-exec" {
inline = [
"kubectl taint node ${self.triggers.server_name} ${self.triggers.taint_name}=${self.triggers.on_value_changes} --overwrite"]
"kubectl taint node ${self.triggers.server_name} ${self.triggers.taint_name}=${self.triggers.on_value_changes} --overwrite"
]
}

provisioner "remote-exec" {
when = destroy
inline = [
"kubectl taint node ${self.triggers.server_name} ${self.triggers.taint_name}-"]
"kubectl taint node ${self.triggers.server_name} ${self.triggers.taint_name}-"
]
}
}