From afac46e39aaf0f1e2084d80721004ee61a9c9a81 Mon Sep 17 00:00:00 2001 From: Dalton Hubble Date: Sat, 17 Oct 2020 14:41:26 -0700 Subject: [PATCH] Remove asset_dir variable and optional asset writes * Originally, poseidon/terraform-render-bootstrap generated TLS certificates, manifests, and cluster "assets" written to local disk (`asset_dir`) during terraform apply cluster bootstrap * Typhoon v1.17.0 introduced bootstrapping using only Terraform state to store cluster assets, to avoid ever writing sensitive materials to disk and improve automated use-cases. `asset_dir` was changed to optional and defaulted to "" (no writes) * Typhoon v1.18.0 deprecated the `asset_dir` variable, removed docs, and announced it would be deleted in future. * Add Terraform output `assets_dir` map * Remove the `asset_dir` variable Cluster assets are now stored in Terraform state only. For those who wish to write those assets to local files, this is possible doing so explicitly. ``` resource local_file "assets" { for_each = module.yavin.assets_dist filename = "some-assets/${each.key}" content = each.value } ``` Related: * https://github.com/poseidon/typhoon/pull/595 * https://github.com/poseidon/typhoon/pull/678 --- CHANGES.md | 2 ++ aws/container-linux/kubernetes/bootstrap.tf | 3 +-- aws/container-linux/kubernetes/outputs.tf | 6 ++++++ aws/container-linux/kubernetes/variables.tf | 6 ------ aws/fedora-coreos/kubernetes/bootstrap.tf | 3 +-- aws/fedora-coreos/kubernetes/outputs.tf | 6 ++++++ aws/fedora-coreos/kubernetes/variables.tf | 6 ------ azure/container-linux/kubernetes/bootstrap.tf | 3 +-- azure/container-linux/kubernetes/outputs.tf | 7 +++++++ azure/container-linux/kubernetes/variables.tf | 6 ------ azure/fedora-coreos/kubernetes/bootstrap.tf | 3 +-- azure/fedora-coreos/kubernetes/outputs.tf | 7 +++++++ azure/fedora-coreos/kubernetes/variables.tf | 6 ------ bare-metal/container-linux/kubernetes/bootstrap.tf | 3 +-- bare-metal/container-linux/kubernetes/outputs.tf | 6 ++++++ bare-metal/container-linux/kubernetes/variables.tf | 6 ------ bare-metal/fedora-coreos/kubernetes/bootstrap.tf | 3 +-- bare-metal/fedora-coreos/kubernetes/outputs.tf | 6 ++++++ bare-metal/fedora-coreos/kubernetes/variables.tf | 6 ------ digital-ocean/container-linux/kubernetes/bootstrap.tf | 3 +-- digital-ocean/container-linux/kubernetes/outputs.tf | 6 ++++++ digital-ocean/container-linux/kubernetes/variables.tf | 6 ------ digital-ocean/fedora-coreos/kubernetes/bootstrap.tf | 3 +-- digital-ocean/fedora-coreos/kubernetes/outputs.tf | 7 +++++++ digital-ocean/fedora-coreos/kubernetes/variables.tf | 6 ------ google-cloud/container-linux/kubernetes/bootstrap.tf | 3 +-- google-cloud/container-linux/kubernetes/outputs.tf | 6 ++++++ google-cloud/container-linux/kubernetes/variables.tf | 6 ------ google-cloud/fedora-coreos/kubernetes/bootstrap.tf | 3 +-- google-cloud/fedora-coreos/kubernetes/outputs.tf | 6 ++++++ google-cloud/fedora-coreos/kubernetes/variables.tf | 6 ------ 31 files changed, 75 insertions(+), 80 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 8394beec..e3b6a772 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -4,6 +4,8 @@ Notable changes between versions. ## Latest +* Remove `asset_dir` variable (default off in [v1.17.0](https://github.com/poseidon/typhoon/pull/595), deprecated in [v1.18.0](https://github.com/poseidon/typhoon/pull/678)) + ## v1.19.3 * Update Cilium from v1.8.3 to [v1.8.4](https://github.com/cilium/cilium/releases/tag/v1.8.4) diff --git a/aws/container-linux/kubernetes/bootstrap.tf b/aws/container-linux/kubernetes/bootstrap.tf index 6ddd4398..f7792c98 100644 --- a/aws/container-linux/kubernetes/bootstrap.tf +++ b/aws/container-linux/kubernetes/bootstrap.tf @@ -1,11 +1,10 @@ # Kubernetes assets (kubeconfig, manifests) module "bootstrap" { - source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=7988fb7159cb81e2d080b365b147fe90542fd258" + source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=9037d7311b949439b217cd9c657d4500eab3e16b" cluster_name = var.cluster_name api_servers = [format("%s.%s", var.cluster_name, var.dns_zone)] etcd_servers = aws_route53_record.etcds.*.fqdn - asset_dir = var.asset_dir networking = var.networking network_mtu = var.network_mtu pod_cidr = var.pod_cidr diff --git a/aws/container-linux/kubernetes/outputs.tf b/aws/container-linux/kubernetes/outputs.tf index d9afc7bd..25cc2f80 100644 --- a/aws/container-linux/kubernetes/outputs.tf +++ b/aws/container-linux/kubernetes/outputs.tf @@ -52,3 +52,9 @@ output "worker_target_group_https" { value = module.workers.target_group_https } +# Outputs for debug + +output "assets_dist" { + value = module.bootstrap.assets_dist +} + diff --git a/aws/container-linux/kubernetes/variables.tf b/aws/container-linux/kubernetes/variables.tf index bcb22632..c29aa830 100644 --- a/aws/container-linux/kubernetes/variables.tf +++ b/aws/container-linux/kubernetes/variables.tf @@ -149,12 +149,6 @@ variable "worker_node_labels" { # unofficial, undocumented, unsupported -variable "asset_dir" { - type = string - description = "Absolute path to a directory where generated assets should be placed (contains secrets)" - default = "" -} - variable "cluster_domain_suffix" { type = string description = "Queries for domains with the suffix will be answered by CoreDNS. Default is cluster.local (e.g. foo.default.svc.cluster.local)" diff --git a/aws/fedora-coreos/kubernetes/bootstrap.tf b/aws/fedora-coreos/kubernetes/bootstrap.tf index ccac2ca0..73c23b8f 100644 --- a/aws/fedora-coreos/kubernetes/bootstrap.tf +++ b/aws/fedora-coreos/kubernetes/bootstrap.tf @@ -1,11 +1,10 @@ # Kubernetes assets (kubeconfig, manifests) module "bootstrap" { - source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=7988fb7159cb81e2d080b365b147fe90542fd258" + source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=9037d7311b949439b217cd9c657d4500eab3e16b" cluster_name = var.cluster_name api_servers = [format("%s.%s", var.cluster_name, var.dns_zone)] etcd_servers = aws_route53_record.etcds.*.fqdn - asset_dir = var.asset_dir networking = var.networking network_mtu = var.network_mtu pod_cidr = var.pod_cidr diff --git a/aws/fedora-coreos/kubernetes/outputs.tf b/aws/fedora-coreos/kubernetes/outputs.tf index d9afc7bd..25cc2f80 100644 --- a/aws/fedora-coreos/kubernetes/outputs.tf +++ b/aws/fedora-coreos/kubernetes/outputs.tf @@ -52,3 +52,9 @@ output "worker_target_group_https" { value = module.workers.target_group_https } +# Outputs for debug + +output "assets_dist" { + value = module.bootstrap.assets_dist +} + diff --git a/aws/fedora-coreos/kubernetes/variables.tf b/aws/fedora-coreos/kubernetes/variables.tf index a34493ec..fa47cbe5 100644 --- a/aws/fedora-coreos/kubernetes/variables.tf +++ b/aws/fedora-coreos/kubernetes/variables.tf @@ -96,12 +96,6 @@ variable "ssh_authorized_key" { description = "SSH public key for user 'core'" } -variable "asset_dir" { - type = string - description = "Absolute path to a directory where generated assets should be placed (contains secrets)" - default = "" -} - variable "networking" { type = string description = "Choice of networking provider (calico or flannel)" diff --git a/azure/container-linux/kubernetes/bootstrap.tf b/azure/container-linux/kubernetes/bootstrap.tf index 09a2c9ba..b3fe800e 100644 --- a/azure/container-linux/kubernetes/bootstrap.tf +++ b/azure/container-linux/kubernetes/bootstrap.tf @@ -1,11 +1,10 @@ # Kubernetes assets (kubeconfig, manifests) module "bootstrap" { - source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=7988fb7159cb81e2d080b365b147fe90542fd258" + source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=9037d7311b949439b217cd9c657d4500eab3e16b" cluster_name = var.cluster_name api_servers = [format("%s.%s", var.cluster_name, var.dns_zone)] etcd_servers = formatlist("%s.%s", azurerm_dns_a_record.etcds.*.name, var.dns_zone) - asset_dir = var.asset_dir networking = var.networking diff --git a/azure/container-linux/kubernetes/outputs.tf b/azure/container-linux/kubernetes/outputs.tf index fe5eaffb..2e014287 100644 --- a/azure/container-linux/kubernetes/outputs.tf +++ b/azure/container-linux/kubernetes/outputs.tf @@ -57,3 +57,10 @@ output "backend_address_pool_id" { description = "ID of the worker backend address pool" value = azurerm_lb_backend_address_pool.worker.id } + +# Outputs for debug + +output "assets_dist" { + value = module.bootstrap.assets_dist +} + diff --git a/azure/container-linux/kubernetes/variables.tf b/azure/container-linux/kubernetes/variables.tf index 5dbc1eca..1c93757d 100644 --- a/azure/container-linux/kubernetes/variables.tf +++ b/azure/container-linux/kubernetes/variables.tf @@ -130,12 +130,6 @@ variable "worker_node_labels" { # unofficial, undocumented, unsupported -variable "asset_dir" { - type = string - description = "Absolute path to a directory where generated assets should be placed (contains secrets)" - default = "" -} - variable "cluster_domain_suffix" { type = string description = "Queries for domains with the suffix will be answered by coredns. Default is cluster.local (e.g. foo.default.svc.cluster.local) " diff --git a/azure/fedora-coreos/kubernetes/bootstrap.tf b/azure/fedora-coreos/kubernetes/bootstrap.tf index 72902a1a..14b215e5 100644 --- a/azure/fedora-coreos/kubernetes/bootstrap.tf +++ b/azure/fedora-coreos/kubernetes/bootstrap.tf @@ -1,11 +1,10 @@ # Kubernetes assets (kubeconfig, manifests) module "bootstrap" { - source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=7988fb7159cb81e2d080b365b147fe90542fd258" + source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=9037d7311b949439b217cd9c657d4500eab3e16b" cluster_name = var.cluster_name api_servers = [format("%s.%s", var.cluster_name, var.dns_zone)] etcd_servers = formatlist("%s.%s", azurerm_dns_a_record.etcds.*.name, var.dns_zone) - asset_dir = var.asset_dir networking = var.networking diff --git a/azure/fedora-coreos/kubernetes/outputs.tf b/azure/fedora-coreos/kubernetes/outputs.tf index fe5eaffb..2e014287 100644 --- a/azure/fedora-coreos/kubernetes/outputs.tf +++ b/azure/fedora-coreos/kubernetes/outputs.tf @@ -57,3 +57,10 @@ output "backend_address_pool_id" { description = "ID of the worker backend address pool" value = azurerm_lb_backend_address_pool.worker.id } + +# Outputs for debug + +output "assets_dist" { + value = module.bootstrap.assets_dist +} + diff --git a/azure/fedora-coreos/kubernetes/variables.tf b/azure/fedora-coreos/kubernetes/variables.tf index 1bff1e7e..79164034 100644 --- a/azure/fedora-coreos/kubernetes/variables.tf +++ b/azure/fedora-coreos/kubernetes/variables.tf @@ -129,12 +129,6 @@ variable "worker_node_labels" { # unofficial, undocumented, unsupported -variable "asset_dir" { - type = string - description = "Absolute path to a directory where generated assets should be placed (contains secrets)" - default = "" -} - variable "cluster_domain_suffix" { type = string description = "Queries for domains with the suffix will be answered by coredns. Default is cluster.local (e.g. foo.default.svc.cluster.local) " diff --git a/bare-metal/container-linux/kubernetes/bootstrap.tf b/bare-metal/container-linux/kubernetes/bootstrap.tf index 0d95b4b9..60e01f0d 100644 --- a/bare-metal/container-linux/kubernetes/bootstrap.tf +++ b/bare-metal/container-linux/kubernetes/bootstrap.tf @@ -1,11 +1,10 @@ # Kubernetes assets (kubeconfig, manifests) module "bootstrap" { - source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=7988fb7159cb81e2d080b365b147fe90542fd258" + source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=9037d7311b949439b217cd9c657d4500eab3e16b" cluster_name = var.cluster_name api_servers = [var.k8s_domain_name] etcd_servers = var.controllers.*.domain - asset_dir = var.asset_dir networking = var.networking network_mtu = var.network_mtu network_ip_autodetection_method = var.network_ip_autodetection_method diff --git a/bare-metal/container-linux/kubernetes/outputs.tf b/bare-metal/container-linux/kubernetes/outputs.tf index 8e81ca1e..9ad1263f 100644 --- a/bare-metal/container-linux/kubernetes/outputs.tf +++ b/bare-metal/container-linux/kubernetes/outputs.tf @@ -2,3 +2,9 @@ output "kubeconfig-admin" { value = module.bootstrap.kubeconfig-admin } +# Outputs for debug + +output "assets_dist" { + value = module.bootstrap.assets_dist +} + diff --git a/bare-metal/container-linux/kubernetes/variables.tf b/bare-metal/container-linux/kubernetes/variables.tf index 5de6cae5..b32fb67b 100644 --- a/bare-metal/container-linux/kubernetes/variables.tf +++ b/bare-metal/container-linux/kubernetes/variables.tf @@ -152,12 +152,6 @@ variable "enable_aggregation" { # unofficial, undocumented, unsupported -variable "asset_dir" { - type = string - description = "Absolute path to a directory where generated assets should be placed (contains secrets)" - default = "" -} - variable "cluster_domain_suffix" { type = string description = "Queries for domains with the suffix will be answered by coredns. Default is cluster.local (e.g. foo.default.svc.cluster.local) " diff --git a/bare-metal/fedora-coreos/kubernetes/bootstrap.tf b/bare-metal/fedora-coreos/kubernetes/bootstrap.tf index 012e8a39..afe3af34 100644 --- a/bare-metal/fedora-coreos/kubernetes/bootstrap.tf +++ b/bare-metal/fedora-coreos/kubernetes/bootstrap.tf @@ -1,11 +1,10 @@ # Kubernetes assets (kubeconfig, manifests) module "bootstrap" { - source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=7988fb7159cb81e2d080b365b147fe90542fd258" + source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=9037d7311b949439b217cd9c657d4500eab3e16b" cluster_name = var.cluster_name api_servers = [var.k8s_domain_name] etcd_servers = var.controllers.*.domain - asset_dir = var.asset_dir networking = var.networking network_mtu = var.network_mtu network_ip_autodetection_method = var.network_ip_autodetection_method diff --git a/bare-metal/fedora-coreos/kubernetes/outputs.tf b/bare-metal/fedora-coreos/kubernetes/outputs.tf index 8e81ca1e..9ad1263f 100644 --- a/bare-metal/fedora-coreos/kubernetes/outputs.tf +++ b/bare-metal/fedora-coreos/kubernetes/outputs.tf @@ -2,3 +2,9 @@ output "kubeconfig-admin" { value = module.bootstrap.kubeconfig-admin } +# Outputs for debug + +output "assets_dist" { + value = module.bootstrap.assets_dist +} + diff --git a/bare-metal/fedora-coreos/kubernetes/variables.tf b/bare-metal/fedora-coreos/kubernetes/variables.tf index eefa0a4b..69b13eee 100644 --- a/bare-metal/fedora-coreos/kubernetes/variables.tf +++ b/bare-metal/fedora-coreos/kubernetes/variables.tf @@ -80,12 +80,6 @@ variable "ssh_authorized_key" { description = "SSH public key for user 'core'" } -variable "asset_dir" { - type = string - description = "Absolute path to a directory where generated assets should be placed (contains secrets)" - default = "" -} - variable "networking" { type = string description = "Choice of networking provider (flannel or calico)" diff --git a/digital-ocean/container-linux/kubernetes/bootstrap.tf b/digital-ocean/container-linux/kubernetes/bootstrap.tf index bbc7db6b..664ca5d7 100644 --- a/digital-ocean/container-linux/kubernetes/bootstrap.tf +++ b/digital-ocean/container-linux/kubernetes/bootstrap.tf @@ -1,11 +1,10 @@ # Kubernetes assets (kubeconfig, manifests) module "bootstrap" { - source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=7988fb7159cb81e2d080b365b147fe90542fd258" + source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=9037d7311b949439b217cd9c657d4500eab3e16b" cluster_name = var.cluster_name api_servers = [format("%s.%s", var.cluster_name, var.dns_zone)] etcd_servers = digitalocean_record.etcds.*.fqdn - asset_dir = var.asset_dir networking = var.networking diff --git a/digital-ocean/container-linux/kubernetes/outputs.tf b/digital-ocean/container-linux/kubernetes/outputs.tf index 4cadc886..eac854b4 100644 --- a/digital-ocean/container-linux/kubernetes/outputs.tf +++ b/digital-ocean/container-linux/kubernetes/outputs.tf @@ -54,3 +54,9 @@ output "vpc_id" { value = digitalocean_vpc.network.id } +# Outputs for debug + +output "assets_dist" { + value = module.bootstrap.assets_dist +} + diff --git a/digital-ocean/container-linux/kubernetes/variables.tf b/digital-ocean/container-linux/kubernetes/variables.tf index 73edd554..dbffa5e2 100644 --- a/digital-ocean/container-linux/kubernetes/variables.tf +++ b/digital-ocean/container-linux/kubernetes/variables.tf @@ -100,12 +100,6 @@ variable "enable_aggregation" { # unofficial, undocumented, unsupported -variable "asset_dir" { - type = string - description = "Absolute path to a directory where generated assets should be placed (contains secrets)" - default = "" -} - variable "cluster_domain_suffix" { type = string description = "Queries for domains with the suffix will be answered by coredns. Default is cluster.local (e.g. foo.default.svc.cluster.local) " diff --git a/digital-ocean/fedora-coreos/kubernetes/bootstrap.tf b/digital-ocean/fedora-coreos/kubernetes/bootstrap.tf index 46bba79d..c1b60815 100644 --- a/digital-ocean/fedora-coreos/kubernetes/bootstrap.tf +++ b/digital-ocean/fedora-coreos/kubernetes/bootstrap.tf @@ -1,11 +1,10 @@ # Kubernetes assets (kubeconfig, manifests) module "bootstrap" { - source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=7988fb7159cb81e2d080b365b147fe90542fd258" + source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=9037d7311b949439b217cd9c657d4500eab3e16b" cluster_name = var.cluster_name api_servers = [format("%s.%s", var.cluster_name, var.dns_zone)] etcd_servers = digitalocean_record.etcds.*.fqdn - asset_dir = var.asset_dir networking = var.networking diff --git a/digital-ocean/fedora-coreos/kubernetes/outputs.tf b/digital-ocean/fedora-coreos/kubernetes/outputs.tf index 616eaf48..eac854b4 100644 --- a/digital-ocean/fedora-coreos/kubernetes/outputs.tf +++ b/digital-ocean/fedora-coreos/kubernetes/outputs.tf @@ -53,3 +53,10 @@ output "vpc_id" { description = "ID of the cluster VPC" value = digitalocean_vpc.network.id } + +# Outputs for debug + +output "assets_dist" { + value = module.bootstrap.assets_dist +} + diff --git a/digital-ocean/fedora-coreos/kubernetes/variables.tf b/digital-ocean/fedora-coreos/kubernetes/variables.tf index a2719233..62f885c6 100644 --- a/digital-ocean/fedora-coreos/kubernetes/variables.tf +++ b/digital-ocean/fedora-coreos/kubernetes/variables.tf @@ -100,12 +100,6 @@ variable "enable_aggregation" { # unofficial, undocumented, unsupported -variable "asset_dir" { - type = string - description = "Absolute path to a directory where generated assets should be placed (contains secrets)" - default = "" -} - variable "cluster_domain_suffix" { type = string description = "Queries for domains with the suffix will be answered by coredns. Default is cluster.local (e.g. foo.default.svc.cluster.local) " diff --git a/google-cloud/container-linux/kubernetes/bootstrap.tf b/google-cloud/container-linux/kubernetes/bootstrap.tf index 53f882aa..7285fa63 100644 --- a/google-cloud/container-linux/kubernetes/bootstrap.tf +++ b/google-cloud/container-linux/kubernetes/bootstrap.tf @@ -1,11 +1,10 @@ # Kubernetes assets (kubeconfig, manifests) module "bootstrap" { - source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=7988fb7159cb81e2d080b365b147fe90542fd258" + source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=9037d7311b949439b217cd9c657d4500eab3e16b" cluster_name = var.cluster_name api_servers = [format("%s.%s", var.cluster_name, var.dns_zone)] etcd_servers = google_dns_record_set.etcds.*.name - asset_dir = var.asset_dir networking = var.networking network_mtu = 1440 pod_cidr = var.pod_cidr diff --git a/google-cloud/container-linux/kubernetes/outputs.tf b/google-cloud/container-linux/kubernetes/outputs.tf index 0de72502..0fde68f5 100644 --- a/google-cloud/container-linux/kubernetes/outputs.tf +++ b/google-cloud/container-linux/kubernetes/outputs.tf @@ -42,3 +42,9 @@ output "worker_target_pool" { value = module.workers.target_pool } +# Outputs for debug + +output "assets_dist" { + value = module.bootstrap.assets_dist +} + diff --git a/google-cloud/container-linux/kubernetes/variables.tf b/google-cloud/container-linux/kubernetes/variables.tf index 3acaeb5e..f09bccab 100644 --- a/google-cloud/container-linux/kubernetes/variables.tf +++ b/google-cloud/container-linux/kubernetes/variables.tf @@ -124,12 +124,6 @@ variable "worker_node_labels" { # unofficial, undocumented, unsupported -variable "asset_dir" { - type = string - description = "Absolute path to a directory where generated assets should be placed (contains secrets)" - default = "" -} - variable "cluster_domain_suffix" { type = string description = "Queries for domains with the suffix will be answered by coredns. Default is cluster.local (e.g. foo.default.svc.cluster.local) " diff --git a/google-cloud/fedora-coreos/kubernetes/bootstrap.tf b/google-cloud/fedora-coreos/kubernetes/bootstrap.tf index c92dce95..d51e2a5c 100644 --- a/google-cloud/fedora-coreos/kubernetes/bootstrap.tf +++ b/google-cloud/fedora-coreos/kubernetes/bootstrap.tf @@ -1,11 +1,10 @@ # Kubernetes assets (kubeconfig, manifests) module "bootstrap" { - source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=7988fb7159cb81e2d080b365b147fe90542fd258" + source = "git::https://github.com/poseidon/terraform-render-bootstrap.git?ref=9037d7311b949439b217cd9c657d4500eab3e16b" cluster_name = var.cluster_name api_servers = [format("%s.%s", var.cluster_name, var.dns_zone)] etcd_servers = google_dns_record_set.etcds.*.name - asset_dir = var.asset_dir networking = var.networking network_mtu = 1440 pod_cidr = var.pod_cidr diff --git a/google-cloud/fedora-coreos/kubernetes/outputs.tf b/google-cloud/fedora-coreos/kubernetes/outputs.tf index 0de72502..0fde68f5 100644 --- a/google-cloud/fedora-coreos/kubernetes/outputs.tf +++ b/google-cloud/fedora-coreos/kubernetes/outputs.tf @@ -42,3 +42,9 @@ output "worker_target_pool" { value = module.workers.target_pool } +# Outputs for debug + +output "assets_dist" { + value = module.bootstrap.assets_dist +} + diff --git a/google-cloud/fedora-coreos/kubernetes/variables.tf b/google-cloud/fedora-coreos/kubernetes/variables.tf index 74b59d41..419686a5 100644 --- a/google-cloud/fedora-coreos/kubernetes/variables.tf +++ b/google-cloud/fedora-coreos/kubernetes/variables.tf @@ -83,12 +83,6 @@ variable "ssh_authorized_key" { description = "SSH public key for user 'core'" } -variable "asset_dir" { - type = string - description = "Absolute path to a directory where generated assets should be placed (contains secrets)" - default = "" -} - variable "networking" { type = string description = "Choice of networking provider (flannel or calico)"