From fd6d15c598c48f0c8414c95d878afa3bc661e630 Mon Sep 17 00:00:00 2001
From: viktorbarzin <vbarzin@gmail.com>
Date: Thu, 6 Jan 2022 00:07:48 +0000
Subject: [PATCH] fix k8s upgrade issues [ci skip]

---
 .terraform.lock.hcl                         | 127 ++++++++++----------
 modules/create-vm/versions.tf               |   9 ++
 modules/kubernetes/blog/main.tf             |  18 ++-
 modules/kubernetes/drone/main.tf            |  10 +-
 modules/kubernetes/f1-stream/main.tf        |  10 +-
 modules/kubernetes/hackmd/main.tf           |  10 +-
 modules/kubernetes/k8s-dashboard/main.tf    |  18 +--
 modules/kubernetes/kafka/main.tf            |  10 +-
 modules/kubernetes/kms/main.tf              |  10 +-
 modules/kubernetes/monitoring/main.tf       |  20 ++-
 modules/kubernetes/oauth-proxy/main.tf      |  10 +-
 modules/kubernetes/openid_help_page/main.tf |  10 +-
 modules/kubernetes/pihole/main.tf           |  10 +-
 modules/kubernetes/privatebin/main.tf       |  18 ++-
 modules/kubernetes/reverse-proxy/main.tf    |   2 +-
 modules/kubernetes/versions.tf              |   4 +-
 modules/kubernetes/webhook_handler/main.tf  |  10 +-
 17 files changed, 192 insertions(+), 114 deletions(-)
 create mode 100644 modules/create-vm/versions.tf

diff --git a/.terraform.lock.hcl b/.terraform.lock.hcl
index fd286d83..2f7a16d7 100644
--- a/.terraform.lock.hcl
+++ b/.terraform.lock.hcl
@@ -17,87 +17,92 @@ provider "registry.terraform.io/gavinbunney/kubectl" {
 }
 
 provider "registry.terraform.io/hashicorp/helm" {
-  version = "2.0.2"
+  version = "2.4.1"
   hashes = [
-    "h1:NeS94WlOI85mRXQblK/s1oGO/pdz+2HCAsQp8ePQqH0=",
-    "zh:09f7b2389f0e41f51c933d014fe3a89aa53c12801ab45c082d3626689961d5a6",
-    "zh:0af792512adf59648b7cb7f0f194151ac926ae6805ffdb2baf61512b55933e17",
-    "zh:0e29837d65bf4dbe3b9766221a1a4448b2c9df7f4d3049a0b6812055e299c063",
-    "zh:25a0c4d1cba9a22f4d12f6465f191db6e2ec675cbc2c7751bf128bcae23848a8",
-    "zh:6d92f9ffd43a45f0f0da4c59cbb1790b163235882532a88344a53b8526808979",
-    "zh:7c98a0e05f106d4bbfc0c81f7d8b41bc8e867a99b30ccd472367d0414e778c30",
-    "zh:8de8232eedfa4ade990faea4ed3706f0846eb1d66fb82aa22718c7a9aeda92b1",
-    "zh:baff5ff10c9573104d25eece9f79477112ed6882c0ea9280ecbfa944d117838d",
-    "zh:d151fac8be471922cbe137f5a263f4854cdcfbf3fb8af7db83c709d64956934b",
-    "zh:e4d238facc27fc91d26aef79b7f398a6b9f3a1fe078c8d3f0cd4df47ec5aaacd",
+    "h1:Gqwrr+yKWR79esN39X9eRCddxMNapmaGMynLfjrUJJo=",
+    "zh:07517b24ea2ce4a1d3be3b88c3efc7fb452cd97aea8fac93ca37a08a8ec06e14",
+    "zh:11ef6118ed03a1b40ff66adfe21b8707ece0568dae1347ddfbcff8452c0655d5",
+    "zh:1ae07e9cc6b088a6a68421642c05e2fa7d00ed03e9401e78c258cf22a239f526",
+    "zh:1c5b4cd44033a0d7bf7546df930c55aa41db27b70b3bca6d145faf9b9a2da772",
+    "zh:256413132110ddcb0c3ea17c7b01123ad2d5b70565848a77c5ccc22a3f32b0dd",
+    "zh:4ab46fd9aadddef26604382bc9b49100586647e63ef6384e0c0c3f010ff2f66e",
+    "zh:5a35d23a9f08c36fceda3cef7ce2c7dc5eca32e5f36494de695e09a5007122f0",
+    "zh:8e9823a1e5b985b63fe283b755a821e5011a58112447d42fb969c7258ed57ed3",
+    "zh:8f79722eba9bf77d341edf48a1fd51a52d93ec31d9cac9ba8498a3a061ea4a7f",
+    "zh:b2ea782848b10a343f586ba8ee0cf4d7ff65aa2d4b144eea5bbd8f9801b54c67",
+    "zh:e72d1ccf8a75d8e8456c6bb4d843fd4deb0e962ad8f167fa84cf17f12c12304e",
   ]
 }
 
 provider "registry.terraform.io/hashicorp/kubernetes" {
-  version     = "2.0.2"
-  constraints = ">= 1.13.0"
+  version     = "2.7.1"
+  constraints = ">= 2.7.1"
   hashes = [
-    "h1:PRfDnUFBD4ud7SgsMAa5S2Gd60FeriD1PWE6EifjXB0=",
-    "zh:4e66d509c828b0a2e599a567ad470bf85ebada62788aead87a8fb621301dec55",
-    "zh:55ca6466a82f60d2c9798d171edafacc9ea4991aa7aa32ed5d82d6831cf44542",
-    "zh:65741e6910c8b1322d9aef5dda4d98d1e6409aebc5514b518f46019cd06e1b47",
-    "zh:79456ca037c19983977285703f19f4b04f7eadcf8eb6af21f5ea615026271578",
-    "zh:7c39ced4dc44181296721715005e390021770077012c206ab4c209fb704b34d0",
-    "zh:86856c82a6444c19b3e3005e91408ac68eb010c9218c4c4119fc59300b107026",
-    "zh:999865090c72fa9b85c45e76b20839da51714ae429d1ab14b7d8ce66c2655abf",
-    "zh:a3ea0ae37c61b4bfe81f7a395fb7b5ba61564e7d716d7a191372c3c983271d13",
-    "zh:d9061861822933ebb2765fa691aeed2930ee495bfb6f72a5bdd88f43ccd9e038",
-    "zh:e04adbe0d5597d1fdd4f418be19c9df171f1d709009f63b8ce1239b71b4fa45a",
+    "h1:Df9MZxqgXueXVObeAiPPDQ5aLwQ2bJ2r1gul/IYSxeg=",
+    "zh:0da320fd81ece6696f7cceda35e459ee97cae8955088af38fc7f2feab1dce924",
+    "zh:37d304b8b992518c9c12e8f10437b9d4a0cc5a823c9421ac794ad2347c4d1122",
+    "zh:3d4e12fb9588c3b2e782d392fea758c6982e5d653154bec951e949155bcbc169",
+    "zh:6bb32b8d5cccf3e3ae7c124ed27df76dc7653ca760c132addeee15272630c930",
+    "zh:94775153b90e285876fc17261e8f5338a1ff732f4133336cc68754acb74570b6",
+    "zh:a665d1336765cdf8620a8797fd4e7e3cecf789e96e59ba80634336a4390df377",
+    "zh:aa8b35e9958cb89f01c115e8866a07d5468fb53f1c227d673e94f7ee8fb76242",
+    "zh:b7a571336387d773a74ed6eefa3843ff78d3662f2745c99c95008002a1341662",
+    "zh:c50d661782175d50ea4952fe943b0e4a3e33c27aa69e5ff21b3cbfa513e90d0a",
+    "zh:e0999b349cc772c75876adbc2a13b5dc256d3ecd7e4aa91baee5fdfcecaa7465",
+    "zh:e1399aec06a7aa98e9b0f64b4281697247f338a8a40b79f5f6ebfd43bf4ce1e2",
   ]
 }
 
 provider "registry.terraform.io/hashicorp/null" {
-  version = "3.0.0"
+  version = "3.1.0"
   hashes = [
-    "h1:ysHGBhBNkIiJLEpthB/IVCLpA1Qoncp3KbCTFGFZTO0=",
-    "zh:05fb7eab469324c97e9b73a61d2ece6f91de4e9b493e573bfeda0f2077bc3a4c",
-    "zh:1688aa91885a395c4ae67636d411475d0b831e422e005dcf02eedacaafac3bb4",
-    "zh:24a0b1292e3a474f57c483a7a4512d797e041bc9c2fbaac42fe12e86a7fb5a3c",
-    "zh:2fc951bd0d1b9b23427acc93be09b6909d72871e464088171da60fbee4fdde03",
-    "zh:6db825759425599a326385a68acc6be2d9ba0d7d6ef587191d0cdc6daef9ac63",
-    "zh:85985763d02618993c32c294072cc6ec51f1692b803cb506fcfedca9d40eaec9",
-    "zh:a53186599c57058be1509f904da512342cfdc5d808efdaf02dec15f0f3cb039a",
-    "zh:c2e07b49b6efa676bdc7b00c06333ea1792a983a5720f9e2233db27323d2707c",
-    "zh:cdc8fe1096103cf5374751e2e8408ec4abd2eb67d5a1c5151fe2c7ecfd525bef",
-    "zh:dbdef21df0c012b0d08776f3d4f34eb0f2f229adfde07ff252a119e52c0f65b7",
+    "h1:vpC6bgUQoJ0znqIKVFevOdq+YQw42bRq0u+H3nto8nA=",
+    "zh:02a1675fd8de126a00460942aaae242e65ca3380b5bb192e8773ef3da9073fd2",
+    "zh:53e30545ff8926a8e30ad30648991ca8b93b6fa496272cd23b26763c8ee84515",
+    "zh:5f9200bf708913621d0f6514179d89700e9aa3097c77dac730e8ba6e5901d521",
+    "zh:9ebf4d9704faba06b3ec7242c773c0fbfe12d62db7d00356d4f55385fc69bfb2",
+    "zh:a6576c81adc70326e4e1c999c04ad9ca37113a6e925aefab4765e5a5198efa7e",
+    "zh:a8a42d13346347aff6c63a37cda9b2c6aa5cc384a55b2fe6d6adfa390e609c53",
+    "zh:c797744d08a5307d50210e0454f91ca4d1c7621c68740441cf4579390452321d",
+    "zh:cecb6a304046df34c11229f20a80b24b1603960b794d68361a67c5efe58e62b8",
+    "zh:e1371aa1e502000d9974cfaff5be4cfa02f47b17400005a16f14d2ef30dc2a70",
+    "zh:fc39cc1fe71234a0b0369d5c5c7f876c71b956d23d7d6f518289737a001ba69b",
+    "zh:fea4227271ebf7d9e2b61b89ce2328c7262acd9fd190e1fd6d15a591abfa848e",
   ]
 }
 
 provider "registry.terraform.io/hashicorp/random" {
-  version = "3.0.1"
+  version = "3.1.0"
   hashes = [
-    "h1:SzM8nt2wzLMI28A3CWAtW25g3ZCm1O4xD0h3Ps/rU1U=",
-    "zh:0d4f683868324af056a9eb2b06306feef7c202c88dbbe6a4ad7517146a22fb50",
-    "zh:4824b3c7914b77d41dfe90f6f333c7ac9860afb83e2a344d91fbe46e5dfbec26",
-    "zh:4b82e43712f3cf0d0cbc95b2cbcd409ba8f0dc7848fdfb7c13633c27468ed04a",
-    "zh:78b3a2b860c3ebc973a794000015f5946eb59b82705d701d487475406b2612f1",
-    "zh:88bc65197bd74ff408d147b32f0045372ae3a3f2a2fdd7f734f315d988c0e4a2",
-    "zh:91bd3c9f625f177f3a5d641a64e54d4b4540cb071070ecda060a8261fb6eb2ef",
-    "zh:a6818842b28d800f784e0c93284ff602b0c4022f407e4750da03f50b853a9a2c",
-    "zh:c4a1a2b52abd05687e6cfded4a789dcd7b43e7a746e4d02dd1055370cf9a994d",
-    "zh:cf65041bf12fc3bde709c1d267dbe94142bc05adcabc4feb17da3b12249132ac",
-    "zh:e385e00e7425dda9d30b74ab4ffa4636f4b8eb23918c0b763f0ffab84ece0c5c",
+    "h1:BZMEPucF+pbu9gsPk0G0BHx7YP04+tKdq2MrRDF1EDM=",
+    "zh:2bbb3339f0643b5daa07480ef4397bd23a79963cc364cdfbb4e86354cb7725bc",
+    "zh:3cd456047805bf639fbf2c761b1848880ea703a054f76db51852008b11008626",
+    "zh:4f251b0eda5bb5e3dc26ea4400dba200018213654b69b4a5f96abee815b4f5ff",
+    "zh:7011332745ea061e517fe1319bd6c75054a314155cb2c1199a5b01fe1889a7e2",
+    "zh:738ed82858317ccc246691c8b85995bc125ac3b4143043219bd0437adc56c992",
+    "zh:7dbe52fac7bb21227acd7529b487511c91f4107db9cc4414f50d04ffc3cab427",
+    "zh:a3a9251fb15f93e4cfc1789800fc2d7414bbc18944ad4c5c98f466e6477c42bc",
+    "zh:a543ec1a3a8c20635cf374110bd2f87c07374cf2c50617eee2c669b3ceeeaa9f",
+    "zh:d9ab41d556a48bd7059f0810cf020500635bfc696c9fc3adab5ea8915c1d886b",
+    "zh:d9e13427a7d011dbd654e591b0337e6074eef8c3b9bb11b2e39eaaf257044fd7",
+    "zh:f7605bd1437752114baf601bdf6931debe6dc6bfe3006eb7e9bb9080931dca8a",
   ]
 }
 
 provider "registry.terraform.io/hashicorp/vsphere" {
-  version = "1.24.3"
+  version = "2.0.2"
   hashes = [
-    "h1:tmVOVBdsBWDIsPdIUgYguaA1dKAlUOKrnnmzGaMNAr4=",
-    "zh:3b31455ca5a5c4ae7b65f1f4a51d651988d42862b9d4e078eb6fd5b238f98176",
-    "zh:4935754d72299ecfd7081517f496274dee34fb021996266f1f1cc9a5c6b1129d",
-    "zh:531dcccbc4f22cd09b19e217403d8545bc24ac291256ce3d2ec4484c400f7729",
-    "zh:551da4dcd47b7736091e3a7e94c189be399043c7c3ec597e8edb9e6f7b2a2c1e",
-    "zh:668db7ef747d8005194249288ebe081fa7f8be128081acc32915b2c769358391",
-    "zh:b377f0d8a5340a3c661ee6e2a5c467f742f8f3679518375877cbcfd63b3804b1",
-    "zh:c7573b9e2e2480f442704682f5dcf0756e78f890571e92dff08918262d0002cf",
-    "zh:cd223874ba4acf6e6be98cc80c835ec4a172dbc0300c99b6a6ff8786a52dc092",
-    "zh:dd523ff0fb2cfc9d6be2d14be1184cf9a90babc3f891630ee0f1e080ec87236e",
-    "zh:e28991bff40a6c46d1a9f604b9bc9e6e6b59aa6bfb29b9ee7704a70ba262a332",
+    "h1:/9qlE9Ni7mhl3cTHLhmYg1AFuyBnXqie53Q5Ujor6oU=",
+    "zh:0b72856d2a89b118adf64dcfc75a0b0f7d8875e9872c637a9a0549d4a3dd9383",
+    "zh:2cf50f17464feeac60039f4d36656835895260798d4d9167a1ff2d4e1e464dce",
+    "zh:39d5f1c99bd4024d88b95892711f234afeb2b83700cdbd3df68a60c6b3bb0ac7",
+    "zh:551b68f91f5eefa4daee4d826d27d2bc10236e0642fdafd066604884b2a06816",
+    "zh:8454b5e7dbbf0300bbab1ecd73c12511cf35c0c493ad18e31742d58798e11026",
+    "zh:84a8233a60240e0020de513668a20d015a7fbc760ad6ab639d52e6ddabfa3376",
+    "zh:95574b7f092e77f9c629770b802d1635903f14d8d88d3828a96f58ca072876a5",
+    "zh:a262c779c112e4d6ac47152d6c6303308180dfd4d5929b980cf24707ca9218e9",
+    "zh:c7622cfa8bab6a6f122c0ab3d4767ecf0f52ccf32d64020aa4e9581f91da5586",
+    "zh:e01cfc79d21c7151c97047afdc79dfe7bf37c0063908829200480a03359e4c2e",
+    "zh:f64c3f283c31477886c3d16592426dbefa2cab55f2885cb3351cef094ad898a0",
   ]
 }
diff --git a/modules/create-vm/versions.tf b/modules/create-vm/versions.tf
new file mode 100644
index 00000000..0737df62
--- /dev/null
+++ b/modules/create-vm/versions.tf
@@ -0,0 +1,9 @@
+
+terraform {
+  required_providers {
+    vsphere = {
+      source  = "hashicorp/vsphere"
+      version = "2.0.2"
+    }
+  }
+}
diff --git a/modules/kubernetes/blog/main.tf b/modules/kubernetes/blog/main.tf
index e870f194..b6d56d44 100644
--- a/modules/kubernetes/blog/main.tf
+++ b/modules/kubernetes/blog/main.tf
@@ -103,7 +103,7 @@ resource "kubernetes_service" "blog" {
   }
 }
 
-resource "kubernetes_ingress" "blog" {
+resource "kubernetes_ingress_v1" "blog" {
   metadata {
     name      = "blog-ingress"
     namespace = "website"
@@ -123,8 +123,12 @@ resource "kubernetes_ingress" "blog" {
         path {
           path = "/"
           backend {
-            service_name = "blog"
-            service_port = "80"
+            service {
+              name = "blog"
+              port {
+                number = 80
+              }
+            }
           }
         }
       }
@@ -135,8 +139,12 @@ resource "kubernetes_ingress" "blog" {
         path {
           path = "/"
           backend {
-            service_name = "blog"
-            service_port = "80"
+            service {
+              name = "blog"
+              port {
+                number = 80
+              }
+            }
           }
         }
       }
diff --git a/modules/kubernetes/drone/main.tf b/modules/kubernetes/drone/main.tf
index 2f44e3ca..07b0b8d8 100644
--- a/modules/kubernetes/drone/main.tf
+++ b/modules/kubernetes/drone/main.tf
@@ -146,7 +146,7 @@ resource "kubernetes_service" "drone" {
   }
 }
 
-resource "kubernetes_ingress" "drone" {
+resource "kubernetes_ingress_v1" "drone" {
   metadata {
     name      = "drone-ingress"
     namespace = "drone"
@@ -168,8 +168,12 @@ resource "kubernetes_ingress" "drone" {
         path {
           path = "/"
           backend {
-            service_name = "drone"
-            service_port = "80"
+            service {
+              name = "drone"
+              port {
+                number = 80
+              }
+            }
           }
         }
       }
diff --git a/modules/kubernetes/f1-stream/main.tf b/modules/kubernetes/f1-stream/main.tf
index 180f5f49..7452339d 100644
--- a/modules/kubernetes/f1-stream/main.tf
+++ b/modules/kubernetes/f1-stream/main.tf
@@ -77,7 +77,7 @@ module "tls_secret" {
 }
 
 
-resource "kubernetes_ingress" "f1-stream" {
+resource "kubernetes_ingress_v1" "f1-stream" {
   metadata {
     name      = "f1-ingress"
     namespace = "f1-stream"
@@ -100,8 +100,12 @@ resource "kubernetes_ingress" "f1-stream" {
         path {
           path = "/"
           backend {
-            service_name = "f1-stream"
-            service_port = "80"
+            service {
+              name = "f1-stream"
+              port {
+                number = 80
+              }
+            }
           }
         }
       }
diff --git a/modules/kubernetes/hackmd/main.tf b/modules/kubernetes/hackmd/main.tf
index 5ce3f4e6..e1ea9984 100644
--- a/modules/kubernetes/hackmd/main.tf
+++ b/modules/kubernetes/hackmd/main.tf
@@ -137,7 +137,7 @@ resource "kubernetes_service" "hackmd" {
   }
 }
 
-resource "kubernetes_ingress" "hackmd" {
+resource "kubernetes_ingress_v1" "hackmd" {
   metadata {
     name      = "hackmd-ingress"
     namespace = "hackmd"
@@ -157,8 +157,12 @@ resource "kubernetes_ingress" "hackmd" {
         path {
           path = "/"
           backend {
-            service_name = "hackmd"
-            service_port = "80"
+            service {
+              name = "hackmd"
+              port {
+                number = 80
+              }
+            }
           }
         }
       }
diff --git a/modules/kubernetes/k8s-dashboard/main.tf b/modules/kubernetes/k8s-dashboard/main.tf
index 37a2c4fd..513e9b18 100644
--- a/modules/kubernetes/k8s-dashboard/main.tf
+++ b/modules/kubernetes/k8s-dashboard/main.tf
@@ -10,12 +10,12 @@ resource "random_password" "csrf_token" {
 module "dashboard" {
   # source = "cookielab/dashboard/kubernetes"
   source                    = "ViktorBarzin/dashboard/kubernetes"
-  version                   = "0.13.1"
+  version                   = "0.13.2"
   kubernetes_dashboard_csrf = random_password.csrf_token.result
-  kubernetes_dashboard_deployment_args = list(
+  kubernetes_dashboard_deployment_args = tolist([
     "--auto-generate-certificates",
     "--token-ttl=0"
-  )
+  ])
 }
 
 module "tls_secret" {
@@ -41,7 +41,7 @@ module "tls_secret" {
 #   depends_on = [kubernetes_namespace.kubernetes-dashboard]
 # }
 
-resource "kubernetes_ingress" "kubernetes-dashboard" {
+resource "kubernetes_ingress_v1" "kubernetes-dashboard" {
   metadata {
     name      = "kubernetes-dashboard"
     namespace = "kubernetes-dashboard"
@@ -68,8 +68,12 @@ resource "kubernetes_ingress" "kubernetes-dashboard" {
         path {
           path = "/"
           backend {
-            service_name = "kubernetes-dashboard"
-            service_port = "443"
+            service {
+              name = "kubernetes-dashboard"
+              port {
+                number = 443
+              }
+            }
           }
         }
       }
@@ -96,7 +100,7 @@ resource "kubernetes_cluster_role_binding" "kubernetes-dashboard" {
   depends_on = [module.dashboard]
 }
 
-# resource "kubernetes_ingress" "oauth" {
+# resource "kubernetes_ingress_v1" "oauth" {
 #   metadata {
 #     name      = "kubernetes-dashboard"
 #     namespace = "oauth"
diff --git a/modules/kubernetes/kafka/main.tf b/modules/kubernetes/kafka/main.tf
index 6b5f9aef..7d5e746c 100644
--- a/modules/kubernetes/kafka/main.tf
+++ b/modules/kubernetes/kafka/main.tf
@@ -105,7 +105,7 @@ resource "kubernetes_service" "kafka-ui" {
   }
 }
 
-resource "kubernetes_ingress" "kafka-ui" {
+resource "kubernetes_ingress_v1" "kafka-ui" {
   metadata {
     name      = "kafka-ui-ingress"
     namespace = "kafka"
@@ -128,8 +128,12 @@ resource "kubernetes_ingress" "kafka-ui" {
         path {
           path = "/"
           backend {
-            service_name = "kafka-ui"
-            service_port = "80"
+            service {
+              name = "kafka-ui"
+              port {
+                number = 80
+              }
+            }
           }
         }
       }
diff --git a/modules/kubernetes/kms/main.tf b/modules/kubernetes/kms/main.tf
index 4ee82fc3..402c76a8 100644
--- a/modules/kubernetes/kms/main.tf
+++ b/modules/kubernetes/kms/main.tf
@@ -106,7 +106,7 @@ resource "kubernetes_service" "kms-web-page" {
   }
 }
 
-resource "kubernetes_ingress" "kms-web-page" {
+resource "kubernetes_ingress_v1" "kms-web-page" {
   metadata {
     name      = "kms-web-page"
     namespace = "kms"
@@ -126,8 +126,12 @@ resource "kubernetes_ingress" "kms-web-page" {
         path {
           path = "/"
           backend {
-            service_name = "kms-web-page"
-            service_port = "80"
+            service {
+              name = "kms-web-page"
+              port {
+                number = 80
+              }
+            }
           }
         }
       }
diff --git a/modules/kubernetes/monitoring/main.tf b/modules/kubernetes/monitoring/main.tf
index b4d2a89d..afbd98d9 100644
--- a/modules/kubernetes/monitoring/main.tf
+++ b/modules/kubernetes/monitoring/main.tf
@@ -182,7 +182,7 @@ resource "kubernetes_cron_job" "monitor_prom" {
   }
 }
 
-resource "kubernetes_ingress" "status" {
+resource "kubernetes_ingress_v1" "status" {
   metadata {
     name      = "hetrix-redirect-ingress"
     namespace = "monitoring"
@@ -203,8 +203,12 @@ resource "kubernetes_ingress" "status" {
         path {
           path = "/"
           backend {
-            service_name = "not-used" # redirected by annotation
-            service_port = "80"
+            service {
+              name = "not-used"
+              port {
+                number = 80 # redirected by annotation
+              }
+            }
           }
         }
       }
@@ -212,7 +216,7 @@ resource "kubernetes_ingress" "status" {
   }
 }
 
-resource "kubernetes_ingress" "status_yotovski" {
+resource "kubernetes_ingress_v1" "status_yotovski" {
   metadata {
     name      = "hetrix-yotovski-redirect-ingress"
     namespace = "monitoring"
@@ -233,8 +237,12 @@ resource "kubernetes_ingress" "status_yotovski" {
         path {
           path = "/"
           backend {
-            service_name = "not-used" # redirected by annotation
-            service_port = "80"
+            service {
+              name = "not-used" # redirected by annotation
+              port {
+                number = 80
+              }
+            }
           }
         }
       }
diff --git a/modules/kubernetes/oauth-proxy/main.tf b/modules/kubernetes/oauth-proxy/main.tf
index 25d25363..709f1a88 100644
--- a/modules/kubernetes/oauth-proxy/main.tf
+++ b/modules/kubernetes/oauth-proxy/main.tf
@@ -98,7 +98,7 @@ resource "kubernetes_service" "oauth_proxy" {
   }
 }
 
-resource "kubernetes_ingress" "oauth" {
+resource "kubernetes_ingress_v1" "oauth" {
   metadata {
     name      = "oauth-ingress"
     namespace = var.namespace
@@ -119,8 +119,12 @@ resource "kubernetes_ingress" "oauth" {
         path {
           path = "/oauth2/.*"
           backend {
-            service_name = var.svc_name
-            service_port = "80"
+            service {
+              name = var.svc_name
+              port {
+                number = 80
+              }
+            }
           }
         }
       }
diff --git a/modules/kubernetes/openid_help_page/main.tf b/modules/kubernetes/openid_help_page/main.tf
index 4ff04c33..338b92e1 100644
--- a/modules/kubernetes/openid_help_page/main.tf
+++ b/modules/kubernetes/openid_help_page/main.tf
@@ -78,7 +78,7 @@ resource "kubernetes_service" "openid_help_page" {
   }
 }
 
-resource "kubernetes_ingress" "openid_help_page" {
+resource "kubernetes_ingress_v1" "openid_help_page" {
   metadata {
     name      = "openid-help-page"
     namespace = "openid-help-page"
@@ -98,8 +98,12 @@ resource "kubernetes_ingress" "openid_help_page" {
         path {
           path = "/"
           backend {
-            service_name = "openid-help-page"
-            service_port = "80"
+            service {
+              name = "openid-help-page"
+              port {
+                number = 80
+              }
+            }
           }
         }
       }
diff --git a/modules/kubernetes/pihole/main.tf b/modules/kubernetes/pihole/main.tf
index e0081232..bdeb4b50 100644
--- a/modules/kubernetes/pihole/main.tf
+++ b/modules/kubernetes/pihole/main.tf
@@ -164,7 +164,7 @@ resource "kubernetes_service" "pihole-web" {
   }
 }
 
-resource "kubernetes_ingress" "pihole" {
+resource "kubernetes_ingress_v1" "pihole" {
   metadata {
     name      = "pihole-ingress"
     namespace = "pihole"
@@ -186,8 +186,12 @@ resource "kubernetes_ingress" "pihole" {
         path {
           path = "/"
           backend {
-            service_name = "pihole-web"
-            service_port = "80"
+            service {
+              name = "pihole-web"
+              port {
+                number = 80
+              }
+            }
           }
         }
       }
diff --git a/modules/kubernetes/privatebin/main.tf b/modules/kubernetes/privatebin/main.tf
index c76bcb19..16ce6293 100644
--- a/modules/kubernetes/privatebin/main.tf
+++ b/modules/kubernetes/privatebin/main.tf
@@ -98,7 +98,7 @@ resource "kubernetes_service" "privatebin" {
   }
 }
 
-resource "kubernetes_ingress" "privatebin" {
+resource "kubernetes_ingress_v1" "privatebin" {
   metadata {
     name      = "privatebin-ingress"
     namespace = "privatebin"
@@ -118,8 +118,12 @@ resource "kubernetes_ingress" "privatebin" {
         path {
           path = "/"
           backend {
-            service_name = "privatebin"
-            service_port = "80"
+            service {
+              name = "privatebin"
+              port {
+                number = 80
+              }
+            }
           }
         }
       }
@@ -130,8 +134,12 @@ resource "kubernetes_ingress" "privatebin" {
         path {
           path = "/"
           backend {
-            service_name = "privatebin"
-            service_port = "80"
+            service {
+              name = "privatebin"
+              port {
+                number = 80
+              }
+            }
           }
         }
       }
diff --git a/modules/kubernetes/reverse-proxy/main.tf b/modules/kubernetes/reverse-proxy/main.tf
index 5a858b9c..02dda5cb 100644
--- a/modules/kubernetes/reverse-proxy/main.tf
+++ b/modules/kubernetes/reverse-proxy/main.tf
@@ -41,7 +41,7 @@ resource "kubernetes_service" "openwrt" {
 #         port: 443
 #         protocol: TCP
 
-resource "kubernetes_ingress" "openwrt" {
+resource "kubernetes_ingress_v1" "openwrt" {
   metadata {
     name      = "openwrt-ingress"
     namespace = "website"
diff --git a/modules/kubernetes/versions.tf b/modules/kubernetes/versions.tf
index 5d7c4592..e854a5e4 100644
--- a/modules/kubernetes/versions.tf
+++ b/modules/kubernetes/versions.tf
@@ -1,8 +1,8 @@
 terraform {
   required_providers {
     kubernetes = {
-      source = "hashicorp/kubernetes"
+      source  = "hashicorp/kubernetes"
+      version = ">= 2.7.1"
     }
   }
-  required_version = ">= 0.13"
 }
diff --git a/modules/kubernetes/webhook_handler/main.tf b/modules/kubernetes/webhook_handler/main.tf
index 94a51700..7af21d5e 100644
--- a/modules/kubernetes/webhook_handler/main.tf
+++ b/modules/kubernetes/webhook_handler/main.tf
@@ -187,7 +187,7 @@ resource "kubernetes_service" "webhook_handler" {
   }
 }
 
-resource "kubernetes_ingress" "webhook_handler" {
+resource "kubernetes_ingress_v1" "webhook_handler" {
   metadata {
     name      = "webhook-handler-ingress"
     namespace = "webhook-handler"
@@ -207,8 +207,12 @@ resource "kubernetes_ingress" "webhook_handler" {
         path {
           path = "/"
           backend {
-            service_name = "webhook-handler"
-            service_port = "80"
+            service {
+              name = "webhook-handler"
+              port {
+                number = 80
+              }
+            }
           }
         }
       }