From 84f354452b415b217a37645b2062d1acc923f7db Mon Sep 17 00:00:00 2001
From: Richard Wei <54336863+WaysonWei@users.noreply.github.com>
Date: Mon, 10 Jan 2022 09:02:02 +1300
Subject: [PATCH] feat(k8s): add ingressClassName to payload EE-2129 (#6265)

* add ingressClassName to payload

* add IngressClass.Name into formValues
---
 app/kubernetes/ingress/converter.js | 3 ++-
 app/kubernetes/ingress/payloads.js  | 1 +
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/kubernetes/ingress/converter.js b/app/kubernetes/ingress/converter.js
index efbb6aeb7..ab71f3bd2 100644
--- a/app/kubernetes/ingress/converter.js
+++ b/app/kubernetes/ingress/converter.js
@@ -91,6 +91,7 @@ export class KubernetesIngressConverter {
       _.extend(res.Annotations, KubernetesIngressClassRewriteTargetAnnotations[formValues.IngressClass.Type]);
     }
     res.Annotations[KubernetesIngressClassAnnotation] = formValues.IngressClass.Name;
+    res.IngressClassName = formValues.IngressClass.Name;
     res.Hosts = formValues.Hosts;
     res.Paths = formValues.Paths;
     return res;
@@ -139,7 +140,7 @@ export class KubernetesIngressConverter {
     const res = new KubernetesIngressCreatePayload();
     res.metadata.name = data.Name;
     res.metadata.namespace = data.Namespace;
-    res.metadata.annotations = data.Annotations;
+    res.spec.ingressClassName = data.IngressClassName;
     if (data.Paths && data.Paths.length) {
       _.forEach(data.Paths, (p) => {
         if (p.Host === 'undefined' || p.Host === undefined) {
diff --git a/app/kubernetes/ingress/payloads.js b/app/kubernetes/ingress/payloads.js
index f5411b7c0..06c8535f7 100644
--- a/app/kubernetes/ingress/payloads.js
+++ b/app/kubernetes/ingress/payloads.js
@@ -4,6 +4,7 @@ export function KubernetesIngressCreatePayload() {
   return {
     metadata: new KubernetesCommonMetadataPayload(),
     spec: {
+      ingressClassName: '',
       rules: [],
     },
   };