From 1a5e3753a66890cdc4ac60bb4e63777259f6c871 Mon Sep 17 00:00:00 2001
From: Bogdan Mania <bogdan.mania@digital.justice.gov.uk>
Date: Thu, 15 Sep 2022 09:39:28 +0100
Subject: [PATCH] fix: don't manage kube_proxy as it's deployed by default with
 new clusters

---
 README.md    |  2 --
 addons.tf    | 10 ----------
 variables.tf |  5 -----
 3 files changed, 17 deletions(-)

diff --git a/README.md b/README.md
index 8d2109a..7cbc09d 100644
--- a/README.md
+++ b/README.md
@@ -28,7 +28,6 @@
 | Name | Type |
 |------|------|
 | [aws_eks_addon.coredns](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/eks_addon) | resource |
-| [aws_eks_addon.kube_proxy](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/eks_addon) | resource |
 | [aws_eks_addon.vpc_cni](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/eks_addon) | resource |
 | [aws_iam_policy.cert_manager](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_policy) | resource |
 | [aws_iam_policy.cluster_autoscaler](https://registry.terraform.io/providers/hashicorp/aws/latest/docs/resources/iam_policy) | resource |
@@ -47,7 +46,6 @@
 | Name | Description | Type | Default | Required |
 |------|-------------|------|---------|:--------:|
 | <a name="input_cluster_coredns_version"></a> [cluster\_coredns\_version](#input\_cluster\_coredns\_version) | Version of the CoreDNS add on | `string` | n/a | yes |
-| <a name="input_cluster_kube_proxy_version"></a> [cluster\_kube\_proxy\_version](#input\_cluster\_kube\_proxy\_version) | Version of the KubeProxy add on | `string` | n/a | yes |
 | <a name="input_cluster_name"></a> [cluster\_name](#input\_cluster\_name) | The K8S version of the EKS control plane to provision | `string` | n/a | yes |
 | <a name="input_cluster_node_group_version"></a> [cluster\_node\_group\_version](#input\_cluster\_node\_group\_version) | The K8S version of the EKS node group to provision | `string` | n/a | yes |
 | <a name="input_cluster_version"></a> [cluster\_version](#input\_cluster\_version) | The K8S version of the EKS control plane to provision | `string` | n/a | yes |
diff --git a/addons.tf b/addons.tf
index c9ee605..7c71db3 100644
--- a/addons.tf
+++ b/addons.tf
@@ -8,16 +8,6 @@ resource "aws_eks_addon" "coredns" {
   resolve_conflicts = "OVERWRITE"
 }
 
-resource "aws_eks_addon" "kube_proxy" {
-  depends_on = [
-    module.eks
-  ]
-  addon_name        = "kube-proxy"
-  addon_version     = var.cluster_kube_proxy_version
-  cluster_name      = module.eks.cluster_id
-  resolve_conflicts = "OVERWRITE"
-}
-
 resource "aws_eks_addon" "vpc_cni" {
   depends_on = [
     module.eks
diff --git a/variables.tf b/variables.tf
index 2576854..cad2786 100644
--- a/variables.tf
+++ b/variables.tf
@@ -37,11 +37,6 @@ variable "cluster_coredns_version" {
   type        = string
 }
 
-variable "cluster_kube_proxy_version" {
-  description = "Version of the KubeProxy add on"
-  type        = string
-}
-
 variable "main_nodegroup_instance_types" {
   description = "EC2 instance types to be used for the main EKS nodegroup"
   type        = string