CadolesKube/typhoon
7
0
Fork 0
mirror of https://github.com/puppetmaster/typhoon.git synced 2025-07-19 08:51:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Remove Terraform template provider dependency

Browse Source 
* Use Terraform builtin templatefile functionality
* Remove dependency on deprecated Terraform template provider

Rel:

* https://registry.terraform.io/providers/hashicorp/template/2.2.0
* https://github.com/poseidon/terraform-render-bootstrap/pull/293
This commit is contained in:
Dalton Hubble
2022-08-02 18:15:03 -07:00
parent ca6eef365f
commit 256b87812e
37 changed files with 195 additions and 474 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
google-cloud/flatcar-linux/kubernetes/workers/image.tf
View File

@ -1,5 +1,5 @@
# Flatcar Linux most recent image from channel
data "google_compute_image" "flatcar-linux" {
project = "kinvolk-public"
family = "${var.os_image}"
family = var.os_image
}

4
google-cloud/flatcar-linux/kubernetes/workers/versions.tf
View File

@ -3,9 +3,7 @@
terraform {
required_version = ">= 0.13.0, < 2.0.0"
required_providers {
google = ">= 2.19, < 5.0"
template = "~> 2.2"
google = ">= 2.19, < 5.0"
ct = {
source = "poseidon/ct"
version = "~> 0.9"

22
google-cloud/flatcar-linux/kubernetes/workers/workers.tf
View File

@ -32,7 +32,7 @@ resource "google_compute_instance_template" "worker" {
machine_type = var.machine_type
metadata = {
user-data = data.ct_config.worker-ignition.rendered
user-data = data.ct_config.worker.rendered
}
scheduling {
@ -69,24 +69,16 @@ resource "google_compute_instance_template" "worker" {
}
}
# Worker Ignition config
data "ct_config" "worker-ignition" {
content = data.template_file.worker-config.rendered
strict = true
snippets = var.snippets
}
# Worker Container Linux config
data "template_file" "worker-config" {
template = file("${path.module}/cl/worker.yaml")
vars = {
# Flatcar Linux worker
data "ct_config" "worker" {
content = templatefile("${path.module}/cl/worker.yaml", {
kubeconfig = indent(10, var.kubeconfig)
ssh_authorized_key = var.ssh_authorized_key
cluster_dns_service_ip = cidrhost(var.service_cidr, 10)
cluster_domain_suffix = var.cluster_domain_suffix
node_labels = join(",", var.node_labels)
node_taints = join(",", var.node_taints)
}
})
strict = true
snippets = var.snippets
}