Merge pull request #22 from msfidelis/feature/eks_1.28

Feature/eks 1.28
msfidelis · Oct 24, 2023 · d3f358d · d3f358d
2 parents abbe672 + 9dc9609
commit d3f358d
Show file tree

Hide file tree

Showing 3 changed files with 59 additions and 31 deletions.
diff --git a/nodes.tf b/nodes.tf
@@ -37,6 +37,12 @@ resource "aws_eks_node_group" "cluster" {
     depends_on = [
         kubernetes_config_map.aws-auth
     ]
+
+    timeouts {
+        create = "60m"
+        update = "2h"
+        delete = "2h"
+    }
 }
 
 resource "aws_security_group" "cluster_nodes_sg" {

diff --git a/provider.tf b/provider.tf
@@ -2,7 +2,7 @@ terraform {
   required_providers {
     aws = {
       source  = "aws"
-      version = "~> 3.0"
+      version = "~> 4.0"
     }
     helm = {
       source  = "helm"
@@ -24,7 +24,8 @@ terraform {
 }
 
 provider "aws" {
-  region = var.aws_region
+  region    = var.aws_region
+  insecure  = true
   default_tags {
     tags = var.default_tags
   }

diff --git a/variables.tf b/variables.tf
@@ -1,3 +1,7 @@
+#########################
+###  GENERAL CONFIGS  ###
+#########################
+
 variable "cluster_name" {
   default = "eks-cluster"
 }
@@ -7,9 +11,13 @@ variable "aws_region" {
 }
 
 variable "k8s_version" {
-  default = "1.27"
+  default = "1.28"
 }
 
+#########################
+### CAPACITY CONFIGS  ###
+#########################
+
 variable "nodes_instances_sizes" {
   default = [
     "t3.large"
@@ -24,6 +32,10 @@ variable "auto_scale_options" {
   }
 }
 
+#########################
+###  INGRESS CONFIGS  ###
+#########################
+
 variable "nlb_ingress_internal" {
   type    = bool
   default = false
@@ -54,29 +66,12 @@ variable "cluster_private_zone" {
   default = "k8s.cluster"
 }
 
-variable "chaos_mesh_toggle" {
-  type        = bool
-  description = "Enable Chaos Mesh Installation"
-  default     = false
-}
-
-variable "node_termination_handler_toggle" {
-  type        = bool
-  description = "Enable AWS Node Termination Handler Setup"
-  default     = false
-}
-
-variable "argo_rollouts_toggle" {
+variable "cluster_autoscaler_toggle" {
   type        = bool
-  description = "Enable Argo Rollouts Installation"
+  description = "Enable Cluster Autoscaler Installation"
   default     = true
 }
 
-variable "keda_toggle" {
-  type        = bool
-  description = "Enable Keda Installation"
-  default     = true
-}
 
 variable "grafana_virtual_service_host" {
   type    = string
@@ -105,40 +100,66 @@ variable "istio_ingress_max_pods" {
   description = "Maximum pods for istio-ingress-gateway"
 }
 
-variable "cluster_autoscaler_toggle" {
-  type        = bool
-  description = "Enable Cluster Autoscaler Installation"
-  default     = true
-}
+#########################
+###  GENERAL TOGGLES  ###
+#########################
 
 variable "descheduler_toggle" {
   type        = bool
   description = "Enable Descheduler Installation"
   default     = false
 }
 
+variable "chaos_mesh_toggle" {
+  type        = bool
+  description = "Enable Chaos Mesh Installation"
+  default     = false
+}
+
+variable "node_termination_handler_toggle" {
+  type        = bool
+  description = "Enable AWS Node Termination Handler Setup"
+  default     = false
+}
+
+variable "argo_rollouts_toggle" {
+  type        = bool
+  description = "Enable Argo Rollouts Installation"
+  default     = true
+}
+
+variable "keda_toggle" {
+  type        = bool
+  description = "Enable Keda Installation"
+  default     = true
+}
+
+#########################
+###   ADDONS CONFIGS  ###
+#########################
+
 variable "addon_cni_version" {
   type        = string
   description = "VPC CNI Version"
-  default     = "v1.12.6-eksbuild.1"
+  default     = "v1.14.1-eksbuild.1"
 }
 
 variable "addon_coredns_version" {
   type        = string
   description = "CoreDNS Version"
-  default     = "v1.10.1-eksbuild.2"
+  default     = "v1.10.1-eksbuild.4"
 }
 
 variable "addon_kubeproxy_version" {
   type        = string
   description = "Kubeproxy Version"
-  default     = "v1.27.3-eksbuild.2"
+  default     = "v1.28.1-eksbuild.1"
 }
 
 variable "addon_csi_version" {
   type        = string
   description = "CSI Version"
-  default     = "v1.17.0-eksbuild.1"
+  default     = "v1.24.0-eksbuild.1"
 }
 
 variable "default_tags" {