From ebc48b29e73c9c5fde70825fe77ffd474b4fcf49 Mon Sep 17 00:00:00 2001
From: Anthony Zawacki <anthony.c.zawacki@census.gov>
Date: Tue, 26 Sep 2023 14:45:08 -0400
Subject: [PATCH] Updates related to moving cluster-autoscaler to
 tfmod-eks-configuration.

---
 README.md    | 25 +------------------------
 outputs.tf   |  9 ---------
 variables.tf | 15 ---------------
 3 files changed, 1 insertion(+), 48 deletions(-)

diff --git a/README.md b/README.md
index efe197f..2a7e9ee 100644
--- a/README.md
+++ b/README.md
@@ -12,19 +12,15 @@ Note that it is best if the vCPU and Mem sizes of all of the instance types are
 
 The cluster is configured with an oidc provider allowing service accounts to be configured with IRSA roles as needed.
 
-When selecting which version of the cluster-autoscaler to install, use the one that is closest to the same version as the `cluster_version` or slightly higher.
-The cluster-autoscaler uses the kuberentes scheduling algorithm to appropriate scale the cluster, and if the autoscaler version sufficiently divirges from the kubernetes version, the autoscaler will scale the node groups incorrectly.
-
 Addons installed:
 - aws-efs-csi-driver
 - aws-ebs-csi-driver
-- cluster-autoscaler
 - coredns
 - kube-proxy
 - vpc-cni
 
 Note that at this stage, the csi-drivers are not configured.
-The csi-driver configuration takes place in the eks-storage-classes module.
+The csi-driver configuration takes place in the eks-configuration module.
 
 ## Required Inputs
 
@@ -76,20 +72,6 @@ Define the name of the subnets to be used by this cluster.
 Default: `"*-container-*"`
 
 
-**cluster_autoscaler_chart_version**
-
-The helm chart of the cluster-autoscaler most closely matching the Kuberentes version.  Review output of `helm add repo autoscaler 'https://kubernetes.github.io/autoscaler'` (if the repo hasn't been added previously) and `helm search repo -l autoscaler/cluster-autoscaler`
-
-Default: `"9.29.3"`
-
-
-**cluster_autoscaler_tag**
-
-Image tag of cluster-autoscaler associated with the cluster_autoscaler_chart_version helm chart.  `helm show values --version [cluster_autoscaler_chart_version] autoscaler/cluster-autoscaler | grep tag:`
-
-Default: `"v1.27.2"`
-
-
 **eks_instance_disk_size** `number`
 
 The size of the disk of the worker nodes in gigabytes. 40 is the approximate minimum.  Needs to hold the all of the normal operating system files plus every image that will be used in the cluster.
@@ -159,11 +141,6 @@ Description: The arn/name/unique_id of the irsa role for the ebs-csi-driver addo
 Description: The arn/name/unique_id of the irsa role for the efs-csi-driver addon
 
 
-**cluster_autoscaler_irsa_role**
-
-Description: The arn/name/unique_id of the irsa role for the cluster autoscaler addon
-
-
 **cluster_iam_role**
 
 Description: The arn/name/unique_id of the iam role for the cluster
diff --git a/outputs.tf b/outputs.tf
index 73f5b09..7cf7a80 100644
--- a/outputs.tf
+++ b/outputs.tf
@@ -76,15 +76,6 @@ output "efs_csi_irsa_role" {
   }
 }
 
-output "cluster_autoscaler_irsa_role" {
-  description = "The arn/name/unique_id of the irsa role for the cluster autoscaler addon"
-  value = {
-    arn       = module.cluster_autoscaler_irsa_role.iam_role_arn
-    name      = module.cluster_autoscaler_irsa_role.iam_role_name
-    unique_id = module.cluster_autoscaler_irsa_role.iam_role_unique_id
-  }
-}
-
 output "cluster_iam_role" {
   description = "The arn/name/unique_id of the iam role for the cluster"
   value = {
diff --git a/variables.tf b/variables.tf
index fd16917..adc6889 100644
--- a/variables.tf
+++ b/variables.tf
@@ -36,21 +36,6 @@ variable "domain" {
   type        = string
 }
 
-# helm add repo autoscaler "https://kubernetes.github.io/autoscaler"
-# helm search repo -l autoscaler/cluster-autoscaler
-variable "cluster_autoscaler_chart_version" {
-  description = "The helm chart of the cluster-autoscaler most closely matching the Kuberentes version.  Review output of `helm add repo autoscaler 'https://kubernetes.github.io/autoscaler'` (if the repo hasn't been added previously) and `helm search repo -l autoscaler/cluster-autoscaler`"
-  type        = string
-  default     = "9.29.3"
-}
-
-# helm show values --version [cluster_autoscaler_chart_version] autoscaler/cluster-autoscaler | grep tag:
-variable "cluster_autoscaler_tag" {
-  description = "Image tag of cluster-autoscaler associated with the cluster_autoscaler_chart_version helm chart.  `helm show values --version [cluster_autoscaler_chart_version] autoscaler/cluster-autoscaler | grep tag:`"
-  type        = string
-  default     = "v1.27.2"
-}
-
 variable "kubectl_image_tag" {
   description = "The version of bitnami/kubectl image to use."
   type        = string