Merge branch 'release/2.5'

fix(stacks): check for editor change before setting as dirty

.github/ISSUE_TEMPLATE/Bug_report.md

@@ -4,7 +4,6 @@ about: Create a bug report
 title: ''
 labels: bug/need-confirmation, kind/bug
 assignees: ''
-
 ---
 
 <!--

.github/ISSUE_TEMPLATE/Custom.md

@@ -4,8 +4,8 @@ about: Ask us a question about Portainer usage or deployment
 title: ''
 labels: ''
 assignees: ''
-
 ---
+
 Before you start, we need a little bit more information from you:
 
 Use Case (delete as appropriate): Using Portainer at Home, Using Portainer in a Commerical setup.

api/cmd/portainer/main.go

@@ -76,7 +76,7 @@ func initDataStore(dataStorePath string, fileService portainer.FileService) port
 }
 
 func initComposeStackManager(assetsPath string, dataStorePath string, reverseTunnelService portainer.ReverseTunnelService, proxyManager *proxy.Manager) portainer.ComposeStackManager {
-	composeWrapper := exec.NewComposeWrapper(assetsPath, proxyManager)
+	composeWrapper := exec.NewComposeWrapper(assetsPath, dataStorePath, proxyManager)
 	if composeWrapper != nil {
 		return composeWrapper
 	}

api/exec/compose_wrapper.go

@@ -16,17 +16,19 @@ import (
 // ComposeWrapper is a wrapper for docker-compose binary
 type ComposeWrapper struct {
 	binaryPath   string
+	dataPath     string
 	proxyManager *proxy.Manager
 }
 
 // NewComposeWrapper returns a docker-compose wrapper if corresponding binary present, otherwise nil
-func NewComposeWrapper(binaryPath string, proxyManager *proxy.Manager) *ComposeWrapper {
+func NewComposeWrapper(binaryPath, dataPath string, proxyManager *proxy.Manager) *ComposeWrapper {
 	if !IsBinaryPresent(programPath(binaryPath, "docker-compose")) {
 		return nil
 	}
 
 	return &ComposeWrapper{
 		binaryPath:   binaryPath,
+		dataPath:     dataPath,
 		proxyManager: proxyManager,
 	}
 }
@@ -84,6 +86,8 @@ func (w *ComposeWrapper) command(command []string, stack *portainer.Stack, endpo
 
 	var stderr bytes.Buffer
 	cmd := exec.Command(program, args...)
+	cmd.Env = os.Environ()
+	cmd.Env = append(cmd.Env, fmt.Sprintf("DOCKER_CONFIG=%s", w.dataPath))
 	cmd.Stderr = &stderr
 
 	out, err := cmd.Output()

api/exec/compose_wrapper_integration_test.go

@@ -42,7 +42,7 @@ func Test_UpAndDown(t *testing.T) {
 
 	stack, endpoint := setup(t)
 
-	w := NewComposeWrapper("", nil)
+	w := NewComposeWrapper("", "", nil)
 
 	err := w.Up(stack, endpoint)
 	if err != nil {

api/http/handler/endpointproxy/proxy_kubernetes.go

@@ -77,5 +77,5 @@ func (handler *Handler) proxyRequestsToKubernetesAPI(w http.ResponseWriter, r *h
 }
 
 func isKubernetesRequest(requestURL string) bool {
-	return strings.HasPrefix(requestURL, "/api")
+	return strings.HasPrefix(requestURL, "/api") || strings.HasPrefix(requestURL, "/healthz")
 }

api/http/proxy/factory/azure/containergroup.go

@@ -23,6 +23,36 @@ func (transport *Transport) proxyContainerGroupRequest(request *http.Request) (*
 }
 
 func (transport *Transport) proxyContainerGroupPutRequest(request *http.Request) (*http.Response, error) {
+	//add a lock before processing existense check
+	transport.mutex.Lock()
+	defer transport.mutex.Unlock()
+
+	//generate a temp http GET request based on the current PUT request
+	validationRequest := &http.Request{
+		Method: http.MethodGet,
+		URL:    request.URL,
+		Header: http.Header{
+			"Authorization": []string{request.Header.Get("Authorization")},
+		},
+	}
+
+	//fire the request to Azure API to validate if there is an existing container instance with the same name
+	//positive - reject the request
+	//negative - continue the process
+	validationResponse, err := http.DefaultTransport.RoundTrip(validationRequest)
+	if err != nil {
+		return validationResponse, err
+	}
+
+	if validationResponse.StatusCode >= 200 && validationResponse.StatusCode < 300 {
+		resp := &http.Response{}
+		errObj := map[string]string{
+			"message": "A container instance with the same name already exists inside the selected resource group",
+		}
+		err = responseutils.RewriteResponse(resp, errObj, http.StatusConflict)
+		return resp, err
+	}
+
 	response, err := http.DefaultTransport.RoundTrip(request)
 	if err != nil {
 		return response, err

api/portainer.go

@@ -336,7 +336,7 @@ type (
 		// Whether non-administrator should be able to use container capabilities
 		AllowContainerCapabilitiesForRegularUsers bool `json:"allowContainerCapabilitiesForRegularUsers" example:"true"`
 		// Whether non-administrator should be able to use sysctl settings
-		AllowSysctlSettingForRegularUsers bool `json:"AllowSysctlSettingForRegularUsers" example:"true"`
+		AllowSysctlSettingForRegularUsers bool `json:"allowSysctlSettingForRegularUsers" example:"true"`
 		// Whether host management features are enabled
 		EnableHostManagementFeatures bool `json:"enableHostManagementFeatures" example:"true"`
 	}
@@ -1327,7 +1327,7 @@ type (
 
 const (
 	// APIVersion is the version number of the Portainer API
-	APIVersion = "2.4.0"
+	APIVersion = "2.5.0"
 	// DBVersion is the version number of the Portainer database
 	DBVersion = 27
 	// ComposeSyntaxMaxVersion is a maximum supported version of the docker compose syntax

app/docker/components/imageRegistry/por-image-registry-rate-limits.controller.js

@@ -23,6 +23,7 @@ export default class porImageRegistryContainerController {
       } catch (e) {
         // eslint-disable-next-line no-console
         console.error('Failed loading DockerHub pull rate limits', e);
+        this.setValidity(true);
       }
     } else {
       this.setValidity(true);

app/docker/components/imageRegistry/por-image-registry.html

@@ -1,6 +1,6 @@
 <!-- use registry -->
-<div ng-if="$ctrl.model.UseRegistry">
-  <div class="form-group">
+<div>
+  <div class="form-group" ng-if="$ctrl.model.UseRegistry">
     <label for="image_registry" class="control-label text-left" ng-class="$ctrl.labelClass">
       Registry
     </label>

app/docker/views/containers/create/createContainerController.js

@@ -972,9 +972,7 @@ angular.module('portainer.docker').controller('CreateContainerController', [
     }
 
     async function shouldShowSysctls() {
-      const { allowSysctlSettingForRegularUsers } = $scope.applicationState.application;
-
-      return allowSysctlSettingForRegularUsers || Authentication.isAdmin();
+      return endpoint.SecuritySettings.allowSysctlSettingForRegularUsers || Authentication.isAdmin();
     }
 
     async function checkIfContainerCapabilitiesEnabled() {

app/docker/views/services/create/createServiceController.js

@@ -499,7 +499,7 @@ angular.module('portainer.docker').controller('CreateServiceController', [
           const resourceControl = data.Portainer.ResourceControl;
           const userId = Authentication.getUserDetails().ID;
           const rcPromise = ResourceControlService.applyResourceControl(userId, accessControlData, resourceControl);
-          const webhookPromise = $q.when(endpoint.Type !== 4 && $scope.formValues.Webhook && WebhookService.createServiceWebhook(serviceId, endpoint.ID));
+          const webhookPromise = $q.when(endpoint.Type !== 4 && $scope.formValues.Webhook && WebhookService.createServiceWebhook(serviceId, endpoint.Id));
           return $q.all([rcPromise, webhookPromise]);
         })
         .then(function success() {

app/edge/components/edit-edge-stack-form/editEdgeStackFormController.js

@@ -5,7 +5,9 @@ export class EditEdgeStackFormController {
   }
 
   editorUpdate(cm) {
-    this.model.StackFileContent = cm.getValue();
-    this.isEditorDirty = true;
+    if (this.model.StackFileContent.replace(/(\r\n|\n|\r)/gm, '') !== cm.getValue().replace(/(\r\n|\n|\r)/gm, '')) {
+      this.model.StackFileContent = cm.getValue();
+      this.isEditorDirty = true;
+    }
   }
 }

app/kubernetes/__module.js

@@ -100,16 +100,6 @@ angular.module('portainer.kubernetes', ['portainer.app']).config([
       },
     };
 
-    const applicationStats = {
-      name: 'kubernetes.applications.application.stats',
-      url: '/:pod/:container/stats',
-      views: {
-        'content@': {
-          component: 'kubernetesApplicationStatsView',
-        },
-      },
-    };
-
     const stacks = {
       name: 'kubernetes.stacks',
       url: '/stacks',
@@ -269,7 +259,6 @@ angular.module('portainer.kubernetes', ['portainer.app']).config([
     $stateRegistryProvider.register(applicationEdit);
     $stateRegistryProvider.register(applicationConsole);
     $stateRegistryProvider.register(applicationLogs);
-    $stateRegistryProvider.register(applicationStats);
     $stateRegistryProvider.register(stacks);
     $stateRegistryProvider.register(stack);
     $stateRegistryProvider.register(stackLogs);

app/kubernetes/components/datatables/application/containers-datatable/containersDatatable.html

@@ -131,13 +131,6 @@
               </td>
               <td>{{ item.CreationDate | getisodate }}</td>
               <td>
-                <a
-                  ng-if="item.Status === 'Running' && $ctrl.useServerMetrics"
-                  ui-sref="kubernetes.applications.application.stats({ pod: item.PodName, container: item.Name })"
-                  style="margin-right: 10px;"
-                >
-                  <i class="fa fa-chart-area" aria-hidden="true"></i> Stats
-                </a>
                 <a ui-sref="kubernetes.applications.application.logs({ pod: item.PodName, container: item.Name })"> <i class="fa fa-file-alt" aria-hidden="true"></i> Logs </a>
                 <a ng-if="item.Status === 'Running'" ui-sref="kubernetes.applications.application.console({ pod: item.PodName, container: item.Name })" style="margin-left: 10px;">
                   <i class="fa fa-terminal" aria-hidden="true"></i> Console

app/kubernetes/components/datatables/application/containers-datatable/containersDatatable.js

@@ -9,6 +9,5 @@ angular.module('portainer.kubernetes').component('kubernetesContainersDatatable'
     orderBy: '@',
     refreshCallback: '<',
     isPod: '<',
-    useServerMetrics: '<',
   },
 });

app/kubernetes/components/kubernetes-configuration-data/kubernetesConfigurationDataController.js

@@ -43,8 +43,10 @@ class KubernetesConfigurationDataController {
   }
 
   async editorUpdateAsync(cm) {
-    this.formValues.DataYaml = cm.getValue();
-    this.isEditorDirty = true;
+    if (this.formValues.DataYaml !== cm.getValue()) {
+      this.formValues.DataYaml = cm.getValue();
+      this.isEditorDirty = true;
+    }
   }
 
   editorUpdate(cm) {

app/kubernetes/components/yaml-inspector/yamlInspector.html

@@ -3,7 +3,8 @@
   <div style="margin: 15px;">
     <span class="btn btn-primary btn-sm" ng-click="$ctrl.copyYAML()"><i class="fa fa-copy space-right" aria-hidden="true"></i>Copy to clipboard</span>
     <span class="btn btn-primary btn-sm space-left" ng-click="$ctrl.toggleYAMLInspectorExpansion()">
-      <i class="fa fa-{{ $ctrl.expanded ? 'minus' : 'plus' }} space-right" aria-hidden="true"></i>{{ $ctrl.expanded ? 'Collapse' : 'Expand' }}</span>
+      <i class="fa fa-{{ $ctrl.expanded ? 'minus' : 'plus' }} space-right" aria-hidden="true"></i>{{ $ctrl.expanded ? 'Collapse' : 'Expand' }}</span
+    >
     <span id="copyNotificationYAML" style="margin-left: 7px; display: none; color: #23ae89;" class="small"> <i class="fa fa-check" aria-hidden="true"></i> copied </span>
   </div>
 </div>

app/kubernetes/filters/applicationFilters.js

@@ -132,14 +132,4 @@ angular
       };
       return values[text] || text;
     };
-  })
-  .filter('kubernetesApplicationIngressEmptyHostname', function () {
-    'use strict';
-    return function (value) {
-      if (value === '') {
-        return '<use IP>';
-      } else {
-        return value;
-      }
-    };
   });

app/kubernetes/helpers/formValidationHelper.js

@@ -16,7 +16,7 @@ class KubernetesFormValidationHelper {
     const groupped = _.groupBy(names);
     const res = {};
     _.forEach(names, (name, index) => {
-      if (name && groupped[name].length > 1) {
+      if (groupped[name].length > 1 && name) {
         res[index] = name;
       }
     });

app/kubernetes/helpers/resourceReservationHelper.js

@@ -29,8 +29,6 @@ class KubernetesResourceReservationHelper {
     let res = parseInt(cpu, 10);
     if (_.endsWith(cpu, 'm')) {
       res /= 1000;
-    } else if (_.endsWith(cpu, 'n')) {
-      res /= 1000000000;
     }
     return res;
   }

app/kubernetes/ingress/converter.js

@@ -2,18 +2,22 @@ import _ from 'lodash-es';
 import * as JsonPatch from 'fast-json-patch';
 
 import KubernetesCommonHelper from 'Kubernetes/helpers/commonHelper';
-import {
-  KubernetesResourcePoolIngressClassAnnotationFormValue,
-  KubernetesResourcePoolIngressClassFormValue,
-  KubernetesResourcePoolIngressClassHostFormValue,
-} from 'Kubernetes/models/resource-pool/formValues';
+import { KubernetesResourcePoolIngressClassAnnotationFormValue, KubernetesResourcePoolIngressClassFormValue } from 'Kubernetes/models/resource-pool/formValues';
 import { KubernetesIngress, KubernetesIngressRule } from './models';
 import { KubernetesIngressCreatePayload, KubernetesIngressRuleCreatePayload, KubernetesIngressRulePathCreatePayload } from './payloads';
 import { KubernetesIngressClassAnnotation, KubernetesIngressClassRewriteTargetAnnotations } from './constants';
 
 export class KubernetesIngressConverter {
+  // TODO: refactor @LP
+  // currently only allows the first non-empty host to be used as the "configured" host.
+  // As we currently only allow a single host to be used for a Portianer-managed ingress
+  // it's working as the only non-empty host will be the one defined by the admin
+  // but it will take a random existing host for non Portainer ingresses (CLI deployed)
+  // Also won't support multiple hosts if we make it available in the future
   static apiToModel(data) {
+    let host = undefined;
     const paths = _.flatMap(data.spec.rules, (rule) => {
+      host = host || rule.host; // TODO: refactor @LP - read above
       return !rule.http
         ? []
         : _.map(rule.http.paths, (path) => {
@@ -37,11 +41,7 @@ export class KubernetesIngressConverter {
         ? data.metadata.annotations[KubernetesIngressClassAnnotation]
         : data.spec.ingressClassName;
     res.Paths = paths;
-    res.Hosts = _.uniq(_.map(data.spec.rules, 'host'));
-    const idx = _.findIndex(res.Hosts, (h) => h === undefined);
-    if (idx >= 0) {
-      res.Hosts.splice(idx, 1, '');
-    }
+    res.Host = host;
     return res;
   }
 
@@ -79,7 +79,7 @@ export class KubernetesIngressConverter {
       _.extend(res.Annotations, KubernetesIngressClassRewriteTargetAnnotations[formValues.IngressClass.Type]);
     }
     res.Annotations[KubernetesIngressClassAnnotation] = formValues.IngressClass.Name;
-    res.Hosts = formValues.Hosts;
+    res.Host = formValues.Host;
     res.Paths = formValues.Paths;
     return res;
   }
@@ -96,13 +96,7 @@ export class KubernetesIngressConverter {
       if (ingress) {
         fv.Selected = true;
         fv.WasSelected = true;
-        fv.Hosts = _.map(ingress.Hosts, (host) => {
-          const hfv = new KubernetesResourcePoolIngressClassHostFormValue();
-          hfv.Host = host;
-          hfv.PreviousHost = host;
-          hfv.IsNew = false;
-          return hfv;
-        });
+        fv.Host = ingress.Host;
         const [[rewriteKey]] = _.toPairs(KubernetesIngressClassRewriteTargetAnnotations[ic.Type]);
         const annotations = _.map(_.toPairs(ingress.Annotations), ([key, value]) => {
           if (key === rewriteKey) {
@@ -134,17 +128,16 @@ export class KubernetesIngressConverter {
           p.Host = '';
         }
       });
-      const hostsWithRules = [];
       const groups = _.groupBy(data.Paths, 'Host');
-      let rules = _.map(groups, (paths, host) => {
-        const updatedHost = _.find(data.Hosts, (h) => {
-          return h === host || h.PreviousHost === host;
-        });
-        host = updatedHost.Host || updatedHost;
-        if (updatedHost.NeedsDeletion) {
-          return;
-        }
+      const rules = _.map(groups, (paths, host) => {
         const rule = new KubernetesIngressRuleCreatePayload();
+
+        if (host === 'undefined' || _.isEmpty(host)) {
+          host = data.Host;
+        }
+        if (host === data.PreviousHost && host !== data.Host) {
+          host = data.Host;
+        }
         KubernetesCommonHelper.assignOrDeleteIfEmpty(rule, 'host', host);
         rule.http.paths = _.map(paths, (p) => {
           const path = new KubernetesIngressRulePathCreatePayload();
@@ -153,27 +146,11 @@ export class KubernetesIngressConverter {
           path.backend.servicePort = p.Port;
           return path;
         });
-        hostsWithRules.push(host);
         return rule;
       });
-      rules = _.without(rules, undefined);
-      const keptHosts = _.without(
-        _.map(data.Hosts, (h) => (h.NeedsDeletion ? undefined : h.Host || h)),
-        undefined
-      );
-      const hostsWithoutRules = _.without(keptHosts, ...hostsWithRules);
-      const emptyRules = _.map(hostsWithoutRules, (host) => {
-        return { host: host };
-      });
-      rules = _.concat(rules, emptyRules);
       KubernetesCommonHelper.assignOrDeleteIfEmpty(res, 'spec.rules', rules);
-    } else if (data.Hosts) {
-      res.spec.rules = [];
-      _.forEach(data.Hosts, (host) => {
-        if (!host.NeedsDeletion) {
-          res.spec.rules.push({ host: host.Host });
-        }
-      });
+    } else if (data.Host) {
+      res.spec.rules = [{ host: data.Host }];
     } else {
       delete res.spec.rules;
     }

app/kubernetes/ingress/models.js

@@ -3,9 +3,8 @@ export function KubernetesIngress() {
     Name: '',
     Namespace: '',
     Annotations: {},
-    // Host: undefined,
-    Hosts: [],
-    // PreviousHost: undefined, // only use for RP ingress host edit
+    Host: undefined,
+    PreviousHost: undefined, // only use for RP ingress host edit
     Paths: [],
     IngressClassName: '',
   };

app/kubernetes/ingress/service.js

@@ -77,12 +77,11 @@ export function KubernetesIngressService($async, KubernetesIngresses) {
     });
   }
 
-  function _delete(ingress) {
+  function _delete(namespace, ingressClassName) {
     return $async(async () => {
       try {
         const params = new KubernetesCommonParams();
-        params.id = ingress.Name;
-        const namespace = ingress.Namespace;
+        params.id = ingressClassName;
         await KubernetesIngresses(namespace).delete(params).$promise;
       } catch (err) {
         throw new PortainerError('Unable to delete ingress', err);

app/kubernetes/metrics/metrics.js

@@ -1,53 +0,0 @@
-import angular from 'angular';
-import PortainerError from 'Portainer/error';
-import { KubernetesCommonParams } from 'Kubernetes/models/common/params';
-
-class KubernetesMetricsService {
-  /* @ngInject */
-  constructor($async, KubernetesMetrics) {
-    this.$async = $async;
-    this.KubernetesMetrics = KubernetesMetrics;
-
-    this.capabilitiesAsync = this.capabilitiesAsync.bind(this);
-    this.getPodAsync = this.getPodAsync.bind(this);
-  }
-
-  /**
-   * GET
-   */
-  async capabilitiesAsync(endpointID) {
-    try {
-      await this.KubernetesMetrics().capabilities({ endpointId: endpointID }).$promise;
-    } catch (err) {
-      throw new PortainerError('Unable to retrieve metrics', err);
-    }
-  }
-
-  capabilities(endpointID) {
-    return this.$async(this.capabilitiesAsync, endpointID);
-  }
-
-  /**
-   * Stats
-   *
-   * @param {string} namespace
-   * @param {string} podName
-   */
-  async getPodAsync(namespace, podName) {
-    try {
-      const params = new KubernetesCommonParams();
-      params.id = podName;
-      const data = await this.KubernetesMetrics(namespace).getPod(params).$promise;
-      return data;
-    } catch (err) {
-      throw new PortainerError('Unable to retrieve pod stats', err);
-    }
-  }
-
-  getPod(namespace, podName) {
-    return this.$async(this.getPodAsync, namespace, podName);
-  }
-}
-
-export default KubernetesMetricsService;
-angular.module('portainer.kubernetes').service('KubernetesMetricsService', KubernetesMetricsService);

app/kubernetes/metrics/rest.js

@@ -1,27 +0,0 @@
-angular.module('portainer.kubernetes').factory('KubernetesMetrics', [
-  '$resource',
-  'API_ENDPOINT_ENDPOINTS',
-  'EndpointProvider',
-  function KubernetesMetrics($resource, API_ENDPOINT_ENDPOINTS, EndpointProvider) {
-    'use strict';
-    return function (namespace) {
-      const url = API_ENDPOINT_ENDPOINTS + '/:endpointId/kubernetes/apis/metrics.k8s.io/v1beta1';
-      const podUrl = `${url}${namespace ? '/namespaces/:namespace' : ''}/pods/:id`;
-
-      return $resource(
-        url,
-        {
-          endpointId: EndpointProvider.endpointID,
-          namespace: namespace,
-        },
-        {
-          capabilities: { method: 'GET' },
-          getPod: {
-            method: 'GET',
-            url: podUrl,
-          },
-        }
-      );
-    };
-  },
-]);

app/kubernetes/models/resource-pool/formValues.js

@@ -17,7 +17,7 @@ export function KubernetesResourcePoolIngressClassFormValue(ingressClass) {
     IngressClass: ingressClass,
     RewriteTarget: false,
     Annotations: [], // KubernetesResourcePoolIngressClassAnnotationFormValue
-    Hosts: [],
+    Host: undefined,
     Selected: false,
     WasSelected: false,
     AdvancedConfig: false,
@@ -31,12 +31,3 @@ export function KubernetesResourcePoolIngressClassAnnotationFormValue() {
     Value: '',
   };
 }
-
-export function KubernetesResourcePoolIngressClassHostFormValue() {
-  return {
-    Host: '',
-    PreviousHost: '',
-    NeedsDeletion: false,
-    IsNew: true,
-  };
-}

app/kubernetes/services/resourcePoolService.js

@@ -93,7 +93,7 @@ export function KubernetesResourcePoolService($async, KubernetesNamespaceService
         const patch = _.without(newIngresses, ...create);
 
         const createPromises = _.map(create, (i) => KubernetesIngressService.create(i));
-        const delPromises = _.map(del, (i) => KubernetesIngressService.delete(i));
+        const delPromises = _.map(del, (i) => KubernetesIngressService.delete(i.Namespace, i.Name));
         const patchPromises = _.map(patch, (ing) => {
           const old = _.find(oldIngresses, { Name: ing.Name });
           ing.Paths = angular.copy(old.Paths);

app/kubernetes/views/applications/create/createApplication.html

@@ -1264,14 +1264,7 @@
                   tooltip-enable="ctrl.disableLoadBalancerEdit()"
                   uib-tooltip="Edition is not allowed while the Load Balancer is in 'Pending' state"
                 >
-                  <div
-                    class="input-group input-group-sm"
-                    ng-class="{
-                      striked: publishedPort.NeedsDeletion,
-                      'col-sm-2': ctrl.formValues.PublishingType === ctrl.ApplicationPublishingTypes.INGRESS,
-                      'col-sm-3': ctrl.formValues.PublishingType !== ctrl.ApplicationPublishingTypes.INGRESS
-                    }"
-                  >
+                  <div class="col-sm-3 input-group input-group-sm" ng-class="{ striked: publishedPort.NeedsDeletion }">
                     <span class="input-group-addon">container port</span>
                     <input
                       type="number"
@@ -1334,7 +1327,7 @@
                   </div>
 
                   <div
-                    class="col-sm-2 input-group input-group-sm"
+                    class="col-sm-3 input-group input-group-sm"
                     ng-class="{ striked: publishedPort.NeedsDeletion }"
                     ng-if="
                       (publishedPort.IsNew && ctrl.formValues.PublishingType === ctrl.ApplicationPublishingTypes.INGRESS) ||
@@ -1356,28 +1349,7 @@
                   </div>
 
                   <div
-                    class="col-sm-2 input-group input-group-sm"
-                    ng-class="{ striked: publishedPort.NeedsDeletion }"
-                    ng-if="
-                      (publishedPort.IsNew && ctrl.formValues.PublishingType === ctrl.ApplicationPublishingTypes.INGRESS) ||
-                      (!publishedPort.IsNew && ctrl.savedFormValues.PublishingType === ctrl.ApplicationPublishingTypes.INGRESS)
-                    "
-                  >
-                    <span class="input-group-addon">hostname</span>
-                    <select
-                      class="form-control"
-                      name="ingress_hostname_{{ $index }}"
-                      ng-model="publishedPort.IngressHost"
-                      ng-options="host as (host | kubernetesApplicationIngressEmptyHostname) for host in ctrl.ingressHostnames"
-                      ng-change="ctrl.onChangePublishedPorts()"
-                      ng-disabled="ctrl.disableLoadBalancerEdit() || ctrl.isEditAndNotNewPublishedPort($index)"
-                    >
-                      <option selected disabled hidden value="">Select a hostname</option>
-                    </select>
-                  </div>
-
-                  <div
-                    class="col-sm-2 input-group input-group-sm"
+                    class="col-sm-3 input-group input-group-sm"
                     ng-class="{ striked: publishedPort.NeedsDeletion }"
                     ng-if="
                       (publishedPort.IsNew && ctrl.formValues.PublishingType === ctrl.ApplicationPublishingTypes.INGRESS) ||

app/kubernetes/views/applications/create/createApplicationController.js

@@ -320,7 +320,7 @@ class KubernetesCreateApplicationController {
     const p = new KubernetesApplicationPublishedPortFormValue();
     const ingresses = this.filteredIngresses;
     p.IngressName = ingresses && ingresses.length ? ingresses[0].Name : undefined;
-    p.IngressHost = ingresses && ingresses.length ? ingresses[0].Hosts[0] : undefined;
+    p.IngressHost = ingresses && ingresses.length ? ingresses[0].Host : undefined;
     if (this.formValues.PublishedPorts.length) {
       p.Protocol = this.formValues.PublishedPorts[0].Protocol;
     }
@@ -331,7 +331,7 @@ class KubernetesCreateApplicationController {
     const ingresses = this.filteredIngresses;
     _.forEach(this.formValues.PublishedPorts, (p) => {
       p.IngressName = ingresses && ingresses.length ? ingresses[0].Name : undefined;
-      p.IngressHost = ingresses && ingresses.length ? ingresses[0].Hosts[0] : undefined;
+      p.IngressHost = ingresses && ingresses.length ? ingresses[0].Host : undefined;
     });
   }
 
@@ -388,8 +388,7 @@ class KubernetesCreateApplicationController {
   onChangePortMappingIngress(index) {
     const publishedPort = this.formValues.PublishedPorts[index];
     const ingress = _.find(this.filteredIngresses, { Name: publishedPort.IngressName });
-    this.ingressHostnames = ingress.Hosts;
-    publishedPort.IngressHost = this.ingressHostnames.length ? this.ingressHostnames[0] : [];
+    publishedPort.IngressHost = ingress.Host;
     this.onChangePublishedPorts();
   }
 
@@ -781,7 +780,6 @@ class KubernetesCreateApplicationController {
 
   refreshIngresses(namespace) {
     this.filteredIngresses = _.filter(this.ingresses, { Namespace: namespace });
-    this.ingressHostnames = this.filteredIngresses.length ? this.filteredIngresses[0].Hosts : [];
     if (!this.publishViaIngressEnabled()) {
       if (this.savedFormValues) {
         this.formValues.PublishingType = this.savedFormValues.PublishingType;

app/kubernetes/views/applications/edit/application.html

@@ -587,7 +587,6 @@
         table-key="kubernetes.application.containers"
         is-pod="ctrl.application.ApplicationType === ctrl.KubernetesApplicationTypes.POD"
         order-by="{{ ctrl.application.ApplicationType === ctrl.KubernetesApplicationTypes.POD ? 'Name' : 'PodName' }}"
-        use-server-metrics="ctrl.state.useServerMetrics"
       >
       </kubernetes-containers-datatable>
     </div>

app/kubernetes/views/applications/edit/applicationController.js

@@ -106,8 +106,7 @@ class KubernetesApplicationController {
     KubernetesStackService,
     KubernetesPodService,
     KubernetesNodeService,
-    KubernetesNamespaceHelper,
-    EndpointProvider
+    KubernetesNamespaceHelper
   ) {
     this.$async = $async;
     this.$state = $state;
@@ -126,8 +125,6 @@ class KubernetesApplicationController {
 
     this.KubernetesApplicationDeploymentTypes = KubernetesApplicationDeploymentTypes;
     this.KubernetesApplicationTypes = KubernetesApplicationTypes;
-    this.EndpointProvider = EndpointProvider;
-
     this.ApplicationDataAccessPolicies = KubernetesApplicationDataAccessPolicies;
     this.KubernetesServiceTypes = KubernetesServiceTypes;
     this.KubernetesPodContainerTypes = KubernetesPodContainerTypes;
@@ -338,7 +335,6 @@ class KubernetesApplicationController {
       placementWarning: false,
       expandedNote: false,
       useIngress: false,
-      useServerMetrics: this.EndpointProvider.currentEndpoint().Kubernetes.Configuration.UseServerMetrics,
     };
 
     this.state.activeTab = this.LocalStorage.getActiveTab('application');

app/kubernetes/views/applications/stats/stats.html

@@ -1,82 +0,0 @@
-<kubernetes-view-header title="Application stats" state="kubernetes.applications.application.stats" view-ready="ctrl.state.viewReady">
-  <a ui-sref="kubernetes.resourcePools">Resource pools</a> &gt;
-  <a ui-sref="kubernetes.resourcePools.resourcePool({ id: ctrl.state.transition.namespace })">{{ ctrl.state.transition.namespace }}</a> &gt;
-  <a ui-sref="kubernetes.applications">Applications</a> &gt;
-  <a ui-sref="kubernetes.applications.application({ name: ctrl.state.transition.applicationName, namespace: ctrl.state.transition.namespace })">{{
-    ctrl.state.transition.applicationName
-  }}</a>
-  &gt; Pods &gt; {{ ctrl.state.transition.podName }} &gt; Containers &gt; {{ ctrl.state.transition.containerName }} &gt; Stats
-</kubernetes-view-header>
-
-<kubernetes-view-loading view-ready="ctrl.state.viewReady"></kubernetes-view-loading>
-
-<div ng-if="ctrl.state.viewReady">
-  <information-panel ng-if="!ctrl.state.getMetrics" title-text="Unable to retrieve container metrics">
-    <span class="small text-muted">
-      <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px;"></i>
-      Portainer was unable to retrieve any metrics associated to that container. Please contact your administrator to ensure that the Kubernetes metrics feature is properly
-      configured.
-    </span>
-  </information-panel>
-  <div class="row" ng-if="ctrl.state.getMetrics">
-    <div class="col-md-12">
-      <rd-widget>
-        <rd-widget-header icon="fa-info-circle" title-text="About statistics"> </rd-widget-header>
-        <rd-widget-body>
-          <form class="form-horizontal">
-            <div class="form-group">
-              <div class="col-sm-12">
-                <span class="small text-muted">
-                  This view displays real-time statistics about the container <b>{{ ctrl.state.transition.containerName | trimcontainername }}</b
-                  >.
-                </span>
-              </div>
-            </div>
-            <div class="form-group">
-              <label for="refreshRate" class="col-sm-3 col-md-2 col-lg-2 margin-sm-top control-label text-left">
-                Refresh rate
-              </label>
-              <div class="col-sm-3 col-md-2">
-                <select id="refreshRate" ng-model="ctrl.state.refreshRate" ng-change="ctrl.changeUpdateRepeater()" class="form-control">
-                  <option value="30">30s</option>
-                  <option value="60">60s</option>
-                </select>
-              </div>
-              <span>
-                <i id="refreshRateChange" class="fa fa-check green-icon" aria-hidden="true" style="margin-top: 7px; display: none;"></i>
-              </span>
-            </div>
-            <div class="form-group" ng-if="ctrl.state.networkStatsUnavailable">
-              <div class="col-sm-12">
-                <span class="small text-muted"> <i class="fa fa-exclamation-triangle orange-icon" aria-hidden="true"></i> Network stats are unavailable for this container. </span>
-              </div>
-            </div>
-          </form>
-        </rd-widget-body>
-      </rd-widget>
-    </div>
-  </div>
-
-  <div class="row" ng-if="ctrl.state.getMetrics">
-    <div class="col-lg-6 col-md-12 col-sm-12">
-      <rd-widget>
-        <rd-widget-header icon="fa-chart-area" title-text="Memory usage"></rd-widget-header>
-        <rd-widget-body>
-          <div class="chart-container" style="position: relative;">
-            <canvas id="memoryChart" width="770" height="300"></canvas>
-          </div>
-        </rd-widget-body>
-      </rd-widget>
-    </div>
-    <div class="col-lg-6 col-md-12 col-sm-12" ng-if="!ctrl.state.networkStatsUnavailable">
-      <rd-widget>
-        <rd-widget-header icon="fa-chart-area" title-text="CPU usage"></rd-widget-header>
-        <rd-widget-body>
-          <div class="chart-container" style="position: relative;">
-            <canvas id="cpuChart" width="770" height="300"></canvas>
-          </div>
-        </rd-widget-body>
-      </rd-widget>
-    </div>
-  </div>
-</div>

app/kubernetes/views/applications/stats/stats.js

@@ -1,8 +0,0 @@
-angular.module('portainer.kubernetes').component('kubernetesApplicationStatsView', {
-  templateUrl: './stats.html',
-  controller: 'KubernetesApplicationStatsController',
-  controllerAs: 'ctrl',
-  bindings: {
-    $transition$: '<',
-  },
-});

app/kubernetes/views/applications/stats/statsController.js

@@ -1,164 +0,0 @@
-import angular from 'angular';
-import moment from 'moment';
-import _ from 'lodash-es';
-import filesizeParser from 'filesize-parser';
-import KubernetesResourceReservationHelper from 'Kubernetes/helpers/resourceReservationHelper';
-import KubernetesPodConverter from 'Kubernetes/pod/converter';
-
-class KubernetesApplicationStatsController {
-  /* @ngInject */
-  constructor($async, $state, $interval, $document, Notifications, KubernetesPodService, KubernetesNodeService, KubernetesMetricsService, ChartService) {
-    this.$async = $async;
-    this.$state = $state;
-    this.$interval = $interval;
-    this.$document = $document;
-    this.Notifications = Notifications;
-    this.KubernetesPodService = KubernetesPodService;
-    this.KubernetesNodeService = KubernetesNodeService;
-    this.KubernetesMetricsService = KubernetesMetricsService;
-    this.ChartService = ChartService;
-
-    this.onInit = this.onInit.bind(this);
-  }
-
-  changeUpdateRepeater() {
-    var cpuChart = this.cpuChart;
-    var memoryChart = this.memoryChart;
-
-    this.stopRepeater();
-    this.setUpdateRepeater(cpuChart, memoryChart);
-    $('#refreshRateChange').show();
-    $('#refreshRateChange').fadeOut(1500);
-  }
-
-  updateCPUChart() {
-    const label = moment(this.stats.read).format('HH:mm:ss');
-
-    this.ChartService.UpdateCPUChart(label, this.stats.CPUUsage, this.cpuChart);
-  }
-
-  updateMemoryChart() {
-    const label = moment(this.stats.read).format('HH:mm:ss');
-
-    this.ChartService.UpdateMemoryChart(label, this.stats.MemoryUsage, this.stats.MemoryCache, this.memoryChart);
-  }
-
-  stopRepeater() {
-    var repeater = this.repeater;
-    if (angular.isDefined(repeater)) {
-      this.$interval.cancel(repeater);
-      repeater = undefined;
-    }
-  }
-
-  setUpdateRepeater() {
-    const refreshRate = this.state.refreshRate;
-
-    this.repeater = this.$interval(async () => {
-      try {
-        await this.getStats();
-
-        this.updateCPUChart();
-        this.updateMemoryChart();
-      } catch (error) {
-        this.stopRepeater();
-        this.Notifications.error('Failure', error);
-      }
-    }, refreshRate * 1000);
-  }
-
-  initCharts() {
-    const cpuChartCtx = $('#cpuChart');
-    const cpuChart = this.ChartService.CreateCPUChart(cpuChartCtx);
-    this.cpuChart = cpuChart;
-
-    const memoryChartCtx = $('#memoryChart');
-    const memoryChart = this.ChartService.CreateMemoryChart(memoryChartCtx);
-    this.memoryChart = memoryChart;
-
-    this.updateCPUChart();
-    this.updateMemoryChart();
-    this.setUpdateRepeater();
-  }
-
-  getStats() {
-    return this.$async(async () => {
-      try {
-        const stats = await this.KubernetesMetricsService.getPod(this.state.transition.namespace, this.state.transition.podName);
-        const container = _.find(stats.containers, { name: this.state.transition.containerName });
-        if (container) {
-          const memory = filesizeParser(container.usage.memory);
-          const cpu = KubernetesResourceReservationHelper.parseCPU(container.usage.cpu);
-          this.stats = {
-            read: stats.timestamp,
-            preread: '',
-            MemoryCache: 0,
-            MemoryUsage: memory,
-            NumProcs: '',
-            isWindows: false,
-            PreviousCPUTotalUsage: 0,
-            CPUUsage: (cpu / this.nodeCPU) * 100,
-            CPUCores: 0,
-          };
-        }
-      } catch (err) {
-        this.Notifications.error('Failure', err, 'Unable to retrieve application stats');
-      }
-    });
-  }
-
-  $onDestroy() {
-    this.stopRepeater();
-  }
-
-  async onInit() {
-    this.state = {
-      autoRefresh: false,
-      refreshRate: '30',
-      viewReady: false,
-      transition: {
-        podName: this.$transition$.params().pod,
-        containerName: this.$transition$.params().container,
-        namespace: this.$transition$.params().namespace,
-        applicationName: this.$transition$.params().name,
-      },
-      getMetrics: false,
-    };
-
-    try {
-      await this.KubernetesMetricsService.getPod(this.state.transition.namespace, this.state.transition.podName);
-    } catch (error) {
-      this.state.getMetrics = false;
-      this.state.viewReady = true;
-      return;
-    }
-
-    try {
-      const podRaw = await this.KubernetesPodService.get(this.state.transition.namespace, this.state.transition.podName);
-      const pod = KubernetesPodConverter.apiToModel(podRaw.Raw);
-      if (pod) {
-        const node = await this.KubernetesNodeService.get(pod.Node);
-        this.nodeCPU = node.CPU;
-      } else {
-        throw new Error('Unable to find pod');
-      }
-      await this.getStats();
-      this.state.getMetrics = true;
-
-      this.$document.ready(() => {
-        this.initCharts();
-      });
-    } catch (err) {
-      this.Notifications.error('Failure', err, 'Unable to retrieve application stats');
-    } finally {
-      this.state.viewReady = true;
-    }
-  }
-
-  $onInit() {
-    return this.$async(this.onInit);
-  }
-}
-
-export default KubernetesApplicationStatsController;
-angular.module('portainer.kubernetes').controller('KubernetesApplicationStatsController', KubernetesApplicationStatsController);

app/kubernetes/views/configure/configure.html

@@ -196,27 +196,7 @@
                 <label class="control-label text-left">
                   Enable features using metrics server
                 </label>
-                <label class="switch" style="margin-left: 20px;">
-                  <input type="checkbox" ng-model="ctrl.formValues.UseServerMetrics" ng-change="ctrl.enableMetricsServer()" /><i></i>
-                </label>
-              </div>
-              <div ng-if="ctrl.state.metrics.pending && ctrl.state.metrics.userClick" class="col-sm-12 small text-muted" style="margin-top: 5px;">
-                Checking metrics API... <i class="fa fa-spinner fa-spin" style="margin-left: 2px;"></i>
-              </div>
-              <div
-                ng-if="!ctrl.state.metrics.pending && ctrl.state.metrics.isServerRunning && ctrl.state.metrics.userClick"
-                class="col-sm-12 small text-muted"
-                style="margin-top: 5px;"
-              >
-                <i class="fa fa-check green-icon" aria-hidden="true" style="margin-right: 2px;"></i> Successfully reached metrics API
-              </div>
-              <div
-                ng-if="!ctrl.state.metrics.pending && !ctrl.state.metrics.isServerRunning && ctrl.state.metrics.userClick"
-                class="col-sm-12 small text-muted"
-                style="margin-top: 5px;"
-              >
-                <i class="fa fa-times red-icon" aria-hidden="true" style="margin-right: 2px;"></i> Unable to reach metrics API, make sure metrics server is properly deployed inside
-                that cluster.
+                <label class="switch" style="margin-left: 20px;"> <input type="checkbox" ng-model="ctrl.formValues.UseServerMetrics" /><i></i> </label>
               </div>
             </div>
 

app/kubernetes/views/configure/configureController.js

@@ -28,8 +28,7 @@ class KubernetesConfigureController {
     ModalService,
     KubernetesNamespaceHelper,
     KubernetesResourcePoolService,
-    KubernetesIngressService,
-    KubernetesMetricsService
+    KubernetesIngressService
   ) {
     this.$async = $async;
     this.$state = $state;
@@ -42,7 +41,6 @@ class KubernetesConfigureController {
     this.KubernetesNamespaceHelper = KubernetesNamespaceHelper;
     this.KubernetesResourcePoolService = KubernetesResourcePoolService;
     this.KubernetesIngressService = KubernetesIngressService;
-    this.KubernetesMetricsService = KubernetesMetricsService;
 
     this.IngressClassTypes = KubernetesIngressClassTypes;
 
@@ -152,7 +150,7 @@ class KubernetesConfigureController {
 
     ingressesToDel.forEach((ingress) => {
       resourcePools.forEach((resourcePool) => {
-        promises.push(this.KubernetesIngressService.delete({ IngressClass: ingress, Namespace: resourcePool.Namespace.Name }));
+        promises.push(this.KubernetesIngressService.delete(resourcePool.Namespace.Name, ingress.Name));
       });
     });
 
@@ -163,27 +161,6 @@ class KubernetesConfigureController {
       }
     });
   }
-  
-  enableMetricsServer() {
-    if (this.formValues.UseServerMetrics) {
-      this.state.metrics.userClick = true;
-      this.state.metrics.pending = true;
-      this.KubernetesMetricsService.capabilities(this.endpoint.Id)
-        .then(() => {
-          this.state.metrics.isServerRunning = true;
-          this.state.metrics.pending = false;
-          this.formValues.UseServerMetrics = true;
-        })
-        .catch(() => {
-          this.state.metrics.isServerRunning = false;
-          this.state.metrics.pending = false;
-          this.formValues.UseServerMetrics = false;
-        });
-    } else {
-      this.state.metrics.userClick = false;
-      this.formValues.UseServerMetrics = false;
-    }
-  }
 
   async configureAsync() {
     try {
@@ -245,11 +222,6 @@ class KubernetesConfigureController {
       duplicates: {
         ingressClasses: new KubernetesFormValidationReferences(),
       },
-      metrics: {
-        pending: false,
-        isServerRunning: false,
-        userClick: false,
-      },
     };
 
     this.formValues = {

app/kubernetes/views/resource-pools/create/createResourcePool.html

@@ -208,7 +208,7 @@
                 </div>
               </div>
 
-              <div class="form-group" ng-repeat-start="ic in ctrl.formValues.IngressClasses track by ic.IngressClass.Name">
+              <div class="form-group" ng-repeat-start="ic in ctrl.formValues.IngressClasses">
                 <div class="text-muted col-sm-12" style="width: 100%;">
                   <div style="border-bottom: 1px solid #cdcdcd; padding-bottom: 5px;">
                     <i class="fa fa-route" aria-hidden="true" style="margin-right: 2px;"></i> {{ ic.IngressClass.Name }}
@@ -225,58 +225,30 @@
 
               <div ng-if="ic.Selected">
                 <div class="form-group">
-                  <div class="col-sm-12">
-                    <label class="control-label text-left">
-                      Hostnames
-                      <portainer-tooltip
-                        position="bottom"
-                        message="Hostnames associated to the ingress inside this resource pool. Users will be able to expose and access their applications over the ingress via one of these hostname."
-                      >
-                      </portainer-tooltip>
-                    </label>
-                    <span class="label label-default interactive" style="margin-left: 10px;" ng-click="ctrl.addHostname(ic)">
-                      <i class="fa fa-plus-circle" aria-hidden="true"></i> add hostname
-                    </span>
-                  </div>
-                  <div class="col-sm-12" style="margin-top: 10px;">
-                    <div ng-repeat="item in ic.Hosts track by $index" style="margin-top: 2px;">
-                      <div class="form-inline">
-                        <div class="col-sm-10 input-group input-group-sm">
-                          <span class="input-group-addon">Hostname</span>
-                          <input
-                            type="text"
-                            class="form-control"
-                            name="hostname_{{ ic.IngressClass.Name }}_{{ $index }}"
-                            ng-model="item.Host"
-                            ng-change="ctrl.onChangeIngressHostname()"
-                            placeholder="foo"
-                            required
-                          />
-                        </div>
-                        <div class="col-sm-1 input-group input-group-sm" ng-if="$index > 0">
-                          <button class="btn btn-sm btn-danger" type="button" ng-click="ctrl.removeHostname(ic, $index)">
-                            <i class="fa fa-trash-alt" aria-hidden="true"></i>
-                          </button>
-                        </div>
-                      </div>
-                      <div
-                        class="small text-warning"
-                        style="margin-top: 5px;"
-                        ng-show="
-                          resourcePoolCreationForm['hostname_' + ic.IngressClass.Name + '_' + $index].$invalid ||
-                          ctrl.state.duplicates.ingressHosts.refs[ic.IngressClass.Name][$index] !== undefined
-                        "
-                      >
-                        <ng-messages for="resourcePoolCreationForm['hostname_' + ic.IngressClass.Name + '_' + $index].$error">
-                          <p ng-message="required"><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> Hostname is required.</p>
-                        </ng-messages>
-                        <p ng-if="ctrl.state.duplicates.ingressHosts.refs[ic.IngressClass.Name][$index] !== undefined">
-                          <i class="fa fa-exclamation-triangle" aria-hidden="true"></i> This hostname is already used.
-                        </p>
-                      </div>
-                    </div>
+                  <label class="control-label text-left col-sm-2">
+                    Hostname
+                    <portainer-tooltip
+                      position="bottom"
+                      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" name="ingress_host_{{ $index }}" ng-model="ic.Host" placeholder="host.com" ng-change="ctrl.onChangeIngressHostname()" required />
                   </div>
                 </div>
+                <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.
+                    </p>
+                  </div>
+                </div>
+
                 <div class="form-group" ng-if="ic.IngressClass.Type === ctrl.IngressClassTypes.NGINX">
                   <div class="col-sm-12">
                     <label class="control-label text-left">

app/kubernetes/views/resource-pools/create/createResourcePoolController.js

@@ -3,11 +3,7 @@ import _ from 'lodash-es';
 import filesizeParser from 'filesize-parser';
 import { KubernetesResourceQuotaDefaults } from 'Kubernetes/models/resource-quota/models';
 import KubernetesResourceReservationHelper from 'Kubernetes/helpers/resourceReservationHelper';
-import {
-  KubernetesResourcePoolFormValues,
-  KubernetesResourcePoolIngressClassAnnotationFormValue,
-  KubernetesResourcePoolIngressClassHostFormValue,
-} from 'Kubernetes/models/resource-pool/formValues';
+import { KubernetesResourcePoolFormValues, KubernetesResourcePoolIngressClassAnnotationFormValue } from 'Kubernetes/models/resource-pool/formValues';
 import { KubernetesIngressConverter } from 'Kubernetes/ingress/converter';
 import KubernetesFormValidationHelper from 'Kubernetes/helpers/formValidationHelper';
 import { KubernetesFormValidationReferences } from 'Kubernetes/models/application/formValues';
@@ -38,43 +34,17 @@ class KubernetesCreateResourcePoolController {
 
   onChangeIngressHostname() {
     const state = this.state.duplicates.ingressHosts;
-    const hosts = _.flatMap(this.formValues.IngressClasses, 'Hosts');
-    const hostnames = _.map(hosts, 'Host');
-    const hostnamesWithoutRemoved = _.filter(hostnames, (h) => !h.NeedsDeletion);
-    const allHosts = _.flatMap(this.allIngresses, 'Hosts');
-    const formDuplicates = KubernetesFormValidationHelper.getDuplicates(hostnamesWithoutRemoved);
-    _.forEach(hostnames, (host, idx) => {
-      if (host !== undefined && _.includes(allHosts, host)) {
-        formDuplicates[idx] = host;
+
+    const hosts = _.map(this.formValues.IngressClasses, 'Host');
+    const allHosts = _.map(this.allIngresses, 'Host');
+    const duplicates = KubernetesFormValidationHelper.getDuplicates(hosts);
+    _.forEach(hosts, (host, idx) => {
+      if (_.includes(allHosts, host) && host !== undefined) {
+        duplicates[idx] = host;
       }
     });
-    const duplicates = {};
-    let count = 0;
-    _.forEach(this.formValues.IngressClasses, (ic) => {
-      duplicates[ic.IngressClass.Name] = {};
-      _.forEach(ic.Hosts, (hostFV, hostIdx) => {
-        if (hostFV.Host === formDuplicates[count]) {
-          duplicates[ic.IngressClass.Name][hostIdx] = hostFV.Host;
-        }
-        count++;
-      });
-    });
     state.refs = duplicates;
-    state.hasRefs = false;
-    _.forIn(duplicates, (value) => {
-      if (Object.keys(value).length > 0) {
-        state.hasRefs = true;
-      }
-    });
-  }
-
-  addHostname(ingressClass) {
-    ingressClass.Hosts.push(new KubernetesResourcePoolIngressClassHostFormValue());
-  }
-
-  removeHostname(ingressClass, index) {
-    ingressClass.Hosts.splice(index, 1);
-    this.onChangeIngressHostname();
+    state.hasRefs = Object.keys(duplicates).length > 0;
   }
 
   /* #region  ANNOTATIONS MANAGEMENT */
@@ -198,11 +168,6 @@ class KubernetesCreateResourcePoolController {
         const ingressClasses = endpoint.Kubernetes.Configuration.IngressClasses;
         this.formValues.IngressClasses = KubernetesIngressConverter.ingressClassesToFormValues(ingressClasses);
       }
-      _.forEach(this.formValues.IngressClasses, (ic) => {
-        if (ic.Hosts.length === 0) {
-          ic.Hosts.push(new KubernetesResourcePoolIngressClassHostFormValue());
-        }
-      });
     } catch (err) {
       this.Notifications.error('Failure', err, 'Unable to load view data');
     } finally {

app/kubernetes/views/resource-pools/edit/resourcePool.html

@@ -167,7 +167,7 @@
                     </div>
                   </div>
 
-                  <div class="form-group" ng-repeat-start="ic in ctrl.formValues.IngressClasses track by ic.IngressClass.Name">
+                  <div class="form-group" ng-repeat-start="ic in ctrl.formValues.IngressClasses">
                     <div class="text-muted col-sm-12" style="width: 100%;">
                       <div style="border-bottom: 1px solid #cdcdcd; padding-bottom: 5px;">
                         <i class="fa fa-route" aria-hidden="true" style="margin-right: 2px;"></i> {{ ic.IngressClass.Name }}
@@ -184,57 +184,34 @@
 
                   <div ng-if="ic.Selected">
                     <div class="form-group">
-                      <div class="col-sm-12">
-                        <label class="control-label text-left">
-                          Hostnames
-                          <portainer-tooltip
-                            position="bottom"
-                            message="Hostnames associated to the ingress inside this resource pool. Users will be able to expose and access their applications over the ingress via one of these hostname."
-                          >
-                          </portainer-tooltip>
-                        </label>
-                        <span class="label label-default interactive" style="margin-left: 10px;" ng-click="ctrl.addHostname(ic)">
-                          <i class="fa fa-plus-circle" aria-hidden="true"></i> add hostname
-                        </span>
+                      <label class="control-label text-left col-sm-2">
+                        Hostname
+                        <portainer-tooltip
+                          position="bottom"
+                          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"
+                          name="ingress_host_{{ $index }}"
+                          ng-model="ic.Host"
+                          placeholder="host.com"
+                          ng-change="ctrl.onChangeIngressHostname()"
+                          required
+                        />
                       </div>
-                      <div class="col-sm-12" style="margin-top: 10px;">
-                        <div ng-repeat="item in ic.Hosts track by $index" style="margin-top: 2px;">
-                          <div class="form-inline">
-                            <div class="col-sm-10 input-group input-group-sm" ng-class="{ striked: item.NeedsDeletion }">
-                              <span class="input-group-addon">Hostname</span>
-                              <input
-                                type="text"
-                                class="form-control"
-                                name="hostname_{{ ic.IngressClass.Name }}_{{ $index }}"
-                                ng-model="item.Host"
-                                ng-change="ctrl.onChangeIngressHostname()"
-                                placeholder="foo"
-                                required
-                              />
-                            </div>
-                            <div class="col-sm-1 input-group input-group-sm" ng-if="$index > 0">
-                              <button ng-if="!item.NeedsDeletion" class="btn btn-sm btn-danger" type="button" ng-click="ctrl.removeHostname(ic, $index)">
-                                <i class="fa fa-trash-alt" aria-hidden="true"></i>
-                              </button>
-                              <button ng-if="item.NeedsDeletion" class="btn btn-sm btn-primary" type="button" ng-click="ctrl.restoreHostname(item)">
-                                <i class="fa fa-trash-restore" aria-hidden="true"></i>
-                              </button>
-                            </div>
-                          </div>
-                          <div
-                            class="small text-warning"
-                            style="margin-top: 5px;"
-                            ng-show="resourcePoolEditForm['hostname_' + ic.IngressClass.Name + '_' + $index].$invalid || item.Duplicate"
-                          >
-                            <ng-messages for="resourcePoolEditForm['hostname_' + ic.IngressClass.Name + '_' + $index].$error">
-                              <p ng-message="required"><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> Hostname is required.</p>
-                            </ng-messages>
-                            <p ng-if="item.Duplicate">
-                              <i class="fa fa-exclamation-triangle" aria-hidden="true"></i>
-                              This hostname is already used.
-                            </p>
-                          </div>
+                    </div>
+                    <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.
+                        </p>
                       </div>
                     </div>
 

app/kubernetes/views/resource-pools/edit/resourcePoolController.js

@@ -4,11 +4,7 @@ import filesizeParser from 'filesize-parser';
 import { KubernetesResourceQuota, KubernetesResourceQuotaDefaults } from 'Kubernetes/models/resource-quota/models';
 import KubernetesResourceReservationHelper from 'Kubernetes/helpers/resourceReservationHelper';
 import KubernetesEventHelper from 'Kubernetes/helpers/eventHelper';
-import {
-  KubernetesResourcePoolFormValues,
-  KubernetesResourcePoolIngressClassAnnotationFormValue,
-  KubernetesResourcePoolIngressClassHostFormValue,
-} from 'Kubernetes/models/resource-pool/formValues';
+import { KubernetesResourcePoolFormValues, KubernetesResourcePoolIngressClassAnnotationFormValue } from 'Kubernetes/models/resource-pool/formValues';
 import { KubernetesIngressConverter } from 'Kubernetes/ingress/converter';
 import { KubernetesFormValidationReferences } from 'Kubernetes/models/application/formValues';
 import KubernetesFormValidationHelper from 'Kubernetes/helpers/formValidationHelper';
@@ -66,6 +62,22 @@ class KubernetesResourcePoolController {
   }
   /* #endregion */
 
+  onChangeIngressHostname() {
+    const state = this.state.duplicates.ingressHosts;
+
+    const hosts = _.map(this.formValues.IngressClasses, 'Host');
+    const otherIngresses = _.without(this.allIngresses, ...this.ingresses);
+    const allHosts = _.map(otherIngresses, 'Host');
+    const duplicates = KubernetesFormValidationHelper.getDuplicates(hosts);
+    _.forEach(hosts, (host, idx) => {
+      if (_.includes(allHosts, host) && host !== undefined) {
+        duplicates[idx] = host;
+      }
+    });
+    state.refs = duplicates;
+    state.hasRefs = Object.keys(duplicates).length > 0;
+  }
+
   /* #region  ANNOTATIONS MANAGEMENT */
   addAnnotation(ingressClass) {
     ingressClass.Annotations.push(new KubernetesResourcePoolIngressClassAnnotationFormValue());
@@ -73,59 +85,9 @@ class KubernetesResourcePoolController {
 
   removeAnnotation(ingressClass, index) {
     ingressClass.Annotations.splice(index, 1);
-    this.onChangeIngressHostname();
   }
   /* #endregion */
 
-  /* #region  INGRESS MANAGEMENT */
-  onChangeIngressHostname() {
-    const state = this.state.duplicates.ingressHosts;
-    const otherIngresses = _.without(this.allIngresses, ...this.ingresses);
-    const allHosts = _.flatMap(otherIngresses, 'Hosts');
-
-    const hosts = _.flatMap(this.formValues.IngressClasses, 'Hosts');
-    const hostsWithoutRemoved = _.filter(hosts, { NeedsDeletion: false });
-    const hostnames = _.map(hostsWithoutRemoved, 'Host');
-    const formDuplicates = KubernetesFormValidationHelper.getDuplicates(hostnames);
-    _.forEach(hostnames, (host, idx) => {
-      if (host !== undefined && _.includes(allHosts, host)) {
-        formDuplicates[idx] = host;
-      }
-    });
-    const duplicatedHostnames = Object.values(formDuplicates);
-    state.hasRefs = false;
-    _.forEach(this.formValues.IngressClasses, (ic) => {
-      _.forEach(ic.Hosts, (hostFV) => {
-        if (_.includes(duplicatedHostnames, hostFV.Host) && hostFV.NeedsDeletion === false) {
-          hostFV.Duplicate = true;
-          state.hasRefs = true;
-        } else {
-          hostFV.Duplicate = false;
-        }
-      });
-    });
-  }
-
-  addHostname(ingressClass) {
-    ingressClass.Hosts.push(new KubernetesResourcePoolIngressClassHostFormValue());
-  }
-
-  removeHostname(ingressClass, index) {
-    if (!ingressClass.Hosts[index].IsNew) {
-      ingressClass.Hosts[index].NeedsDeletion = true;
-    } else {
-      ingressClass.Hosts.splice(index, 1);
-    }
-    this.onChangeIngressHostname();
-  }
-
-  restoreHostname(host) {
-    if (!host.IsNew) {
-      host.NeedsDeletion = false;
-    }
-  }
-  /* #endregion*/
-
   selectTab(index) {
     this.LocalStorage.storeActiveTab('resourcePool', index);
   }
@@ -350,11 +312,6 @@ class KubernetesResourcePoolController {
         await this.getIngresses();
         const ingressClasses = endpoint.Kubernetes.Configuration.IngressClasses;
         this.formValues.IngressClasses = KubernetesIngressConverter.ingressClassesToFormValues(ingressClasses, this.ingresses);
-        _.forEach(this.formValues.IngressClasses, (ic) => {
-          if (ic.Hosts.length === 0) {
-            ic.Hosts.push(new KubernetesResourcePoolIngressClassHostFormValue());
-          }
-        });
       }
       this.savedFormValues = angular.copy(this.formValues);
     } catch (err) {

app/portainer/views/custom-templates/edit-custom-template-view/editCustomTemplateViewController.js

@@ -96,8 +96,10 @@ class EditCustomTemplateViewController {
   }
 
   editorUpdate(cm) {
-    this.formValues.FileContent = cm.getValue();
-    this.state.isEditorDirty = true;
+    if (this.formValues.FileContent.replace(/(\r\n|\n|\r)/gm, '') !== cm.getValue().replace(/(\r\n|\n|\r)/gm, '')) {
+      this.formValues.FileContent = cm.getValue();
+      this.state.isEditorDirty = true;
+    }
   }
 
   async uiCanExit() {

app/portainer/views/stacks/edit/stackController.js

@@ -201,12 +201,11 @@ angular.module('portainer.app').controller('StackController', [
     };
 
     $scope.editorUpdate = function (cm) {
-      if ($scope.stackFileContent !== cm.getValue()) {
+      if ($scope.stackFileContent.replace(/(\r\n|\n|\r)/gm, '') !== cm.getValue().replace(/(\r\n|\n|\r)/gm, '')) {
         $scope.state.isEditorDirty = true;
+        $scope.stackFileContent = cm.getValue();
+        $scope.state.yamlError = StackHelper.validateYAML($scope.stackFileContent, $scope.containerNames);
       }
-      $scope.stackFileContent = cm.getValue();
-      $scope.state.yamlError = StackHelper.validateYAML($scope.stackFileContent, $scope.containerNames);
-      $scope.state.isEditorDirty = true;
     };
 
     $scope.stopStack = stopStack;
@@ -269,8 +268,7 @@ angular.module('portainer.app').controller('StackController', [
           var stack = data.stack;
           $scope.groups = data.groups;
           $scope.stack = stack;
-          $scope.containers = data.containers;
-          $scope.containerNames = ContainerHelper.getContainerNames($scope.containers);
+          $scope.containerNames = ContainerHelper.getContainerNames(data.containers);
 
           let resourcesPromise = Promise.resolve({});
           if (stack.Status === 1) {

build/windows/Dockerfile

@@ -1,6 +1,6 @@
 ARG OSVERSION
 FROM --platform=linux/amd64 gcr.io/k8s-staging-e2e-test-images/windows-servercore-cache:1.0-linux-amd64-${OSVERSION} as core
-FROM --platform=linux/amd64 alpine:3 as downloader
+FROM --platform=linux/amd64 alpine:3.13.0 as downloader
 ENV GIT_VERSION 2.30.0
 ENV GIT_PATCH_VERSION 2
 

gruntfile.js

@@ -191,7 +191,7 @@ function shell_download_docker_binary(p, a) {
   var ip = ps[p] === undefined ? p : ps[p];
   var ia = as[a] === undefined ? a : as[a];
   var binaryVersion = p === 'windows' ? '<%= binaries.dockerWindowsVersion %>' : '<%= binaries.dockerLinuxVersion %>';
-  
+
   return [
     'if [ -f dist/docker ] || [ -f dist/docker.exe ]; then',
     'echo "docker binary exists";',
@@ -207,7 +207,7 @@ function shell_download_docker_compose_binary(p, a) {
   var ip = ps[p] || p;
   var ia = as[a] || a;
   var binaryVersion = p === 'windows' ? '<%= binaries.dockerWindowsComposeVersion %>' : '<%= binaries.dockerLinuxComposeVersion %>';
-  
+
   return [
     'if [ -f dist/docker-compose ] || [ -f dist/docker-compose.exe ]; then',
     'echo "Docker Compose binary exists";',
@@ -219,7 +219,7 @@ function shell_download_docker_compose_binary(p, a) {
 
 function shell_download_kompose_binary(p, a) {
   var binaryVersion = '<%= binaries.komposeVersion %>';
-  
+
   return [
     'if [ -f dist/kompose ] || [ -f dist/kompose.exe ]; then',
     'echo "kompose binary exists";',
@@ -231,7 +231,7 @@ function shell_download_kompose_binary(p, a) {
 
 function shell_download_kubectl_binary(p, a) {
   var binaryVersion = '<%= binaries.kubectlVersion %>';
-  
+
   return [
     'if [ -f dist/kubectl ] || [ -f dist/kubectl.exe ]; then',
     'echo "kubectl binary exists";',

package.json

@@ -2,7 +2,7 @@
   "author": "Portainer.io",
   "name": "portainer",
   "homepage": "http://portainer.io",
-  "version": "2.4.0",
+  "version": "2.5.0",
   "repository": {
     "type": "git",
     "url": "git@github.com:portainer/portainer.git"