From 83c3f9ed0670ff006a5ea974ada2f1169f3b9927 Mon Sep 17 00:00:00 2001
From: Anthony Lapenna <lapenna.anthony@gmail.com>
Date: Fri, 14 Aug 2020 16:56:56 +1200
Subject: [PATCH] fix(k8s/application): fix an issue with the auto-scaler
 section

---
 app/kubernetes/services/applicationService.js          | 10 +++++++---
 .../views/applications/create/createApplication.html   |  6 ++++--
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/kubernetes/services/applicationService.js b/app/kubernetes/services/applicationService.js
index 7be565781..55bfa9908 100644
--- a/app/kubernetes/services/applicationService.js
+++ b/app/kubernetes/services/applicationService.js
@@ -2,14 +2,18 @@ import * as _ from 'lodash-es';
 import angular from 'angular';
 import PortainerError from 'Portainer/error';
 
-import { KubernetesApplicationTypes, KubernetesApplicationPublishingTypes } from 'Kubernetes/models/application/models';
+import {
+  KubernetesApplication,
+  KubernetesApplicationDeploymentTypes,
+  KubernetesApplicationPublishingTypes,
+  KubernetesApplicationTypes,
+} from 'Kubernetes/models/application/models';
 import KubernetesApplicationHelper from 'Kubernetes/helpers/application';
 import KubernetesApplicationRollbackHelper from 'Kubernetes/helpers/application/rollback';
 import KubernetesApplicationConverter from 'Kubernetes/converters/application';
 import { KubernetesDeployment } from 'Kubernetes/models/deployment/models';
 import { KubernetesStatefulSet } from 'Kubernetes/models/stateful-set/models';
 import { KubernetesDaemonSet } from 'Kubernetes/models/daemon-set/models';
-import { KubernetesApplication } from 'Kubernetes/models/application/models';
 import KubernetesServiceHelper from 'Kubernetes/helpers/serviceHelper';
 import { KubernetesHorizontalPodAutoScalerHelper } from 'Kubernetes/horizontal-pod-auto-scaler/helper';
 import { KubernetesHorizontalPodAutoScalerConverter } from 'Kubernetes/horizontal-pod-auto-scaler/converter';
@@ -226,7 +230,7 @@ class KubernetesApplicationService {
         await Promise.all(_.without(claimPromises, undefined));
       }
 
-      if (formValues.AutoScaler.IsUsed) {
+      if (formValues.AutoScaler.IsUsed && formValues.DeploymentType !== KubernetesApplicationDeploymentTypes.GLOBAL) {
         const kind = KubernetesHorizontalPodAutoScalerHelper.getApplicationTypeString(app);
         const autoScaler = KubernetesHorizontalPodAutoScalerConverter.applicationFormValuesToModel(formValues, kind);
         await this.KubernetesHorizontalPodAutoScalerService.create(autoScaler);
diff --git a/app/kubernetes/views/applications/create/createApplication.html b/app/kubernetes/views/applications/create/createApplication.html
index 0bd5acbc5..7ed2ed34c 100644
--- a/app/kubernetes/views/applications/create/createApplication.html
+++ b/app/kubernetes/views/applications/create/createApplication.html
@@ -252,7 +252,9 @@
                 >
                   <i class="fa fa-undo" aria-hidden="true"></i> Auto
                 </button>
-                <button class="btn btn-sm btn-danger" type="button" ng-click="ctrl.removeConfiguration(index)" ng-if="ctrl.formValues.Containers.length <= 1"> <i class="fa fa-trash-alt" aria-hidden="true"></i> Remove </button>
+                <button class="btn btn-sm btn-danger" type="button" ng-click="ctrl.removeConfiguration(index)" ng-if="ctrl.formValues.Containers.length <= 1">
+                  <i class="fa fa-trash-alt" aria-hidden="true"></i> Remove
+                </button>
               </div>
               <!-- no-override -->
               <div class="col-sm-12" style="margin-top: 10px;" ng-if="config.SelectedConfiguration && !config.Overriden">
@@ -845,7 +847,7 @@
               </div>
             </div>
 
-            <div class="form-inline" ng-if="ctrl.formValues.AutoScaler.IsUsed">
+            <div class="form-inline" ng-if="ctrl.formValues.DeploymentType !== ctrl.ApplicationDeploymentTypes.GLOBAL && ctrl.formValues.AutoScaler.IsUsed">
               <table class="table" style="margin-bottom: 0px;">
                 <tbody>
                   <tr class="small">