Skip to content

Commit

Permalink
Merge pull request #13 from ministryofjustice/ANPL-1161
Browse files Browse the repository at this point in the history
fix: don't manage kube_proxy as it's deployed by default with new clusters
  • Loading branch information
bogdan-mania-moj committed Sep 15, 2022
2 parents dca76bf + 1a5e375 commit 79bed08
Show file tree
Hide file tree
Showing 3 changed files with 0 additions and 17 deletions.
2 changes: 0 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 |
Expand All @@ -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 |
Expand Down
10 changes: 0 additions & 10 deletions addons.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
5 changes: 0 additions & 5 deletions variables.tf
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 79bed08

Please sign in to comment.