Remove vars from assets that were unused by tmpl file

Signed-off-by: knrt10 <kautilya@kinvolk.io>
kinvolk · Jun 12, 2020 · b301237 · b301237
1 parent aee816d
commit b301237
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 11 deletions.
diff --git a/assets/lokomotive-kubernetes/bootkube/assets.tf b/assets/lokomotive-kubernetes/bootkube/assets.tf
@@ -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"]
@@ -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
@@ -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"]

diff --git a/assets/lokomotive-kubernetes/packet/flatcar-linux/kubernetes/controllers.tf b/assets/lokomotive-kubernetes/packet/flatcar-linux/kubernetes/controllers.tf
@@ -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

diff --git a/assets/lokomotive-kubernetes/packet/flatcar-linux/kubernetes/workers/workers.tf b/assets/lokomotive-kubernetes/packet/flatcar-linux/kubernetes/workers/workers.tf
@@ -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