Skip to content
This repository has been archived by the owner on Jun 29, 2022. It is now read-only.

Remove vars from assets that were unused by tmpl file #620

Merged
merged 1 commit into from
Jun 12, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
3 changes: 0 additions & 3 deletions assets/lokomotive-kubernetes/bootkube/assets.tf
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@ resource "template_dir" "bootstrap-manifests" {
destination_dir = "${var.asset_dir}/bootstrap-manifests"

vars = {
hyperkube_image = var.container_images["hyperkube"]
kube_apiserver_image = var.container_images["kube_apiserver"]
kube_controller_manager_image = var.container_images["kube_controller_manager"]
kube_scheduler_image = var.container_images["kube_scheduler"]
Expand All @@ -20,7 +19,6 @@ resource "local_file" "kube-apiserver" {
filename = "${var.asset_dir}/charts/kube-system/kube-apiserver.yaml"
content = templatefile("${path.module}/resources/charts/kube-apiserver.yaml", {
kube_apiserver_image = var.container_images["kube_apiserver"]
pod_checkpointer_image = var.container_images["pod_checkpointer"]
etcd_servers = join(",", formatlist("https://%s:2379", var.etcd_servers))
cloud_provider = var.cloud_provider
service_cidr = var.service_cidr
Expand Down Expand Up @@ -71,7 +69,6 @@ resource "template_dir" "kubernetes" {
resource "local_file" "kubernetes" {
filename = "${var.asset_dir}/charts/kube-system/kubernetes.yaml"
content = templatefile("${path.module}/resources/charts/kubernetes.yaml", {
hyperkube_image = var.container_images["hyperkube"]
kube_controller_manager_image = var.container_images["kube_controller_manager"]
kube_scheduler_image = var.container_images["kube_scheduler"]
kube_proxy_image = var.container_images["kube_proxy"]
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ data "ct_config" "controller-install-ignitions" {
content = templatefile("${path.module}/cl/controller-install.yaml.tmpl", {
os_channel = var.os_channel
os_version = var.os_version
os_arch = var.os_arch
flatcar_linux_oem = "packet"
ssh_keys = jsonencode(var.ssh_keys)
postinstall_ignition = data.ct_config.controller-ignitions[count.index].rendered
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ data "ct_config" "install-ignitions" {
content = templatefile("${path.module}/cl/install.yaml.tmpl", {
os_channel = var.os_channel
os_version = var.os_version
os_arch = var.os_arch
flatcar_linux_oem = "packet"
ssh_keys = jsonencode(var.ssh_keys)
postinstall_ignition = data.ct_config.ignitions.rendered
Expand Down
Loading