Skip to content

Commit c14041e

Browse files
authored
add eks addon dependency (#55)
* fix: Added dependency betweek eks addon and cluster * fix: Add a longer timeout while creating the cluster
1 parent 2a3bee4 commit c14041e

File tree

2 files changed

+13
-3
lines changed

2 files changed

+13
-3
lines changed

CHANGELOG.md

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,12 @@
11

2+
<a name="v0.4.4"></a>
3+
## [v0.4.4](https://github.com/commitdev/terraform-aws-zero/compare/v0.4.3...v0.4.4) (2021-07-05)
4+
5+
### New Features
6+
7+
* Add support for eks addons for vpc cni, kube-proxy, coredns ([#54](https://github.com/commitdev/terraform-aws-zero/issues/54))
8+
9+
210
<a name="v0.4.3"></a>
311
## [v0.4.3](https://github.com/commitdev/terraform-aws-zero/compare/v0.4.2...v0.4.3) (2021-06-29)
412

modules/eks/main.tf

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ module "eks" {
4444

4545
node_groups = local.eks_node_group_config
4646

47+
wait_for_cluster_timeout = 1800 # 30 minutes
48+
4749
map_roles = concat(
4850
[{
4951
rolearn = "arn:aws:iam::${var.iam_account_id}:role/${var.project}-kubernetes-admin-${var.environment}"
@@ -76,7 +78,7 @@ module "eks" {
7678
resource "aws_eks_addon" "vpc_cni" {
7779
count = var.addon_vpc_cni_version == "" ? 0 : 1
7880

79-
cluster_name = var.cluster_name
81+
cluster_name = module.eks.cluster_id
8082
addon_name = "vpc-cni"
8183
resolve_conflicts = "OVERWRITE"
8284
addon_version = var.addon_vpc_cni_version
@@ -85,7 +87,7 @@ resource "aws_eks_addon" "vpc_cni" {
8587
resource "aws_eks_addon" "kube_proxy" {
8688
count = var.addon_kube_proxy_version == "" ? 0 : 1
8789

88-
cluster_name = var.cluster_name
90+
cluster_name = module.eks.cluster_id
8991
addon_name = "kube-proxy"
9092
resolve_conflicts = "OVERWRITE"
9193
addon_version = var.addon_kube_proxy_version
@@ -94,7 +96,7 @@ resource "aws_eks_addon" "kube_proxy" {
9496
resource "aws_eks_addon" "coredns" {
9597
count = var.addon_coredns_version == "" ? 0 : 1
9698

97-
cluster_name = var.cluster_name
99+
cluster_name = module.eks.cluster_id
98100
addon_name = "coredns"
99101
resolve_conflicts = "OVERWRITE"
100102
addon_version = var.addon_coredns_version

0 commit comments

Comments
 (0)