From 9a540d568ec3f0f162c65f79f0a069007b0fd293 Mon Sep 17 00:00:00 2001
From: "Shkar T. Noori" <shkarface@gmail.com>
Date: Tue, 25 Oct 2022 16:29:29 +0000
Subject: [PATCH] Improve ingress resource definition

---
 kubernetes/base/ingress.yaml                     | 5 +++--
 kubernetes/base/service.yaml                     | 2 ++
 kubernetes/development/patches/ingress-host.yaml | 7 +++----
 kubernetes/production/patches/ingress-host.yaml  | 7 +++----
 4 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/kubernetes/base/ingress.yaml b/kubernetes/base/ingress.yaml
index 8152274..13b996e 100644
--- a/kubernetes/base/ingress.yaml
+++ b/kubernetes/base/ingress.yaml
@@ -6,6 +6,8 @@ metadata:
   annotations:
     cert-manager.io/cluster-issuer: letsencrypt-cluster-issuer
 spec:
+  tls:
+    - secretName: ingress-cert-dit-docs-dsm-client
   rules:
     - http:
         paths:
@@ -14,5 +16,4 @@ spec:
             backend:
               service:
                 name: service
-                port:
-                  number: 80
+                port: { name: http }
diff --git a/kubernetes/base/service.yaml b/kubernetes/base/service.yaml
index 54983f3..e643219 100644
--- a/kubernetes/base/service.yaml
+++ b/kubernetes/base/service.yaml
@@ -10,4 +10,6 @@ spec:
     app: dsm-client
   ports:
     - port: 80
+      name: http
+      targetPort: http
   type: ClusterIP
diff --git a/kubernetes/development/patches/ingress-host.yaml b/kubernetes/development/patches/ingress-host.yaml
index 3f572b8..d96f46a 100644
--- a/kubernetes/development/patches/ingress-host.yaml
+++ b/kubernetes/development/patches/ingress-host.yaml
@@ -1,9 +1,8 @@
+---
 - op: add
   path: /spec/rules/0/host
   value: service-manual.docs.dev.krd
 - op: add
-  path: /spec/tls
+  path: /spec/tls/0/hosts
   value:
-    - hosts:
-        - service-manual.docs.dev.krd
-      secretName: ingress-cert-dit-docs-dsm-client
+    - service-manual.docs.dev.krd
diff --git a/kubernetes/production/patches/ingress-host.yaml b/kubernetes/production/patches/ingress-host.yaml
index 3837674..ce6a775 100644
--- a/kubernetes/production/patches/ingress-host.yaml
+++ b/kubernetes/production/patches/ingress-host.yaml
@@ -1,9 +1,8 @@
+---
 - op: add
   path: /spec/rules/0/host
   value: docs.digital.gov.krd
 - op: add
-  path: /spec/tls
+  path: /spec/tls/0/hosts
   value:
-    - hosts:
-        - docs.digital.gov.krd
-      secretName: ingress-cert-dit-docs-dsm-client
+    - docs.digital.gov.krd