Fix output_kubernetes_config

examples/jupyterhub-gpu/main.tf

@@ -1,11 +1,11 @@
 module "controlplane" {
-  source                 = "remche/rke2/openstack"
-  write_kubeconfig       = true
-  image_name             = "fg-services-ubuntu-20.04-x86_64.raw"
-  flavor_name            = "m1.large-2d"
-  public_net_name        = "public"
-  rke2_config            = file("server.yaml")
-  manifests_path         = "./manifests"
+  source           = "remche/rke2/openstack"
+  write_kubeconfig = true
+  image_name       = "fg-services-ubuntu-20.04-x86_64.raw"
+  flavor_name      = "m1.large-2d"
+  public_net_name  = "public"
+  rke2_config      = file("server.yaml")
+  manifests_path   = "./manifests"
   # Fix for https://github.com/rancher/rke2/issues/1113
   additional_san = ["kubernetes.default.svc"]
 }

kubernetes.tf

@@ -22,25 +22,37 @@ module "host" {
   version = "1.5.0"
   count   = var.output_kubernetes_config ? 1 : 0
   command = "${local.ssh} ${var.system_user}@${module.server.floating_ip[0]} sudo KUBECONFIG=/etc/rancher/rke2/rke2-remote.yaml /var/lib/rancher/rke2/bin/kubectl config view --raw=true -o jsonpath='{.clusters[0].cluster.server}'"
+  depends_on = [
+    null_resource.write_kubeconfig
+  ]
 }
 
 module "client_certificate" {
   source  = "matti/resource/shell"
   version = "1.5.0"
   count   = var.output_kubernetes_config ? 1 : 0
   command = "${local.ssh} ${var.system_user}@${module.server.floating_ip[0]} sudo KUBECONFIG=/etc/rancher/rke2/rke2-remote.yaml /var/lib/rancher/rke2/bin/kubectl config view --raw=true -o jsonpath='{.users[0].user.client-certificate-data}'"
+  depends_on = [
+    null_resource.write_kubeconfig
+  ]
 }
 
 module "client_key" {
   source  = "matti/resource/shell"
   version = "1.5.0"
   count   = var.output_kubernetes_config ? 1 : 0
   command = "${local.ssh} ${var.system_user}@${module.server.floating_ip[0]} sudo KUBECONFIG=/etc/rancher/rke2/rke2-remote.yaml /var/lib/rancher/rke2/bin/kubectl config view --raw=true -o jsonpath='{.users[0].user.client-key-data}'"
+  depends_on = [
+    null_resource.write_kubeconfig
+  ]
 }
 
 module "cluster_ca_certificate" {
   source  = "matti/resource/shell"
   version = "1.5.0"
   count   = var.output_kubernetes_config ? 1 : 0
   command = "${local.ssh} ${var.system_user}@${module.server.floating_ip[0]} sudo KUBECONFIG=/etc/rancher/rke2/rke2-remote.yaml /var/lib/rancher/rke2/bin/kubectl config view --raw=true -o jsonpath='{.clusters[0].cluster.certificate-authority-data}'"
+  depends_on = [
+    null_resource.write_kubeconfig
+  ]
 }

main.tf

@@ -22,8 +22,9 @@ locals {
     registries_conf    = var.registries_conf
   }
   tmpdir           = "${path.root}/.terraform/tmp/rke2"
-  ssh              = "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null"
-  scp              = "scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null"
+  ssh_key_arg      = var.use_ssh_agent ? "" : "-i ${var.ssh_key_file}"
+  ssh              = "ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null ${local.ssh_key_arg}"
+  scp              = "scp -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null ${local.ssh_key_arg}"
   remote_rke2_yaml = "${var.system_user}@${module.server.floating_ip[0]}:/etc/rancher/rke2/rke2-remote.yaml"
 }
 

modules/agent/variables.tf

@@ -76,16 +76,16 @@ variable "do_upgrade" {
 }
 
 variable "boot_from_volume" {
-  type = bool
+  type    = bool
   default = false
 }
 
 variable "boot_volume_size" {
-  type = number
+  type    = number
   default = 20
 }
 
 variable "boot_volume_type" {
-  type = string
-  default= ""
+  type    = string
+  default = ""
 }