Merge pull request #281 from cookpad/ee/1.20-upgrade

1.20 upgrade - control plane, node groups eks addons
cookpad · Dec 7, 2021 · f4e9a13 · f4e9a13
2 parents 2044e3d + 077ad55
commit f4e9a13
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/modules/asg_node_group/main.tf b/modules/asg_node_group/main.tf
@@ -1,5 +1,5 @@
 locals {
-  k8s_version = "1.19"
+  k8s_version = "1.20"
   preset_instance_families = {
     memory_optimized  = ["r5", "r5d", "r5n", "r5dn", "r5a", "r5ad"]
     general_purpose   = ["m5", "m5d", "m5n", "m5dn", "m5a", "m5ad"]

diff --git a/modules/cluster/addons.tf b/modules/cluster/addons.tf
@@ -31,14 +31,14 @@ data "aws_region" "current" {}
 resource "aws_eks_addon" "kube-proxy" {
   cluster_name      = local.config.name
   addon_name        = "kube-proxy"
-  addon_version     = "v1.19.6-eksbuild.2"
+  addon_version     = "v1.20.7-eksbuild.1"
   resolve_conflicts = "OVERWRITE"
 }
 
 resource "aws_eks_addon" "vpc-cni" {
   cluster_name      = local.config.name
   addon_name        = "vpc-cni"
-  addon_version     = "v1.9.0-eksbuild.1"
+  addon_version     = "v1.10.1-eksbuild.1"
   resolve_conflicts = "OVERWRITE"
 }
 

diff --git a/modules/cluster/main.tf b/modules/cluster/main.tf
@@ -6,7 +6,7 @@ data "aws_iam_role" "service_role" {
   name = var.iam_config.service_role
 }
 locals {
-  k8s_version = "1.19"
+  k8s_version = "1.20"
 }
 
 resource "aws_eks_cluster" "control_plane" {