From f5d8caf4ce453a669f2fec58dff1476afb2caf66 Mon Sep 17 00:00:00 2001
From: Bret Mogilefsky <bret.mogilefsky@gsa.gov>
Date: Mon, 28 Feb 2022 16:21:31 -0800
Subject: [PATCH] cleanup: remove unused input, output, and comments

---
 eks-service-definition.yml               | 4 ----
 terraform/main.tf                        | 4 ----
 terraform/modules/provision/outputs.tf   | 4 ----
 terraform/modules/provision/variables.tf | 5 -----
 4 files changed, 17 deletions(-)

diff --git a/eks-service-definition.yml b/eks-service-definition.yml
index a33148a9..d4379f96 100644
--- a/eks-service-definition.yml
+++ b/eks-service-definition.yml
@@ -49,10 +49,6 @@ provision:
     required: false
     type: array
     details: "A list of the desired AWS Compute types that the nodes will be launched with (e.g. [\"m5.large\"])"
-  - field_name: install_vpc_cni
-    required: false
-    type: boolean
-    details: "Control input to specify whether this module creates the vpc cni addon as part of the EKS deployment"
   - field_name: aws_access_key_id
     required: true
     type: string
diff --git a/terraform/main.tf b/terraform/main.tf
index 6e2294c0..8aadc3fd 100644
--- a/terraform/main.tf
+++ b/terraform/main.tf
@@ -70,7 +70,6 @@ variable "write_kubeconfig" {
   default = false
 }
 
-
 module "provision" {
   source = "./modules/provision"
   providers = {
@@ -81,7 +80,6 @@ module "provision" {
   }
   aws_access_key_id = var.aws_access_key_id
   aws_secret_access_key = var.aws_secret_access_key
-  install_vpc_cni = true
   instance_name = var.instance_name
   labels = var.labels
   mng_instance_types = var.mng_instance_types
@@ -94,8 +92,6 @@ module "provision" {
   zone = var.zone
 }
 
-# There's more to be done on hoisting provider configuration out before we can
-# uncomment this module! 
 module "bind" { 
   source = "./modules/bind" 
   providers = { 
diff --git a/terraform/modules/provision/outputs.tf b/terraform/modules/provision/outputs.tf
index a1cd9d87..57052c71 100644
--- a/terraform/modules/provision/outputs.tf
+++ b/terraform/modules/provision/outputs.tf
@@ -6,7 +6,3 @@ output "token" {
   value = data.kubernetes_secret.secret.data.token
   description = "A cluster-admin token for use in constructing your own kubernetes configuration. NOTE: Do _not_ use this token when configuring the required_provider or you'll get a dependency cycle. Instead use exec with the same AWS credentials that were used for the required_providers aws provider."
 }
-output "admin_kubeconfig" { 
-  value = data.template_file.admin_kubeconfig.rendered 
-  description = "A kubeconfig for a cluster-admin service account."
-}
\ No newline at end of file
diff --git a/terraform/modules/provision/variables.tf b/terraform/modules/provision/variables.tf
index 6ad81ab9..a250c344 100644
--- a/terraform/modules/provision/variables.tf
+++ b/terraform/modules/provision/variables.tf
@@ -37,11 +37,6 @@ variable "mng_instance_types" {
   default = ["m4.xlarge"]
 }
 
-variable "install_vpc_cni" {
-  type    = bool
-  default = true
-}
-
 variable "labels" {
   type    = map(any)
   default = {}