Merge pull request #46 from ExpediaGroup/fix/eks_ingress_fix

Fix/eks ingress fix
ExpediaGroup · Sep 18, 2023 · 98a3e69 · 98a3e69
2 parents 82aeabd + edd1543
commit 98a3e69
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 12 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -3,6 +3,10 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/) and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html).
 
+## [4.0.1] - 2023-09-18
+### Changed
+- Increase k8s provider version to `~>2.7.0` (was `~>1.0.0`). Fixes issue with K8S upgrade and error: 'Failed to create Ingress'.
+
 ## [4.0.0] - 2023-03-14
 ### Added
 - Added variables `db_apply_immediately`(default `false`) and `db_performance_insights_enabled` (default `true`).

diff --git a/k8s-api.tf b/k8s-api.tf
@@ -65,11 +65,11 @@ resource "kubernetes_deployment" "beekeeper_api" {
           }
 
           resources {
-            limits {
+            limits = {
               memory = var.k8s_api_memory
               cpu    = var.k8s_api_cpu
             }
-            requests {
+            requests = {
               memory = var.k8s_api_memory
               cpu    = var.k8s_api_cpu
             }
@@ -128,7 +128,7 @@ resource "kubernetes_service" "beekeeper_api" {
   }
 }
 
-resource "kubernetes_ingress" "beekeeper-api" {
+resource "kubernetes_ingress_v1" "beekeeper-api" {
   metadata {
     name = local.api_full_name
     namespace = var.k8s_namespace
@@ -140,8 +140,12 @@ resource "kubernetes_ingress" "beekeeper-api" {
       http {
         path {
           backend {
-            service_name = local.api_full_name
-            service_port = var.k8s_beekeeper_api_port
+            service {
+              name = local.api_full_name
+              port {
+                number = var.k8s_beekeeper_api_port
+              }
+            }
           }
           path = "/"
         }

diff --git a/k8s-metadata-cleanup.tf b/k8s-metadata-cleanup.tf
@@ -64,11 +64,11 @@ resource "kubernetes_deployment" "beekeeper_metadata_cleanup" {
           }
 
           resources {
-            limits {
+            limits = {
               memory = var.k8s_metadata_cleanup_memory
               cpu    = var.k8s_metadata_cleanup_cpu
             }
-            requests {
+            requests = {
               memory = var.k8s_metadata_cleanup_memory
               cpu    = var.k8s_metadata_cleanup_cpu
             }

diff --git a/k8s-path-cleanup.tf b/k8s-path-cleanup.tf
@@ -65,11 +65,11 @@ resource "kubernetes_deployment" "beekeeper_path_cleanup" {
           }
 
           resources {
-            limits {
+            limits = {
               memory = var.k8s_path_cleanup_memory
               cpu    = var.k8s_path_cleanup_cpu
             }
-            requests {
+            requests = {
               memory = var.k8s_path_cleanup_memory
               cpu    = var.k8s_path_cleanup_cpu
             }

diff --git a/k8s-scheduler-apiary.tf b/k8s-scheduler-apiary.tf
@@ -64,11 +64,11 @@ resource "kubernetes_deployment" "beekeeper_scheduler_apiary" {
           }
 
           resources {
-            limits {
+            limits = {
               memory = var.k8s_scheduler_apiary_memory
               cpu    = var.k8s_scheduler_apiary_cpu
             }
-            requests {
+            requests = {
               memory = var.k8s_scheduler_apiary_memory
               cpu    = var.k8s_scheduler_apiary_cpu
             }

diff --git a/version.tf b/version.tf
@@ -7,7 +7,7 @@
 terraform {
   required_version = ">= 0.12.31"
   required_providers {
-    kubernetes = "~> 1.0"
+    kubernetes = "~> 2.7.0"
     aws = "~> 4.0"
   }
 }