From f8be9bb57abda428fc46e6efeee82f84ad829d1c Mon Sep 17 00:00:00 2001
From: Anthony Lapenna <anthony.lapenna@portainer.io>
Date: Thu, 20 Aug 2020 21:24:12 +1200
Subject: [PATCH] =?UTF-8?q?feat(k8s/resource-pool):=20set=20ingress=20host?=
 =?UTF-8?q?name=20as=20mandatory=20and=20remove=E2=80=A6=20(#4244)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* feat(k8s/resource-pool): set ingress hostname as mandatory and remove default backend

* refactor(k8s/resource-pool): use constants

* feat(k8s/configure): add experimental note about traefik
---
 app/kubernetes/ingress/payloads.js             |  4 ----
 app/kubernetes/views/configure/configure.html  |  9 +++++++++
 .../views/configure/configureController.js     |  4 ++++
 .../create/createResourcePool.html             | 11 +++++++----
 .../create/createResourcePoolController.js     |  3 +++
 .../resource-pools/edit/resourcePool.html      | 18 ++++++++++++++----
 .../edit/resourcePoolController.js             |  3 +++
 7 files changed, 40 insertions(+), 12 deletions(-)

diff --git a/app/kubernetes/ingress/payloads.js b/app/kubernetes/ingress/payloads.js
index 23e5ff317..d1c6279ec 100644
--- a/app/kubernetes/ingress/payloads.js
+++ b/app/kubernetes/ingress/payloads.js
@@ -4,10 +4,6 @@ export function KubernetesIngressCreatePayload() {
   return {
     metadata: new KubernetesCommonMetadataPayload(),
     spec: {
-      backend: {
-        serviceName: 'portainer-empty-default-backend',
-        servicePort: 1,
-      },
       rules: [],
     },
   };
diff --git a/app/kubernetes/views/configure/configure.html b/app/kubernetes/views/configure/configure.html
index 995055edf..adf5fd039 100644
--- a/app/kubernetes/views/configure/configure.html
+++ b/app/kubernetes/views/configure/configure.html
@@ -122,6 +122,15 @@
               </div>
             </div>
 
+            <div class="form-group" ng-if="ctrl.hasTraefikIngress()">
+              <span class="col-sm-12 text-muted small">
+                <p>
+                  <i class="fa fa-flask blue-icon" aria-hidden="true" style="margin-right: 2px;"></i>
+                  Traefik support is experimental.
+                </p>
+              </span>
+            </div>
+
             <div class="col-sm-12 form-section-title">
               Metrics
             </div>
diff --git a/app/kubernetes/views/configure/configureController.js b/app/kubernetes/views/configure/configureController.js
index d9025000e..2e7216c26 100644
--- a/app/kubernetes/views/configure/configureController.js
+++ b/app/kubernetes/views/configure/configureController.js
@@ -79,6 +79,10 @@ class KubernetesConfigureController {
     }
     this.onChangeIngressClass();
   }
+
+  hasTraefikIngress() {
+    return _.find(this.formValues.IngressClasses, { Type: this.IngressClassTypes.TRAEFIK });
+  }
   /* #endregion */
 
   /* #region  CONFIGURE */
diff --git a/app/kubernetes/views/resource-pools/create/createResourcePool.html b/app/kubernetes/views/resource-pools/create/createResourcePool.html
index 08fc73cb2..8bfa7db51 100644
--- a/app/kubernetes/views/resource-pools/create/createResourcePool.html
+++ b/app/kubernetes/views/resource-pools/create/createResourcePool.html
@@ -172,16 +172,19 @@
                     Hostname
                     <portainer-tooltip
                       position="bottom"
-                      message="Optional hostname associated to the ingress inside this resource pool. Users will be able to expose and access their applications over the ingress via this hostname or via IP address directly if not defined."
+                      message="Hostname associated to the ingress inside this resource pool. Users will be able to expose and access their applications over the ingress via this hostname."
                     >
                     </portainer-tooltip>
                   </label>
                   <div class="col-sm-10">
-                    <input class="form-control" ng-model="ic.Host" placeholder="host.com" ng-change="ctrl.onChangeIngressHostname()" />
+                    <input class="form-control" name="ingress_host_{{ $index }}" ng-model="ic.Host" placeholder="host.com" ng-change="ctrl.onChangeIngressHostname()" required />
                   </div>
                 </div>
-                <div class="form-group" ng-show="ctrl.state.duplicates.ingressHosts.refs[$index] !== undefined">
+                <div class="form-group" ng-show="resourcePoolCreationForm['ingress_host_' + $index].$invalid || ctrl.state.duplicates.ingressHosts.refs[$index] !== undefined">
                   <div class="col-sm-12 small text-warning">
+                    <div ng-messages="resourcePoolCreationForm['ingress_host_' + $index].$error">
+                      <p ng-message="required"><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> This field is required.</p>
+                    </div>
                     <p ng-if="ctrl.state.duplicates.ingressHosts.refs[$index] !== undefined">
                       <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
                       This host is already used.
@@ -189,7 +192,7 @@
                   </div>
                 </div>
 
-                <div class="form-group" ng-if="ic.IngressClass.Type === 'nginx'">
+                <div class="form-group" ng-if="ic.IngressClass.Type === ctrl.IngressClassTypes.NGINX">
                   <div class="col-sm-12">
                     <label class="control-label text-left">
                       Redirect published routes to / in application
diff --git a/app/kubernetes/views/resource-pools/create/createResourcePoolController.js b/app/kubernetes/views/resource-pools/create/createResourcePoolController.js
index 573058d53..4f4e0163f 100644
--- a/app/kubernetes/views/resource-pools/create/createResourcePoolController.js
+++ b/app/kubernetes/views/resource-pools/create/createResourcePoolController.js
@@ -7,6 +7,7 @@ import { KubernetesResourcePoolFormValues, KubernetesResourcePoolIngressClassAnn
 import { KubernetesIngressConverter } from 'Kubernetes/ingress/converter';
 import KubernetesFormValidationHelper from 'Kubernetes/helpers/formValidationHelper';
 import { KubernetesFormValueDuplicate } from 'Kubernetes/models/application/formValues';
+import { KubernetesIngressClassTypes } from 'Kubernetes/ingress/constants';
 
 class KubernetesCreateResourcePoolController {
   /* #region  CONSTRUCTOR */
@@ -22,6 +23,8 @@ class KubernetesCreateResourcePoolController {
     this.KubernetesResourcePoolService = KubernetesResourcePoolService;
     this.KubernetesIngressService = KubernetesIngressService;
 
+    this.IngressClassTypes = KubernetesIngressClassTypes;
+
     this.onInit = this.onInit.bind(this);
     this.createResourcePoolAsync = this.createResourcePoolAsync.bind(this);
     this.getResourcePoolsAsync = this.getResourcePoolsAsync.bind(this);
diff --git a/app/kubernetes/views/resource-pools/edit/resourcePool.html b/app/kubernetes/views/resource-pools/edit/resourcePool.html
index c044f2c96..4076ea583 100644
--- a/app/kubernetes/views/resource-pools/edit/resourcePool.html
+++ b/app/kubernetes/views/resource-pools/edit/resourcePool.html
@@ -163,16 +163,26 @@
                         Hostname
                         <portainer-tooltip
                           position="bottom"
-                          message="Optional hostname associated to the ingress inside this resource pool. Users will be able to expose and access their applications over the ingress via this hostname or via IP address directly if not defined."
+                          message="Hostname associated to the ingress inside this resource pool. Users will be able to expose and access their applications over the ingress via this hostname."
                         >
                         </portainer-tooltip>
                       </label>
                       <div class="col-sm-10">
-                        <input class="form-control" ng-model="ic.Host" placeholder="host.com" ng-change="ctrl.onChangeIngressHostname()" />
+                        <input
+                          class="form-control"
+                          name="ingress_host_{{ $index }}"
+                          ng-model="ic.Host"
+                          placeholder="host.com"
+                          ng-change="ctrl.onChangeIngressHostname()"
+                          required
+                        />
                       </div>
                     </div>
-                    <div class="form-group" ng-show="ctrl.state.duplicates.ingressHosts.refs[$index] !== undefined">
+                    <div class="form-group" ng-show="resourcePoolEditForm['ingress_host_' + $index].$invalid || ctrl.state.duplicates.ingressHosts.refs[$index] !== undefined">
                       <div class="col-sm-12 small text-warning">
+                        <div ng-messages="resourcePoolEditForm['ingress_host_' + $index].$error">
+                          <p ng-message="required"><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> This field is required.</p>
+                        </div>
                         <p ng-if="ctrl.state.duplicates.ingressHosts.refs[$index] !== undefined">
                           <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
                           This host is already used.
@@ -180,7 +190,7 @@
                       </div>
                     </div>
 
-                    <div class="form-group" ng-if="ic.IngressClass.Type === 'nginx'">
+                    <div class="form-group" ng-if="ic.IngressClass.Type === ctrl.IngressClassTypes.NGINX">
                       <div class="col-sm-12">
                         <label class="control-label text-left">
                           Redirect published routes to / in application
diff --git a/app/kubernetes/views/resource-pools/edit/resourcePoolController.js b/app/kubernetes/views/resource-pools/edit/resourcePoolController.js
index a258049db..867e83cbb 100644
--- a/app/kubernetes/views/resource-pools/edit/resourcePoolController.js
+++ b/app/kubernetes/views/resource-pools/edit/resourcePoolController.js
@@ -8,6 +8,7 @@ import { KubernetesResourcePoolFormValues, KubernetesResourcePoolIngressClassAnn
 import { KubernetesIngressConverter } from 'Kubernetes/ingress/converter';
 import { KubernetesFormValueDuplicate } from 'Kubernetes/models/application/formValues';
 import KubernetesFormValidationHelper from 'Kubernetes/helpers/formValidationHelper';
+import { KubernetesIngressClassTypes } from 'Kubernetes/ingress/constants';
 
 class KubernetesResourcePoolController {
   /* #region  CONSTRUCTOR */
@@ -46,6 +47,8 @@ class KubernetesResourcePoolController {
     this.KubernetesNamespaceHelper = KubernetesNamespaceHelper;
     this.KubernetesIngressService = KubernetesIngressService;
 
+    this.IngressClassTypes = KubernetesIngressClassTypes;
+
     this.onInit = this.onInit.bind(this);
     this.createResourceQuotaAsync = this.createResourceQuotaAsync.bind(this);
     this.updateResourcePoolAsync = this.updateResourcePoolAsync.bind(this);