From ed448f0ef202b3968c251d505d5f1e1e0955423c Mon Sep 17 00:00:00 2001 From: Marcel Hoppe Date: Sat, 17 Dec 2022 10:08:04 +0000 Subject: [PATCH 1/2] Add support for INSTALL_K3S_SELINUX_WARN --- agent_nodes.tf | 2 +- server_nodes.tf | 2 +- variables.tf | 6 ++++++ 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/agent_nodes.tf b/agent_nodes.tf index 399051f..d4f8839 100644 --- a/agent_nodes.tf +++ b/agent_nodes.tf @@ -113,7 +113,7 @@ resource "null_resource" "agents_install" { // Install k3s provisioner "remote-exec" { inline = [ - "INSTALL_K3S_VERSION=${local.k3s_version} sh /tmp/k3s-installer agent ${local.agents_metadata[each.key].flags}", + "INSTALL_K3S_SELINUX_WARN=${var.k3s_selinux_warn} INSTALL_K3S_VERSION=${local.k3s_version} sh /tmp/k3s-installer agent ${local.agents_metadata[each.key].flags}", "until systemctl is-active --quiet k3s-agent.service; do sleep 1; done" ] } diff --git a/server_nodes.tf b/server_nodes.tf index bda1b69..e918cf4 100644 --- a/server_nodes.tf +++ b/server_nodes.tf @@ -205,7 +205,7 @@ resource "null_resource" "servers_install" { // Install k3s server provisioner "remote-exec" { inline = [ - "INSTALL_K3S_VERSION=${local.k3s_version} sh /tmp/k3s-installer server ${local.servers_metadata[each.key].flags}", + "INSTALL_K3S_SELINUX_WARN=${var.k3s_selinux_warn} INSTALL_K3S_VERSION=${local.k3s_version} sh /tmp/k3s-installer server ${local.servers_metadata[each.key].flags}", "until ${local.kubectl_cmd} get node ${local.servers_metadata[each.key].name}; do sleep 1; done" ] } diff --git a/variables.tf b/variables.tf index befd50c..b512b85 100644 --- a/variables.tf +++ b/variables.tf @@ -9,6 +9,12 @@ variable "k3s_version" { default = "latest" } +variable "k3s_selinux_warn" { + description = "Specify the k3s selinux warn." + type = bool + default = false +} + variable "name" { description = "K3s cluster domain name (see https://rancher.com/docs/k3s/latest/en/installation/install-options/). This input is deprecated and will be remove in the next major release. Use `cluster_domain` instead." type = string From 777862df6bf9b43bbad72d0d02f0b5d83cc155f3 Mon Sep 17 00:00:00 2001 From: Marcel Hoppe Date: Sat, 17 Dec 2022 12:25:07 +0100 Subject: [PATCH 2/2] Update variables.tf Co-authored-by: Alexandre NICOLAIE --- variables.tf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/variables.tf b/variables.tf index b512b85..fa6eb57 100644 --- a/variables.tf +++ b/variables.tf @@ -10,7 +10,7 @@ variable "k3s_version" { } variable "k3s_selinux_warn" { - description = "Specify the k3s selinux warn." + description = "Force the install script to log a warning rather than fail when k3s tries to install the SELinux policies." type = bool default = false }