#56 chore(frontend): add JS source map for portainer UI

README.md

@@ -44,7 +44,7 @@ For community support: You can find more information about Portainer's community
 ## Reporting bugs and contributing
 
 - Want to report a bug or request a feature? Please open [an issue](https://github.com/portainer/portainer/issues/new).
-- Want to help us build **_portainer_**? Follow our [contribution guidelines](https://documentation.portainer.io/contributing/instructions/) to build it locally and make a pull request. We need all the help we can get!
+- Want to help us build **_portainer_**? Follow our [contribution guidelines](https://www.portainer.io/documentation/how-to-contribute/) to build it locally and make a pull request. We need all the help we can get!
 
 ## Security
 

api/http/proxy/factory/docker/transport.go

@@ -559,18 +559,16 @@ func (transport *Transport) executeGenericResourceDeletionOperation(request *htt
 		return response, err
 	}
 
-	if response.StatusCode == http.StatusNoContent || response.StatusCode == http.StatusOK {
-		resourceControl, err := transport.dataStore.ResourceControl().ResourceControlByResourceIDAndType(resourceIdentifierAttribute, resourceType)
+	resourceControl, err := transport.dataStore.ResourceControl().ResourceControlByResourceIDAndType(resourceIdentifierAttribute, resourceType)
+	if err != nil {
+		return response, err
+	}
+
+	if resourceControl != nil {
+		err = transport.dataStore.ResourceControl().DeleteResourceControl(resourceControl.ID)
 		if err != nil {
 			return response, err
 		}
-
-		if resourceControl != nil {
-			err = transport.dataStore.ResourceControl().DeleteResourceControl(resourceControl.ID)
-			if err != nil {
-				return response, err
-			}
-		}
 	}
 
 	return response, err

app/assets/css/app.css

@@ -1042,7 +1042,3 @@ json-tree .branch-preview {
   background-color: #337ab7;
 }
 /* !spinkit override */
-
-.w-full {
-  width: 100%;
-}

app/docker/components/log-viewer/log-viewer.js

@@ -7,6 +7,5 @@ angular.module('portainer.docker').component('logViewer', {
     logCollectionChange: '<',
     sinceTimestamp: '=',
     lineCount: '=',
-    resourceName: '<',
   },
 });

app/docker/components/log-viewer/logViewer.html

@@ -67,7 +67,6 @@
               Actions
             </label>
             <div class="col-sm-11">
-              <button class="btn btn-primary btn-sm" type="button" ng-click="$ctrl.downloadLogs()" style="margin-left: 0;"><i class="fa fa-download"></i> Download logs</button>
               <button
                 class="btn btn-primary btn-sm"
                 ng-click="$ctrl.copy()"

app/docker/components/log-viewer/logViewerController.js

@@ -1,11 +1,8 @@
 import moment from 'moment';
-import _ from 'lodash-es';
 
 angular.module('portainer.docker').controller('LogViewerController', [
   'clipboard',
-  'Blob',
-  'FileSaver',
-  function (clipboard, Blob, FileSaver) {
+  function (clipboard) {
     this.state = {
       availableSinceDatetime: [
         { desc: 'Last day', value: moment().subtract(1, 'days').format() },
@@ -46,10 +43,5 @@ angular.module('portainer.docker').controller('LogViewerController', [
         this.state.selectedLines.splice(idx, 1);
       }
     };
-
-    this.downloadLogs = function () {
-      const data = new Blob([_.reduce(this.state.filteredLogs, (acc, log) => acc + '\n' + log, '')]);
-      FileSaver.saveAs(data, this.resourceName + '_logs.txt');
-    };
   },
 ]);

app/docker/models/config.js

@@ -1,18 +1,14 @@
 import { ResourceControlViewModel } from 'Portainer/models/resourceControl/resourceControl';
 
 function b64DecodeUnicode(str) {
-  try {
-    return decodeURIComponent(
-      atob(str)
-        .split('')
-        .map(function (c) {
-          return '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2);
-        })
-        .join('')
-    );
-  } catch (err) {
-    return atob(str);
-  }
+  return decodeURIComponent(
+    atob(str)
+      .split('')
+      .map(function (c) {
+        return '%' + ('00' + c.charCodeAt(0).toString(16)).slice(-2);
+      })
+      .join('')
+  );
 }
 
 export function ConfigViewModel(data) {

app/docker/views/containers/logs/containerlogs.html

@@ -12,5 +12,4 @@
   display-timestamps="state.displayTimestamps"
   line-count="state.lineCount"
   since-timestamp="state.sinceTimestamp"
-  resource-name="container.Name"
 ></log-viewer>

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

@@ -520,12 +520,6 @@ angular.module('portainer.docker').controller('CreateServiceController', [
       return true;
     }
 
-    $scope.volumesAreValid = volumesAreValid;
-    function volumesAreValid() {
-      const volumes = $scope.formValues.Volumes;
-      return volumes.every((volume) => volume.Target && volume.Source);
-    }
-
     $scope.create = function createService() {
       var accessControlData = $scope.formValues.AccessControlData;
 

app/docker/views/services/create/createservice.html

@@ -123,7 +123,7 @@
               <button
                 type="button"
                 class="btn btn-primary btn-sm"
-                ng-disabled="state.actionInProgress || !formValues.RegistryModel.Image || !volumesAreValid()"
+                ng-disabled="state.actionInProgress || !formValues.RegistryModel.Image"
                 ng-click="create()"
                 button-spinner="state.actionInProgress"
               >
@@ -298,16 +298,13 @@
                       <!-- volume-line1 -->
                       <div class="col-sm-12 form-inline">
                         <!-- container-path -->
-                        <div class="input-group col-sm-6">
-                          <div class="input-group input-group-sm w-full">
-                            <span class="input-group-addon">container</span>
-                            <input type="text" class="form-control" ng-model="volume.Target" placeholder="e.g. /path/in/container" />
-                          </div>
-                          <div class="small text-warning" ng-show="!volume.Target"> <i class="fa fa-exclamation-triangle" aria-hidden="true"></i> Target is required. </div>
+                        <div class="input-group input-group-sm col-sm-6">
+                          <span class="input-group-addon">container</span>
+                          <input type="text" class="form-control" ng-model="volume.Target" placeholder="e.g. /path/in/container" />
                         </div>
                         <!-- !container-path -->
                         <!-- volume-type -->
-                        <div class="input-group col-sm-5" style="margin-left: 5px; vertical-align: top;">
+                        <div class="input-group col-sm-5" style="margin-left: 5px;">
                           <div class="btn-group btn-group-sm" ng-if="allowBindMounts">
                             <label class="btn btn-primary" ng-model="volume.Type" uib-btn-radio="'volume'" ng-click="volume.name = ''">Volume</label>
                             <label class="btn btn-primary" ng-model="volume.Type" uib-btn-radio="'bind'" ng-click="volume.Id = ''">Bind</label>
@@ -321,35 +318,27 @@
                       <!-- !volume-line1 -->
                       <!-- volume-line2 -->
                       <div class="col-sm-12 form-inline" style="margin-top: 5px;">
-                        <div style="height: 30px; display: inline-block; vertical-align: top; display: inline-flex; align-items: center;">
-                          <i class="fa fa-long-arrow-alt-right" aria-hidden="true"></i>
-                        </div>
+                        <i class="fa fa-long-arrow-alt-right" aria-hidden="true"></i>
                         <!-- volume -->
-                        <div class="col-sm-6 input-group" ng-if="volume.Type === 'volume'" style="float: none; padding: 0;">
-                          <div class="input-group input-group-sm w-full">
-                            <span class="input-group-addon">volume</span>
-                            <select
-                              class="form-control"
-                              ng-model="volume.Source"
-                              ng-options="vol as ((vol.Id|truncate:30) + ' - ' + (vol.Driver|truncate:30)) for vol in availableVolumes"
-                            >
-                              <option selected disabled hidden value="">Select a volume</option>
-                            </select>
-                          </div>
-                          <div class="small text-warning" ng-show="!volume.Source"> <i class="fa fa-exclamation-triangle" aria-hidden="true"></i> Source is required. </div>
+                        <div class="input-group input-group-sm col-sm-6" ng-if="volume.Type === 'volume'">
+                          <span class="input-group-addon">volume</span>
+                          <select
+                            class="form-control"
+                            ng-model="volume.Source"
+                            ng-options="vol as ((vol.Id|truncate:30) + ' - ' + (vol.Driver|truncate:30)) for vol in availableVolumes"
+                          >
+                            <option selected disabled hidden value="">Select a volume</option>
+                          </select>
                         </div>
                         <!-- !volume -->
                         <!-- bind -->
                         <div class="input-group input-group-sm col-sm-6" ng-if="volume.Type === 'bind'">
-                          <div class="input-group input-group-sm w-full">
-                            <span class="input-group-addon">host</span>
-                            <input type="text" class="form-control" ng-model="volume.Source" placeholder="e.g. /path/on/host" />
-                          </div>
-                          <div class="small text-warning" ng-show="!volume.Source"> <i class="fa fa-exclamation-triangle" aria-hidden="true"></i> Source is required. </div>
+                          <span class="input-group-addon">host</span>
+                          <input type="text" class="form-control" ng-model="volume.Source" placeholder="e.g. /path/on/host" />
                         </div>
                         <!-- !bind -->
                         <!-- read-only -->
-                        <div class="input-group input-group-sm col-sm-5" style="margin-left: 5px; vertical-align: top;">
+                        <div class="input-group input-group-sm col-sm-5" style="margin-left: 5px;">
                           <div class="btn-group btn-group-sm">
                             <label class="btn btn-primary" ng-model="volume.ReadOnly" uib-btn-radio="false">Writable</label>
                             <label class="btn btn-primary" ng-model="volume.ReadOnly" uib-btn-radio="true">Read-only</label>

app/docker/views/services/edit/includes/mounts.html

@@ -42,14 +42,12 @@
               <input
                 type="text"
                 class="form-control"
-                name=""
                 ng-model="mount.Source"
                 placeholder="e.g. /tmp/portainer/data"
                 ng-change="updateMount(service, mount)"
                 ng-disabled="isUpdating || (!isAdmin && !allowBindMounts && mount.Type === 'bind')"
                 ng-if="mount.Type === 'bind'"
               />
-              <div class="col-sm-12 small text-warning" ng-show="!mount.Source"> <i class="fa fa-exclamation-triangle" aria-hidden="true"></i> Source is required. </div>
             </td>
             <td>
               <input
@@ -61,7 +59,6 @@
                 ng-disabled="isUpdating"
                 disable-authorization="DockerServiceUpdate"
               />
-              <div class="col-sm-12 small text-warning" ng-show="!mount.Target"> <i class="fa fa-exclamation-triangle" aria-hidden="true"></i> Target is required. </div>
             </td>
             <td authorization="DockerServiceUpdate">
               <input type="checkbox" class="form-control" ng-model="mount.ReadOnly" ng-change="updateMount(service, mount)" ng-disabled="isUpdating" />
@@ -80,9 +77,7 @@
     <rd-widget-footer authorization="DockerServiceUpdate">
       <div class="btn-toolbar" role="toolbar">
         <div class="btn-group" role="group">
-          <button type="button" class="btn btn-primary btn-sm" ng-disabled="!mountsAreValid() || !hasChanges(service, ['ServiceMounts'])" ng-click="updateService(service)">
-            Apply changes
-          </button>
+          <button type="button" class="btn btn-primary btn-sm" ng-disabled="!hasChanges(service, ['ServiceMounts'])" ng-click="updateService(service)">Apply changes</button>
           <button type="button" class="btn btn-default btn-sm dropdown-toggle" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">
             <span class="caret"></span>
           </button>

app/docker/views/services/edit/serviceController.js

@@ -378,12 +378,6 @@ angular.module('portainer.docker').controller('ServiceController', [
       return hasChanges;
     };
 
-    $scope.mountsAreValid = mountsAreValid;
-    function mountsAreValid() {
-      const mounts = $scope.service.ServiceMounts;
-      return mounts.every((mount) => mount.Source && mount.Target);
-    }
-
     function buildChanges(service) {
       var config = ServiceHelper.serviceToConfig(service.Model);
       config.Name = service.Name;

app/docker/views/services/logs/servicelogs.html

@@ -12,5 +12,4 @@
   display-timestamps="state.displayTimestamps"
   line-count="state.lineCount"
   since-timestamp="state.sinceTimestamp"
-  resource-name="service.Name"
 ></log-viewer>

app/docker/views/tasks/logs/tasklogs.html

@@ -13,5 +13,4 @@
   display-timestamps="state.displayTimestamps"
   line-count="state.lineCount"
   since-timestamp="state.sinceTimestamp"
-  resource-name="task.Id"
 ></log-viewer>

app/docker/views/volumes/edit/volumeController.js

@@ -51,18 +51,14 @@ angular.module('portainer.docker').controller('VolumeController', [
     };
 
     $scope.removeVolume = function removeVolume() {
-      ModalService.confirmDeletion('Do you want to remove this volume?', (confirmed) => {
-        if (confirmed) {
-          VolumeService.remove($scope.volume)
-            .then(function success() {
-              Notifications.success('Volume successfully removed', $transition$.params().id);
-              $state.go('docker.volumes', {});
-            })
-            .catch(function error(err) {
-              Notifications.error('Failure', err, 'Unable to remove volume');
-            });
-        }
-      });
+      VolumeService.remove($scope.volume)
+        .then(function success() {
+          Notifications.success('Volume successfully removed', $transition$.params().id);
+          $state.go('docker.volumes', {});
+        })
+        .catch(function error(err) {
+          Notifications.error('Failure', err, 'Unable to remove volume');
+        });
     };
 
     function getVolumeDataFromContainer(container, volumeId) {

app/docker/views/volumes/volumesController.js

@@ -9,31 +9,26 @@ angular.module('portainer.docker').controller('VolumesController', [
   'HttpRequestHelper',
   'EndpointProvider',
   'Authentication',
-  'ModalService',
-  function ($q, $scope, $state, VolumeService, ServiceService, VolumeHelper, Notifications, HttpRequestHelper, EndpointProvider, Authentication, ModalService) {
+  function ($q, $scope, $state, VolumeService, ServiceService, VolumeHelper, Notifications, HttpRequestHelper, EndpointProvider, Authentication) {
     $scope.removeAction = function (selectedItems) {
-      ModalService.confirmDeletion('Do you want to remove the selected volume(s)?', (confirmed) => {
-        if (confirmed) {
-          var actionCount = selectedItems.length;
-          angular.forEach(selectedItems, function (volume) {
-            HttpRequestHelper.setPortainerAgentTargetHeader(volume.NodeName);
-            VolumeService.remove(volume)
-              .then(function success() {
-                Notifications.success('Volume successfully removed', volume.Id);
-                var index = $scope.volumes.indexOf(volume);
-                $scope.volumes.splice(index, 1);
-              })
-              .catch(function error(err) {
-                Notifications.error('Failure', err, 'Unable to remove volume');
-              })
-              .finally(function final() {
-                --actionCount;
-                if (actionCount === 0) {
-                  $state.reload();
-                }
-              });
+      var actionCount = selectedItems.length;
+      angular.forEach(selectedItems, function (volume) {
+        HttpRequestHelper.setPortainerAgentTargetHeader(volume.NodeName);
+        VolumeService.remove(volume)
+          .then(function success() {
+            Notifications.success('Volume successfully removed', volume.Id);
+            var index = $scope.volumes.indexOf(volume);
+            $scope.volumes.splice(index, 1);
+          })
+          .catch(function error(err) {
+            Notifications.error('Failure', err, 'Unable to remove volume');
+          })
+          .finally(function final() {
+            --actionCount;
+            if (actionCount === 0) {
+              $state.reload();
+            }
           });
-        }
       });
     };
 

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

@@ -57,7 +57,7 @@
         <table class="table table-hover nowrap-cells">
           <thead>
             <tr>
-              <th ng-if="!$ctrl.isPod">
+              <th>
                 <a ng-click="$ctrl.changeOrderBy('PodName')">
                   Pod
                   <i class="fa fa-sort-alpha-down" aria-hidden="true" ng-if="$ctrl.state.orderBy === 'PodName' && !$ctrl.state.reverseOrder"></i>
@@ -107,7 +107,7 @@
               dir-paginate="item in ($ctrl.state.filteredDataSet = ($ctrl.dataset | filter:$ctrl.state.textFilter | orderBy:$ctrl.state.orderBy:$ctrl.state.reverseOrder | itemsPerPage: $ctrl.state.paginatedItemLimit: $ctrl.tableKey))"
               pagination-id="$ctrl.tableKey"
             >
-              <td ng-if="!$ctrl.isPod">{{ item.PodName }}</td>
+              <td>{{ item.PodName }}</td>
               <td>{{ item.Name }}</td>
               <td>{{ item.Image }}</td>
               <td

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

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

app/kubernetes/components/datatables/applications-datatable/applicationsDatatable.html

@@ -151,14 +151,11 @@
                 >{{ item.Image }} <span ng-if="item.Containers.length > 1">+ {{ item.Containers.length - 1 }}</span></td
               >
               <td>{{ item.ApplicationType | kubernetesApplicationTypeText }}</td>
-              <td ng-if="item.ApplicationType !== $ctrl.KubernetesApplicationTypes.POD">
+              <td>
                 <span ng-if="item.DeploymentType === $ctrl.KubernetesApplicationDeploymentTypes.REPLICATED">Replicated</span>
                 <span ng-if="item.DeploymentType === $ctrl.KubernetesApplicationDeploymentTypes.GLOBAL">Global</span>
-                <code>{{ item.RunningPodsCount }}</code> / <code>{{ item.TotalPodsCount }}</code>
-              </td>
-              <td ng-if="item.ApplicationType === $ctrl.KubernetesApplicationTypes.POD">
-                {{ item.Pods[0].Status }}
-              </td>
+                <code>{{ item.RunningPodsCount }}</code> / <code>{{ item.TotalPodsCount }}</code></td
+              >
               <td>
                 <span ng-if="item.PublishedPorts.length">
                   <span>

app/kubernetes/components/datatables/applications-datatable/applicationsDatatableController.js

@@ -1,4 +1,4 @@
-import { KubernetesApplicationDeploymentTypes, KubernetesApplicationTypes } from 'Kubernetes/models/application/models';
+import { KubernetesApplicationDeploymentTypes } from 'Kubernetes/models/application/models';
 import KubernetesApplicationHelper from 'Kubernetes/helpers/application';
 
 angular.module('portainer.docker').controller('KubernetesApplicationsDatatableController', [
@@ -42,7 +42,6 @@ angular.module('portainer.docker').controller('KubernetesApplicationsDatatableCo
     this.$onInit = function () {
       this.isAdmin = Authentication.isAdmin();
       this.KubernetesApplicationDeploymentTypes = KubernetesApplicationDeploymentTypes;
-      this.KubernetesApplicationTypes = KubernetesApplicationTypes;
       this.setDefaults();
       this.prepareTableFromDataset();
 

app/kubernetes/components/kubernetes-configuration-data/kubernetesConfigurationData.html

@@ -30,7 +30,7 @@
         <i class="fa fa-plus-circle" aria-hidden="true"></i> Create entry
       </button>
       <button type="button" class="btn btn-sm btn-default" ngf-select="$ctrl.addEntryFromFile($file)" style="margin-left: 0;">
-        <i class="fa fa-file-upload" aria-hidden="true"></i> Create key/value from file
+        <i class="fa fa-file-upload" aria-hidden="true"></i> Create entry from file
       </button>
     </div>
   </div>

app/kubernetes/components/kubernetes-sidebar-content/kubernetesSidebarContent.html

@@ -16,6 +16,6 @@
 <li class="sidebar-list">
   <a ui-sref="kubernetes.cluster({endpointId: $ctrl.endpointId})" ui-sref-active="active">Cluster <span class="menu-icon fa fa-server fa-fw"></span></a>
   <div class="sidebar-sublist" ng-if="$ctrl.adminAccess && ($ctrl.currentState === 'kubernetes.cluster' || $ctrl.currentState === 'portainer.endpoints.endpoint.kubernetesConfig')">
-    <a ui-sref="portainer.endpoints.endpoint.kubernetesConfig({id: $ctrl.endpointId})" ui-sref-active="active">Setup</a>
+    <a ui-sref="portainer.endpoints.endpoint.kubernetesConfig({id: $ctrl.endpointId})">Setup</a>
   </div>
 </li>

app/kubernetes/converters/application.js

@@ -27,7 +27,6 @@ import KubernetesServiceConverter from 'Kubernetes/converters/service';
 import KubernetesPersistentVolumeClaimConverter from 'Kubernetes/converters/persistentVolumeClaim';
 import PortainerError from 'Portainer/error';
 import { KubernetesIngressHelper } from 'Kubernetes/ingress/helper';
-import KubernetesCommonHelper from 'Kubernetes/helpers/commonHelper';
 
 function _apiPortsToPublishedPorts(pList, pRefs) {
   const ports = _.map(pList, (item) => {
@@ -51,7 +50,7 @@ function _apiPortsToPublishedPorts(pList, pRefs) {
 
 class KubernetesApplicationConverter {
   static applicationCommon(res, data, pods, service, ingresses) {
-    const containers = data.spec.template ? _.without(_.concat(data.spec.template.spec.containers, data.spec.template.spec.initContainers), undefined) : data.spec.containers;
+    const containers = _.without(_.concat(data.spec.template.spec.containers, data.spec.template.spec.initContainers), undefined);
     res.Id = data.metadata.uid;
     res.Name = data.metadata.name;
     res.StackName = data.metadata.labels ? data.metadata.labels[KubernetesPortainerApplicationStackNameLabel] || '-' : '-';
@@ -62,7 +61,7 @@ class KubernetesApplicationConverter {
     res.Image = containers[0].image;
     res.CreationDate = data.metadata.creationTimestamp;
     res.Env = _.without(_.flatMap(_.map(containers, 'env')), undefined);
-    res.Pods = data.spec.selector ? KubernetesApplicationHelper.associatePodsAndApplication(pods, data.spec.selector) : [data];
+    res.Pods = KubernetesApplicationHelper.associatePodsAndApplication(pods, data);
 
     const limits = {
       Cpu: 0,
@@ -119,11 +118,7 @@ class KubernetesApplicationConverter {
       res.PublishedPorts = ports;
     }
 
-    if (data.spec.template) {
-      res.Volumes = data.spec.template.spec.volumes ? data.spec.template.spec.volumes : [];
-    } else {
-      res.Volumes = data.spec.volumes;
-    }
+    res.Volumes = data.spec.template.spec.volumes ? data.spec.template.spec.volumes : [];
 
     // TODO: review
     // this if() fixs direct use of PVC reference inside spec.template.spec.containers[0].volumeMounts
@@ -174,7 +169,7 @@ class KubernetesApplicationConverter {
     res.PersistedFolders = _.without(res.PersistedFolders, undefined);
 
     res.ConfigurationVolumes = _.reduce(
-      res.Volumes,
+      data.spec.template.spec.volumes,
       (acc, volume) => {
         if (volume.configMap || volume.secret) {
           const matchingVolumeMount = _.find(_.flatMap(_.map(containers, 'volumeMounts')), { name: volume.name });
@@ -218,13 +213,6 @@ class KubernetesApplicationConverter {
     );
   }
 
-  static apiPodToApplication(data, pods, service, ingresses) {
-    const res = new KubernetesApplication();
-    KubernetesApplicationConverter.applicationCommon(res, data, pods, service, ingresses);
-    res.ApplicationType = KubernetesApplicationTypes.POD;
-    return res;
-  }
-
   static apiDeploymentToApplication(data, pods, service, ingresses) {
     const res = new KubernetesApplication();
     KubernetesApplicationConverter.applicationCommon(res, data, pods, service, ingresses);
@@ -295,8 +283,6 @@ class KubernetesApplicationConverter {
   }
 
   static applicationFormValuesToApplication(formValues) {
-    formValues.ApplicationOwner = KubernetesCommonHelper.ownerToLabel(formValues.ApplicationOwner);
-
     const claims = KubernetesPersistentVolumeClaimConverter.applicationFormValuesToVolumeClaims(formValues);
     const rwx = _.find(claims, (item) => _.includes(item.StorageClass.AccessModes, 'RWX')) !== undefined;
 
@@ -324,7 +310,7 @@ class KubernetesApplicationConverter {
     } else if (daemonSet) {
       app = KubernetesDaemonSetConverter.applicationFormValuesToDaemonSet(formValues, claims);
     } else {
-      throw new PortainerError('Unable to determine which association to use to convert form');
+      throw new PortainerError('Unable to determine which association to use');
     }
 
     let headlessService;

app/kubernetes/converters/secret.js

@@ -18,7 +18,6 @@ class KubernetesSecretConverter {
     const res = new KubernetesSecretUpdatePayload();
     res.metadata.name = secret.Name;
     res.metadata.namespace = secret.Namespace;
-    res.metadata.labels[KubernetesPortainerConfigurationOwnerLabel] = secret.ConfigurationOwner;
     res.stringData = secret.Data;
     return res;
   }

app/kubernetes/filters/applicationFilters.js

@@ -57,8 +57,6 @@ angular
           return KubernetesApplicationTypeStrings.DAEMONSET;
         case KubernetesApplicationTypes.STATEFULSET:
           return KubernetesApplicationTypeStrings.STATEFULSET;
-        case KubernetesApplicationTypes.POD:
-          return KubernetesApplicationTypeStrings.POD;
         default:
           return '-';
       }

app/kubernetes/helpers/application/index.js

@@ -38,8 +38,8 @@ class KubernetesApplicationHelper {
     return !application.ApplicationOwner;
   }
 
-  static associatePodsAndApplication(pods, selector) {
-    return _.filter(pods, ['metadata.labels', selector.matchLabels]);
+  static associatePodsAndApplication(pods, app) {
+    return _.filter(pods, { Labels: app.spec.selector.matchLabels });
   }
 
   static associateContainerPersistedFoldersAndConfigurations(app, containers) {

app/kubernetes/helpers/application/rollback.js

@@ -20,7 +20,7 @@ class KubernetesApplicationRollbackHelper {
         result = KubernetesApplicationRollbackHelper._getStatefulSetPayload(application, targetRevision);
         break;
       default:
-        throw new PortainerError('Unable to determine which association to use to convert patch');
+        throw new PortainerError('Unable to determine which association to use');
     }
     return result;
   }

app/kubernetes/helpers/commonHelper.js

@@ -8,9 +8,5 @@ class KubernetesCommonHelper {
       _.set(obj, path, value);
     }
   }
-
-  static ownerToLabel(owner) {
-    return _.replace(owner, /[^-A-Za-z0-9_.]/g, '.');
-  }
 }
 export default KubernetesCommonHelper;

app/kubernetes/helpers/history/index.js

@@ -21,7 +21,7 @@ class KubernetesHistoryHelper {
         [currentRevision, revisionsList] = KubernetesHistoryHelper._getStatefulSetRevisions(rawRevisions, application.Raw);
         break;
       default:
-        throw new PortainerError('Unable to determine which association to use to get revisions');
+        throw new PortainerError('Unable to determine which association to use');
     }
     revisionsList = _.sortBy(revisionsList, 'revision');
     return [currentRevision, revisionsList];

app/kubernetes/helpers/serviceHelper.js

@@ -7,9 +7,6 @@ class KubernetesServiceHelper {
   }
 
   static findApplicationBoundService(services, rawApp) {
-    if (!rawApp.spec.template) {
-      return undefined;
-    }
     return _.find(services, (item) => item.spec.selector && _.isMatch(rawApp.spec.template.metadata.labels, item.spec.selector));
   }
 }

app/kubernetes/horizontal-pod-auto-scaler/helper.js

@@ -18,8 +18,7 @@ export class KubernetesHorizontalPodAutoScalerHelper {
       return KubernetesApplicationTypeStrings.DAEMONSET;
     } else if ((app instanceof KubernetesApplication && app.ApplicationType === KubernetesApplicationTypes.STATEFULSET) || app instanceof KubernetesStatefulSet) {
       return KubernetesApplicationTypeStrings.STATEFULSET;
-    } else if (app instanceof KubernetesApplication && app.ApplicationType === KubernetesApplicationTypes.POD) {
-      return KubernetesApplicationTypeStrings.POD;
+      // } else if () { ---> TODO: refactor - handle bare pod type !
     } else {
       throw new PortainerError('Unable to determine application type');
     }

app/kubernetes/models/application/models/constants.js

@@ -12,14 +12,12 @@ export const KubernetesApplicationTypes = Object.freeze({
   DEPLOYMENT: 1,
   DAEMONSET: 2,
   STATEFULSET: 3,
-  POD: 4,
 });
 
 export const KubernetesApplicationTypeStrings = Object.freeze({
   DEPLOYMENT: 'Deployment',
   DAEMONSET: 'DaemonSet',
   STATEFULSET: 'StatefulSet',
-  POD: 'Pod',
 });
 
 export const KubernetesApplicationPublishingTypes = Object.freeze({

app/kubernetes/models/common/params.js

@@ -1,8 +1,11 @@
 /**
  * Generic params
  */
-export function KubernetesCommonParams() {
-  return {
-    id: '',
-  };
+const _KubernetesCommonParams = Object.freeze({
+  id: '',
+});
+export class KubernetesCommonParams {
+  constructor() {
+    Object.assign(this, JSON.parse(JSON.stringify(_KubernetesCommonParams)));
+  }
 }

app/kubernetes/pod/service.js

@@ -1,7 +1,9 @@
+import _ from 'lodash-es';
 import angular from 'angular';
 import PortainerError from 'Portainer/error';
 
 import { KubernetesCommonParams } from 'Kubernetes/models/common/params';
+import KubernetesPodConverter from 'Kubernetes/pod/converter';
 
 class KubernetesPodService {
   /* @ngInject */
@@ -9,43 +11,23 @@ class KubernetesPodService {
     this.$async = $async;
     this.KubernetesPods = KubernetesPods;
 
-    this.getAsync = this.getAsync.bind(this);
     this.getAllAsync = this.getAllAsync.bind(this);
     this.logsAsync = this.logsAsync.bind(this);
     this.deleteAsync = this.deleteAsync.bind(this);
   }
-
-  async getAsync(namespace, name) {
-    try {
-      const params = new KubernetesCommonParams();
-      params.id = name;
-      const [raw, yaml] = await Promise.all([this.KubernetesPods(namespace).get(params).$promise, this.KubernetesPods(namespace).getYaml(params).$promise]);
-      const res = {
-        Raw: raw,
-        Yaml: yaml.data,
-      };
-      return res;
-    } catch (err) {
-      throw new PortainerError('Unable to retrieve pod', err);
-    }
-  }
-
   /**
    * GET ALL
    */
   async getAllAsync(namespace) {
     try {
       const data = await this.KubernetesPods(namespace).get().$promise;
-      return data.items;
+      return _.map(data.items, (item) => KubernetesPodConverter.apiToModel(item));
     } catch (err) {
       throw new PortainerError('Unable to retrieve pods', err);
     }
   }
 
-  get(namespace, name) {
-    if (name) {
-      return this.$async(this.getAsync, namespace, name);
-    }
+  get(namespace) {
     return this.$async(this.getAllAsync, namespace);
   }
 

app/kubernetes/services/applicationService.js

@@ -18,7 +18,6 @@ import KubernetesServiceHelper from 'Kubernetes/helpers/serviceHelper';
 import { KubernetesHorizontalPodAutoScalerHelper } from 'Kubernetes/horizontal-pod-auto-scaler/helper';
 import { KubernetesHorizontalPodAutoScalerConverter } from 'Kubernetes/horizontal-pod-auto-scaler/converter';
 import { KubernetesIngressConverter } from 'Kubernetes/ingress/converter';
-import KubernetesPodConverter from 'Kubernetes/pod/converter';
 
 class KubernetesApplicationService {
   /* #region  CONSTRUCTOR */
@@ -71,10 +70,8 @@ class KubernetesApplicationService {
       apiService = this.KubernetesDaemonSetService;
     } else if (app instanceof KubernetesStatefulSet || (app instanceof KubernetesApplication && app.ApplicationType === KubernetesApplicationTypes.STATEFULSET)) {
       apiService = this.KubernetesStatefulSetService;
-    } else if (app instanceof KubernetesApplication && app.ApplicationType === KubernetesApplicationTypes.POD) {
-      apiService = this.KubernetesPodService;
     } else {
-      throw new PortainerError('Unable to determine which association to use to retrieve API Service');
+      throw new PortainerError('Unable to determine which association to use');
     }
     return apiService;
   }
@@ -90,18 +87,15 @@ class KubernetesApplicationService {
   /* #region  GET */
   async getAsync(namespace, name) {
     try {
-      const [deployment, daemonSet, statefulSet, pod, pods, autoScalers, ingresses] = await Promise.allSettled([
+      const [deployment, daemonSet, statefulSet, pods, autoScalers, ingresses] = await Promise.allSettled([
         this.KubernetesDeploymentService.get(namespace, name),
         this.KubernetesDaemonSetService.get(namespace, name),
         this.KubernetesStatefulSetService.get(namespace, name),
-        this.KubernetesPodService.get(namespace, name),
         this.KubernetesPodService.get(namespace),
         this.KubernetesHorizontalPodAutoScalerService.get(namespace),
         this.KubernetesIngressService.get(namespace),
       ]);
 
-      // const pod = _.find(pods.value, ['metadata.namespace', namespace, 'metadata.name', name]);
-
       let rootItem;
       let converterFunc;
       if (deployment.status === 'fulfilled') {
@@ -113,11 +107,8 @@ class KubernetesApplicationService {
       } else if (statefulSet.status === 'fulfilled') {
         rootItem = statefulSet;
         converterFunc = KubernetesApplicationConverter.apiStatefulSetToapplication;
-      } else if (pod.status === 'fulfilled') {
-        rootItem = pod;
-        converterFunc = KubernetesApplicationConverter.apiPodToApplication;
       } else {
-        throw new PortainerError('Unable to determine which association to use to convert application');
+        throw new PortainerError('Unable to determine which association to use');
       }
 
       const services = await this.KubernetesServiceService.get(namespace);
@@ -127,7 +118,6 @@ class KubernetesApplicationService {
       const application = converterFunc(rootItem.value.Raw, pods.value, service.Raw, ingresses.value);
       application.Yaml = rootItem.value.Yaml;
       application.Raw = rootItem.value.Raw;
-      application.Pods = _.map(application.Pods, (item) => KubernetesPodConverter.apiToModel(item));
       application.Containers = KubernetesApplicationHelper.associateContainersAndApplication(application);
 
       const boundScaler = KubernetesHorizontalPodAutoScalerHelper.findApplicationBoundScaler(autoScalers.value, application);
@@ -183,14 +173,7 @@ class KubernetesApplicationService {
             convertToApplication(item, KubernetesApplicationConverter.apiStatefulSetToapplication, services, pods, ingresses)
           );
 
-          const boundPods = _.concat(_.flatMap(deploymentApplications, 'Pods'), _.flatMap(daemonSetApplications, 'Pods'), _.flatMap(statefulSetApplications, 'Pods'));
-          const unboundPods = _.without(pods, ...boundPods);
-          const nakedPodsApplications = _.map(unboundPods, (item) => convertToApplication(item, KubernetesApplicationConverter.apiPodToApplication, services, pods, ingresses));
-
-          const applications = _.concat(deploymentApplications, daemonSetApplications, statefulSetApplications, nakedPodsApplications);
-          _.forEach(applications, (app) => {
-            app.Pods = _.map(app.Pods, (item) => KubernetesPodConverter.apiToModel(item));
-          });
+          const applications = _.concat(deploymentApplications, daemonSetApplications, statefulSetApplications);
           await Promise.all(
             _.forEach(applications, async (application) => {
               const boundScaler = KubernetesHorizontalPodAutoScalerHelper.findApplicationBoundScaler(autoScalers, application);

app/kubernetes/services/configMapService.js

@@ -24,11 +24,8 @@ class KubernetesConfigMapService {
     try {
       const params = new KubernetesCommonParams();
       params.id = name;
-      const [rawPromise, yamlPromise] = await Promise.allSettled([
-        this.KubernetesConfigMaps(namespace).get(params).$promise,
-        this.KubernetesConfigMaps(namespace).getYaml(params).$promise,
-      ]);
-      const configMap = KubernetesConfigMapConverter.apiToConfigMap(rawPromise.value, yamlPromise.value);
+      const [raw, yaml] = await Promise.all([this.KubernetesConfigMaps(namespace).get(params).$promise, this.KubernetesConfigMaps(namespace).getYaml(params).$promise]);
+      const configMap = KubernetesConfigMapConverter.apiToConfigMap(raw, yaml);
       return configMap;
     } catch (err) {
       if (err.status === 404) {

app/kubernetes/services/configurationService.js

@@ -4,7 +4,6 @@ import KubernetesConfigurationConverter from 'Kubernetes/converters/configuratio
 import KubernetesConfigMapConverter from 'Kubernetes/converters/configMap';
 import KubernetesSecretConverter from 'Kubernetes/converters/secret';
 import { KubernetesConfigurationTypes } from 'Kubernetes/models/configuration/models';
-import KubernetesCommonHelper from 'Kubernetes/helpers/commonHelper';
 
 class KubernetesConfigurationService {
   /* @ngInject */
@@ -68,8 +67,6 @@ class KubernetesConfigurationService {
    * CREATE
    */
   async createAsync(formValues) {
-    formValues.ConfigurationOwner = KubernetesCommonHelper.ownerToLabel(formValues.ConfigurationOwner);
-
     try {
       if (formValues.Type === KubernetesConfigurationTypes.CONFIGMAP) {
         const configMap = KubernetesConfigMapConverter.configurationFormValuesToConfigMap(formValues);

app/kubernetes/services/historyService.js

@@ -32,17 +32,13 @@ class KubernetesHistoryService {
         case KubernetesApplicationTypes.STATEFULSET:
           rawRevisions = await this.KubernetesControllerRevisionService.get(namespace);
           break;
-        case KubernetesApplicationTypes.POD:
-          rawRevisions = [];
-          break;
         default:
-          throw new PortainerError('Unable to determine which association to use for history');
-      }
-      if (rawRevisions.length) {
-        const [currentRevision, revisionsList] = KubernetesHistoryHelper.getRevisions(rawRevisions, application);
-        application.CurrentRevision = currentRevision;
-        application.Revisions = revisionsList;
+          throw new PortainerError('Unable to determine which association to use');
       }
+
+      const [currentRevision, revisionsList] = KubernetesHistoryHelper.getRevisions(rawRevisions, application);
+      application.CurrentRevision = currentRevision;
+      application.Revisions = revisionsList;
       return application;
     } catch (err) {
       throw new PortainerError('', err);

app/kubernetes/services/resourcePoolService.js

@@ -7,7 +7,6 @@ import KubernetesResourceQuotaHelper from 'Kubernetes/helpers/resourceQuotaHelpe
 import { KubernetesNamespace } from 'Kubernetes/models/namespace/models';
 import KubernetesResourceReservationHelper from 'Kubernetes/helpers/resourceReservationHelper';
 import { KubernetesIngressConverter } from 'Kubernetes/ingress/converter';
-import KubernetesCommonHelper from 'Kubernetes/helpers/commonHelper';
 
 class KubernetesResourcePoolService {
   /* @ngInject */
@@ -74,8 +73,6 @@ class KubernetesResourcePoolService {
    * @param {KubernetesResourcePoolFormValues} formValues
    */
   async createAsync(formValues) {
-    formValues.Owner = KubernetesCommonHelper.ownerToLabel(formValues.Owner);
-
     try {
       const namespace = new KubernetesNamespace();
       namespace.Name = formValues.Name;

app/kubernetes/views/applications/applicationsController.js

@@ -79,11 +79,7 @@ class KubernetesApplicationsController {
   }
 
   removeAction(selectedItems) {
-    this.ModalService.confirmDeletion('Do you want to remove the selected application(s)?', (confirmed) => {
-      if (confirmed) {
-        return this.$async(this.removeActionAsync, selectedItems);
-      }
-    });
+    return this.$async(this.removeActionAsync, selectedItems);
   }
 
   onPublishingModeClick(application) {
@@ -91,7 +87,7 @@ class KubernetesApplicationsController {
     _.forEach(this.ports, (item) => {
       item.Expanded = false;
       item.Highlighted = false;
-      if (item.Name === application.Name && item.Ports.length > 1) {
+      if (item.Name === application.Name) {
         item.Expanded = true;
         item.Highlighted = true;
       }

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

@@ -778,7 +778,6 @@
                 </label>
                 <input
                   type="number"
-                  name="replica_count"
                   class="form-control"
                   min="1"
                   max="9999"
@@ -786,19 +785,10 @@
                   style="margin-left: 20px;"
                   ng-model="ctrl.formValues.ReplicaCount"
                   ng-disabled="!ctrl.supportScalableReplicaDeployment()"
-                  ng-change="ctrl.onChangeVolumeRequestedSize()"
-                  required
+                  ng-change="ctrl.enforceReplicaCountMinimum()"
                 />
               </div>
             </div>
-            <div class="form-group" ng-if="kubernetesApplicationCreationForm['replica_count'].$invalid">
-              <div class="col-sm-12 small text-warning">
-                <ng-messages for="kubernetesApplicationCreationForm['replica_count'].$error">
-                  <p ng-message="required"><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> Instance count is required.</p>
-                  <p ng-message="min"><i class="fa fa-exclamation-triangle" aria-hidden="true"></i> Instance count must be greater than 0.</p>
-                </ng-messages>
-              </div>
-            </div>
             <!-- !replica count -->
 
             <div

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

@@ -488,6 +488,12 @@ class KubernetesCreateApplicationController {
     return _.uniq(storageOptions).join(', ');
   }
 
+  enforceReplicaCountMinimum() {
+    if (this.formValues.ReplicaCount === null) {
+      this.formValues.ReplicaCount = 1;
+    }
+  }
+
   resourceQuotaCapacityExceeded() {
     return !this.state.sliders.memory.max || !this.state.sliders.cpu.max;
   }

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

@@ -43,21 +43,16 @@
                     </tr>
                     <tr>
                       <td>Status</td>
-                      <td ng-if="ctrl.application.ApplicationType !== ctrl.KubernetesApplicationTypes.POD">
+                      <td>
                         <span ng-if="ctrl.application.DeploymentType === ctrl.KubernetesApplicationDeploymentTypes.REPLICATED">Replicated</span>
                         <span ng-if="ctrl.application.DeploymentType === ctrl.KubernetesApplicationDeploymentTypes.GLOBAL">Global</span>
                         <code>{{ ctrl.application.RunningPodsCount }}</code> / <code>{{ ctrl.application.TotalPodsCount }}</code>
                       </td>
-                      <td ng-if="ctrl.application.ApplicationType === ctrl.KubernetesApplicationTypes.POD">
-                        {{ ctrl.application.Pods[0].Status }}
-                      </td>
                     </tr>
                     <tr ng-if="ctrl.application.Requests.Cpu || ctrl.application.Requests.Memory">
                       <td>
                         <div>Resource reservations</div>
-                        <div ng-if="ctrl.application.ApplicationType !== ctrl.KubernetesApplicationTypes.POD" class="text-muted small">
-                          per instance
-                        </div>
+                        <div class="text-muted small">per instance</div>
                       </td>
                       <td>
                         <div ng-if="ctrl.application.Requests.Cpu">CPU {{ ctrl.application.Requests.Cpu | kubernetesApplicationCPUValue }}</div>
@@ -562,8 +557,7 @@
         title-icon="fa-server"
         dataset="ctrl.allContainers"
         table-key="kubernetes.application.containers"
-        is-pod="ctrl.application.ApplicationType === ctrl.KubernetesApplicationTypes.POD"
-        order-by="{{ ctrl.application.ApplicationType === ctrl.KubernetesApplicationTypes.POD ? 'Name' : 'PodName' }}"
+        order-by="PodName"
       >
       </kubernetes-containers-datatable>
     </div>

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

@@ -1,7 +1,7 @@
 import angular from 'angular';
 import * as _ from 'lodash-es';
 import * as JsonPatch from 'fast-json-patch';
-import { KubernetesApplicationDataAccessPolicies, KubernetesApplicationDeploymentTypes, KubernetesApplicationTypes } from 'Kubernetes/models/application/models';
+import { KubernetesApplicationDataAccessPolicies, KubernetesApplicationDeploymentTypes } from 'Kubernetes/models/application/models';
 import KubernetesEventHelper from 'Kubernetes/helpers/eventHelper';
 import KubernetesApplicationHelper from 'Kubernetes/helpers/application';
 import { KubernetesServiceTypes } from 'Kubernetes/models/service/models';
@@ -123,8 +123,6 @@ class KubernetesApplicationController {
 
     this.KubernetesNamespaceHelper = KubernetesNamespaceHelper;
 
-    this.KubernetesApplicationDeploymentTypes = KubernetesApplicationDeploymentTypes;
-    this.KubernetesApplicationTypes = KubernetesApplicationTypes;
     this.ApplicationDataAccessPolicies = KubernetesApplicationDataAccessPolicies;
     this.KubernetesServiceTypes = KubernetesServiceTypes;
     this.KubernetesPodContainerTypes = KubernetesPodContainerTypes;
@@ -146,7 +144,7 @@ class KubernetesApplicationController {
 
   showEditor() {
     this.state.showEditorTab = true;
-    this.selectTab(3);
+    this.selectTab(2);
   }
 
   isSystemNamespace() {
@@ -342,6 +340,7 @@ class KubernetesApplicationController {
       SelectedRevision: undefined,
     };
 
+    this.KubernetesApplicationDeploymentTypes = KubernetesApplicationDeploymentTypes;
     await this.getApplication();
     await this.getEvents();
     this.state.viewReady = true;

app/kubernetes/views/cluster/node/nodeController.js

@@ -339,8 +339,8 @@ class KubernetesNodeController {
 
     this.availableEffects = _.values(KubernetesNodeTaintEffects);
     this.formValues = KubernetesNodeConverter.nodeToFormValues(this.node);
-    this.formValues.Labels = KubernetesNodeHelper.computeUsedLabels(this.applications, this.formValues.Labels);
     this.formValues.Labels = KubernetesNodeHelper.reorderLabels(this.formValues.Labels);
+    this.formValues.Labels = KubernetesNodeHelper.computeUsedLabels(this.applications, this.formValues.Labels);
 
     this.state.viewReady = true;
   }

app/kubernetes/views/configurations/configurationsController.js

@@ -3,13 +3,12 @@ import KubernetesConfigurationHelper from 'Kubernetes/helpers/configurationHelpe
 
 class KubernetesConfigurationsController {
   /* @ngInject */
-  constructor($async, $state, Notifications, KubernetesConfigurationService, KubernetesApplicationService, ModalService) {
+  constructor($async, $state, Notifications, KubernetesConfigurationService, KubernetesApplicationService) {
     this.$async = $async;
     this.$state = $state;
     this.Notifications = Notifications;
     this.KubernetesConfigurationService = KubernetesConfigurationService;
     this.KubernetesApplicationService = KubernetesApplicationService;
-    this.ModalService = ModalService;
 
     this.onInit = this.onInit.bind(this);
     this.getConfigurations = this.getConfigurations.bind(this);
@@ -57,11 +56,7 @@ class KubernetesConfigurationsController {
   }
 
   removeAction(selectedItems) {
-    this.ModalService.confirmDeletion('Do you want to remove the selected configuration(s)?', (confirmed) => {
-      if (confirmed) {
-        return this.$async(this.removeActionAsync, selectedItems);
-      }
-    });
+    return this.$async(this.removeActionAsync, selectedItems);
   }
 
   async getApplicationsAsync() {

app/kubernetes/views/configurations/create/createConfigurationController.js

@@ -25,10 +25,6 @@ class KubernetesCreateConfigurationController {
     this.state.alreadyExist = _.find(filteredConfigurations, (config) => config.Name === this.formValues.Name) !== undefined;
   }
 
-  onResourcePoolSelectionChange() {
-    this.onChangeName();
-  }
-
   isFormValid() {
     const uniqueCheck = !this.state.alreadyExist && this.state.isDataValid;
     if (this.formValues.IsSimple) {

app/kubernetes/views/configure/configure.html

@@ -132,53 +132,7 @@
             </div>
 
             <div class="col-sm-12 form-section-title">
-              Security
-            </div>
-
-            <div class="form-group">
-              <span class="col-sm-12 text-muted small">
-                By default, all the users have access to the default namespace. Enable this option to set accesses on the default namespace.
-              </span>
-            </div>
-            <div class="form-group">
-              <div class="col-sm-12">
-                <label class="control-label text-left">
-                  Restrict access to the default namespace
-                </label>
-                <label class="switch" style="margin-left: 20px;"> <input type="checkbox" disabled /><i></i> </label>
-                <span class="text-muted small" style="margin-left: 15px;">
-                  <i class="fa fa-user" aria-hidden="true"></i>
-                  This feature is available in <a href="https://www.portainer.io/business-upsell?from=k8s-setup-default" target="_blank"> Portainer Business Edition</a>.
-                </span>
-              </div>
-            </div>
-
-            <div class="col-sm-12 form-section-title">
-              Resources and Metrics
-            </div>
-
-            <div class="form-group">
-              <span class="col-sm-12 text-muted small">
-                By ENABLING resource over-commit, you are able to assign more resources to namespaces than is physically available in the cluster. This may lead to unexpected
-                deployment failures if there is insufficient resource to service demand.
-                <p style="margin-top: 2px;">
-                  <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px;"></i>
-                  By DISABLING resource over-commit (highly recommended), you are only able to assign resources to namespaces that are less (in aggregate) than the cluster total
-                  minus any system resource reservation.
-                </p>
-              </span>
-            </div>
-            <div class="form-group">
-              <div class="col-sm-12">
-                <label class="control-label text-left">
-                  Allow resource over-commit
-                </label>
-                <label class="switch" style="margin-left: 20px;"> <input type="checkbox" checked disabled /><i></i> </label>
-                <span class="text-muted small" style="margin-left: 15px;">
-                  <i class="fa fa-user" aria-hidden="true"></i>
-                  This feature is available in <a href="https://www.portainer.io/business-upsell?from=k8s-setup-overcommit" target="_blank"> Portainer Business Edition</a>.
-                </span>
-              </div>
+              Metrics
             </div>
 
             <div class="form-group">

app/kubernetes/views/deploy/deploy.html

@@ -69,14 +69,8 @@
                     </p>
                   </span>
                   <span class="col-sm-12 text-muted small" ng-show="ctrl.state.DeployType === ctrl.ManifestDeployTypes.KUBERNETES">
-                    <p>
-                      <i class="fa fa-info-circle blue-icon" aria-hidden="true" style="margin-right: 2px;"></i>
-                      This feature allows you to deploy any kind of Kubernetes resource in this environment (Deployment, Secret, ConfigMap...).
-                    </p>
-                    <p>
-                      You can get more information about Kubernetes file format in the
-                      <a href="https://kubernetes.io/docs/concepts/overview/working-with-objects/kubernetes-objects/" target="_blank">official documentation</a>.
-                    </p>
+                    You can get more information about Kubernetes file format in the
+                    <a href="https://kubernetes.io/docs/concepts/overview/working-with-objects/kubernetes-objects/" target="_blank">official documentation</a>.
                   </span>
                 </div>
                 <div class="form-group">

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

@@ -129,63 +129,6 @@
             </div>
             <!-- #endregion -->
 
-            <!-- #region LOAD-BALANCERS -->
-            <div class="col-sm-12 form-section-title">
-              Load balancers
-            </div>
-
-            <div class="form-group">
-              <span class="col-sm-12 text-muted small">
-                <i class="fa fa-info-circle blue-icon" aria-hidden="true" style="margin-right: 2px;"></i>
-                You can set a quota on the amount of external load balancers that can be created inside this resource pool. Set this quota to 0 to effectively disable the use of
-                load balancers in this resource pool.
-              </span>
-            </div>
-            <div class="form-group">
-              <div class="col-sm-12">
-                <label class="control-label text-left">
-                  Load Balancer quota
-                </label>
-                <label class="switch" style="margin-left: 20px;"> <input type="checkbox" disabled /><i></i> </label>
-                <span class="text-muted small" style="margin-left: 15px;">
-                  <i class="fa fa-user" aria-hidden="true"></i>
-                  This feature is available in <a href="https://www.portainer.io/business-upsell?from=k8s-resourcepool-lbquota" target="_blank"> Portainer Business Edition</a>.
-                </span>
-              </div>
-            </div>
-            <!-- #endregion -->
-
-            <!-- #region STORAGES -->
-            <div class="col-sm-12 form-section-title">
-              Storages
-            </div>
-
-            <div class="form-group">
-              <span class="col-sm-12 text-muted small">
-                <i class="fa fa-info-circle blue-icon" aria-hidden="true" style="margin-right: 2px;"></i>
-                Quotas can be set on each storage option to prevent users from exceeding a specific threshold when deploying applications. You can set a quota to 0 to effectively
-                prevent the usage of a specific storage option inside this resource pool.
-              </span>
-            </div>
-            <div class="col-sm-12 form-section-title">
-              <i class="fa fa-route" aria-hidden="true" style="margin-right: 2px;"></i>
-              standard
-            </div>
-            <div class="form-group">
-              <div class="col-sm-12">
-                <label class="control-label text-left">
-                  Enable quota
-                </label>
-                <label class="switch" style="margin-left: 20px;"> <input type="checkbox" disabled /><i></i> </label>
-                <span class="text-muted small" style="margin-left: 15px;">
-                  <i class="fa fa-user" aria-hidden="true"></i>
-                  This feature is available in
-                  <a href="https://www.portainer.io/business-upsell?from=k8s-resourcepool-storagequota" target="_blank"> Portainer Business Edition</a>.
-                </span>
-              </div>
-            </div>
-            <!-- #endregion -->
-
             <div ng-if="ctrl.state.canUseIngress">
               <div class="col-sm-12 form-section-title">
                 Ingresses

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

@@ -250,63 +250,6 @@
                   </div>
                   <!-- #endregion -->
                 </div>
-                <!-- #region LOAD-BALANCERS -->
-                <div class="col-sm-12 form-section-title">
-                  Load balancers
-                </div>
-
-                <div class="form-group">
-                  <span class="col-sm-12 text-muted small">
-                    <i class="fa fa-info-circle blue-icon" aria-hidden="true" style="margin-right: 2px;"></i>
-                    You can set a quota on the amount of external load balancers that can be created inside this resource pool. Set this quota to 0 to effectively disable the use
-                    of load balancers in this resource pool.
-                  </span>
-                </div>
-                <div class="form-group">
-                  <div class="col-sm-12">
-                    <label class="control-label text-left">
-                      Load Balancer quota
-                    </label>
-                    <label class="switch" style="margin-left: 20px;"> <input type="checkbox" disabled /><i></i> </label>
-                    <span class="text-muted small" style="margin-left: 15px;">
-                      <i class="fa fa-user" aria-hidden="true"></i>
-                      This feature is available in <a href="https://www.portainer.io/business-upsell?from=k8s-resourcepool-lbquota" target="_blank"> Portainer Business Edition</a>.
-                    </span>
-                  </div>
-                </div>
-                <!-- #endregion -->
-
-                <!-- #region LOAD-BALANCERS -->
-                <div class="col-sm-12 form-section-title">
-                  Storages
-                </div>
-
-                <div class="form-group">
-                  <span class="col-sm-12 text-muted small">
-                    <i class="fa fa-info-circle blue-icon" aria-hidden="true" style="margin-right: 2px;"></i>
-                    Quotas can be set on each storage option to prevent users from exceeding a specific threshold when deploying applications. You can set a quota to 0 to
-                    effectively prevent the usage of a specific storage option inside this resource pool.
-                  </span>
-                </div>
-                <div class="col-sm-12 form-section-title">
-                  <i class="fa fa-route" aria-hidden="true" style="margin-right: 2px;"></i>
-                  standard
-                </div>
-                <div class="form-group">
-                  <div class="col-sm-12">
-                    <label class="control-label text-left">
-                      Enable quota
-                    </label>
-                    <label class="switch" style="margin-left: 20px;"> <input type="checkbox" disabled /><i></i> </label>
-                    <span class="text-muted small" style="margin-left: 15px;">
-                      <i class="fa fa-user" aria-hidden="true"></i>
-                      This feature is available in
-                      <a href="https://www.portainer.io/business-upsell?from=k8s-resourcepool-storagequota" target="_blank"> Portainer Business Edition</a>.
-                    </span>
-                  </div>
-                </div>
-                <!-- #endregion -->
-
                 <!-- actions -->
                 <div ng-if="ctrl.isAdmin && ctrl.isEditable" class="col-sm-12 form-section-title">
                   Actions

app/portainer/__module.js

@@ -392,16 +392,6 @@ angular.module('portainer.app', ['portainer.oauth']).config([
       },
     };
 
-    var roles = {
-      name: 'portainer.roles',
-      url: '/roles',
-      views: {
-        'content@': {
-          templateUrl: './views/roles/roles.html',
-        },
-      },
-    };
-
     $stateRegistryProvider.register(root);
     $stateRegistryProvider.register(endpointRoot);
     $stateRegistryProvider.register(portainer);
@@ -432,7 +422,6 @@ angular.module('portainer.app', ['portainer.oauth']).config([
     $stateRegistryProvider.register(user);
     $stateRegistryProvider.register(teams);
     $stateRegistryProvider.register(team);
-    $stateRegistryProvider.register(roles);
   },
 ]);
 

app/portainer/components/accessManagement/porAccessManagement.html

@@ -28,18 +28,6 @@
             </div>
           </div>
 
-          <div class="form-group">
-            <label class="col-sm-3 col-lg-2 control-label text-left">
-              Role
-            </label>
-            <div class="col-sm-9 col-lg-4">
-              <span class="text-muted small">
-                <i class="fa fa-user" aria-hidden="true"></i>
-                This feature is available in <a href="https://www.portainer.io/business-upsell?from=k8s-rbac-access" target="_blank"> Portainer Business Edition</a>.
-              </span>
-            </div>
-          </div>
-
           <!-- actions -->
           <div class="form-group">
             <div class="col-sm-12">

app/portainer/components/datatables/access-viewer-datatable/accessViewerDatatable.html

@@ -1,26 +0,0 @@
-<div class="datatable">
-  <div class="searchBar">
-    <i class="fa fa-search searchIcon" aria-hidden="true"></i>
-    <input type="text" class="searchInput" placeholder="Search..." ng-model-options="{ debounce: 300 }" />
-  </div>
-  <div class="table-responsive">
-    <table class="table table-hover nowrap-cells">
-      <thead>
-        <tr>
-          <th>
-            Endpoint
-          </th>
-          <th>
-            Role
-          </th>
-          <th>Access origin</th>
-        </tr>
-      </thead>
-      <tbody>
-        <tr ng-if="!$ctrl.dataset">
-          <td colspan="3" class="text-center text-muted">Select a user to show associated access and role</td>
-        </tr>
-      </tbody>
-    </table>
-  </div>
-</div>

app/portainer/components/datatables/access-viewer-datatable/accessViewerDatatable.js

@@ -1,11 +0,0 @@
-angular.module('portainer.app').component('accessViewerDatatable', {
-  templateUrl: './accessViewerDatatable.html',
-  controller: 'GenericDatatableController',
-  bindings: {
-    titleText: '@',
-    titleIcon: '@',
-    tableKey: '@',
-    orderBy: '@',
-    dataset: '<',
-  },
-});

app/portainer/components/datatables/genericDatatableController.js

@@ -70,7 +70,7 @@ angular.module('portainer.app').controller('GenericDatatableController', [
         item.Checked = !item.Checked;
         this.state.firstClickedItem = item;
       }
-      this.state.selectedItems = _.uniq(_.concat(this.state.selectedItems, this.state.filteredDataSet)).filter((i) => i.Checked);
+      this.state.selectedItems = this.dataset.filter((i) => i.Checked);
       if (event && this.state.selectAll && this.state.selectedItems.length !== this.state.filteredDataSet.length) {
         this.state.selectAll = false;
       }

app/portainer/components/datatables/registries-datatable/registriesDatatable.html

@@ -66,9 +66,6 @@
               </td>
               <td>
                 <a ui-sref="portainer.registries.registry.access({id: item.Id})" ng-if="$ctrl.accessManagement"> <i class="fa fa-users" aria-hidden="true"></i> Manage access </a>
-                <span class="text-muted space-left" style="cursor: pointer;" data-toggle="tooltip" title="This feature is available in Portainer Business Edition">
-                  <i class="fa fa-search" aria-hidden="true"></i> Browse</span
-                >
               </td>
             </tr>
             <tr ng-if="!$ctrl.dataset">

app/portainer/components/datatables/roles-datatable/rolesDatatable.html

@@ -1,64 +0,0 @@
-<div class="datatable">
-  <rd-widget>
-    <rd-widget-body classes="no-padding">
-      <div class="toolBar">
-        <div class="toolBarTitle"> <i class="fa" ng-class="$ctrl.titleIcon" aria-hidden="true" style="margin-right: 2px;"></i> {{ $ctrl.titleText }} </div>
-      </div>
-      <div class="searchBar">
-        <i class="fa fa-search searchIcon" aria-hidden="true"></i>
-        <input type="text" class="searchInput" placeholder="Search..." auto-focus ng-model-options="{ debounce: 300 }" />
-      </div>
-      <div class="table-responsive">
-        <table class="table table-hover nowrap-cells">
-          <thead>
-            <tr>
-              <th>
-                Name
-              </th>
-              <th>
-                Description
-              </th>
-            </tr>
-          </thead>
-          <tbody>
-            <tr>
-              <td class="text-muted">Endpoint administrator</td>
-              <td class="text-muted">Full control of all resources in an endpoint</td>
-            </tr>
-            <tr>
-              <td class="text-muted">Helpdesk</td>
-              <td class="text-muted">Read-only access of all resources in an endpoint</td>
-            </tr>
-            <tr>
-              <td class="text-muted">Read-only user</td>
-              <td class="text-muted">Read-only access of assigned resources in an endpoint</td>
-            </tr>
-            <tr>
-              <td class="text-muted">Standard user</td>
-              <td class="text-muted">Full control of assigned resources in an endpoint</td>
-            </tr>
-          </tbody>
-        </table>
-        <div class="footer">
-          <div class="paginationControls">
-            <form class="form-inline">
-              <span class="limitSelector">
-                <span style="margin-right: 5px;">
-                  Items per page
-                </span>
-                <select class="form-control">
-                  <option value="0">All</option>
-                  <option value="10">10</option>
-                  <option value="25">25</option>
-                  <option value="50">50</option>
-                  <option value="100">100</option>
-                </select>
-              </span>
-              <dir-pagination-controls max-size="5"></dir-pagination-controls>
-            </form>
-          </div>
-        </div>
-      </div>
-    </rd-widget-body>
-  </rd-widget>
-</div>

app/portainer/components/datatables/roles-datatable/rolesDatatable.js

@@ -1,12 +0,0 @@
-angular.module('portainer.app').component('rolesDatatable', {
-  templateUrl: './rolesDatatable.html',
-  controller: 'GenericDatatableController',
-  bindings: {
-    titleText: '@',
-    titleIcon: '@',
-    dataset: '<',
-    tableKey: '@',
-    orderBy: '@',
-    reverseOrder: '<',
-  },
-});

app/portainer/services/api/endpointService.js

@@ -56,10 +56,10 @@ angular.module('portainer.app').factory('EndpointService', [
       return Endpoints.remove({ id: endpointID }).$promise;
     };
 
-    service.createLocalEndpoint = function (name = 'local') {
+    service.createLocalEndpoint = function () {
       var deferred = $q.defer();
 
-      FileUploadService.createEndpoint(name, PortainerEndpointCreationTypes.LocalDockerEnvironment, '', '', 1, [], false)
+      FileUploadService.createEndpoint('local', PortainerEndpointCreationTypes.LocalDockerEnvironment, '', '', 1, [], false)
         .then(function success(response) {
           deferred.resolve(response.data);
         })
@@ -117,10 +117,10 @@ angular.module('portainer.app').factory('EndpointService', [
       return deferred.promise;
     };
 
-    service.createLocalKubernetesEndpoint = function (name = 'local') {
+    service.createLocalKubernetesEndpoint = function () {
       var deferred = $q.defer();
 
-      FileUploadService.createEndpoint(name, PortainerEndpointCreationTypes.LocalKubernetesEnvironment, '', '', 1, [], true, true, true)
+      FileUploadService.createEndpoint('local', PortainerEndpointCreationTypes.LocalKubernetesEnvironment, '', '', 1, [], true, true, true)
         .then(function success(response) {
           deferred.resolve(response.data);
         })

app/portainer/views/endpoints/create/createEndpointController.js

@@ -19,7 +19,6 @@ angular
   ) {
     $scope.state = {
       EnvironmentType: 'agent',
-      PlatformType: 'linux',
       actionInProgress: false,
       deploymentTab: 0,
       allowCreateTag: Authentication.isAdmin(),
@@ -57,12 +56,8 @@ angular
     };
 
     $scope.copyAgentCommand = function () {
-      if ($scope.state.deploymentTab === 2 && $scope.state.PlatformType === 'linux') {
+      if ($scope.state.deploymentTab === 2) {
         clipboard.copyText('curl -L https://downloads.portainer.io/agent-stack.yml -o agent-stack.yml && docker stack deploy --compose-file=agent-stack.yml portainer-agent');
-      } else if ($scope.state.deploymentTab === 2 && $scope.state.PlatformType === 'windows') {
-        clipboard.copyText(
-          'curl -L https://downloads.portainer.io/agent-stack-windows.yml -o agent-stack.yml && docker stack deploy --compose-file=agent-stack-windows.yml portainer-agent'
-        );
       } else if ($scope.state.deploymentTab === 1) {
         clipboard.copyText('curl -L https://downloads.portainer.io/portainer-agent-k8s-nodeport.yaml -o portainer-agent-k8s.yaml; kubectl apply -f portainer-agent-k8s.yaml');
       } else {
@@ -89,72 +84,40 @@ angular
         $scope.availableTags = $scope.availableTags.concat(tag);
         $scope.formValues.TagIds = $scope.formValues.TagIds.concat(tag.Id);
       } catch (err) {
-        Notifications.error('Failure', err, 'Unable to create tag');
+        Notifications.error('Failue', err, 'Unable to create tag');
       }
     }
 
     $scope.addDockerEndpoint = function () {
-      if ($scope.formValues.ConnectSocket) {
-        var endpointName = $scope.formValues.Name;
-        $scope.state.actionInProgress = true;
-        EndpointService.createLocalEndpoint(endpointName)
-          .then(function success() {
-            Notifications.success('Endpoint created', endpointName);
-            $state.go('portainer.endpoints', {}, { reload: true });
-          })
-          .catch(function error(err) {
-            Notifications.error('Failure', err, 'Unable to create endpoint');
-          })
-          .finally(function final() {
-            $scope.state.actionInProgress = false;
-          });
-      } else {
-        var name = $scope.formValues.Name;
-        var URL = $filter('stripprotocol')($scope.formValues.URL);
-        var publicURL = $scope.formValues.PublicURL === '' ? URL.split(':')[0] : $scope.formValues.PublicURL;
-        var groupId = $scope.formValues.GroupId;
-        var tagIds = $scope.formValues.TagIds;
-
-        var securityData = $scope.formValues.SecurityFormData;
-        var TLS = securityData.TLS;
-        var TLSMode = securityData.TLSMode;
-        var TLSSkipVerify = TLS && (TLSMode === 'tls_client_noca' || TLSMode === 'tls_only');
-        var TLSSkipClientVerify = TLS && (TLSMode === 'tls_ca' || TLSMode === 'tls_only');
-        var TLSCAFile = TLSSkipVerify ? null : securityData.TLSCACert;
-        var TLSCertFile = TLSSkipClientVerify ? null : securityData.TLSCert;
-        var TLSKeyFile = TLSSkipClientVerify ? null : securityData.TLSKey;
-
-        addEndpoint(
-          name,
-          PortainerEndpointCreationTypes.LocalDockerEnvironment,
-          URL,
-          publicURL,
-          groupId,
-          tagIds,
-          TLS,
-          TLSSkipVerify,
-          TLSSkipClientVerify,
-          TLSCAFile,
-          TLSCertFile,
-          TLSKeyFile
-        );
-      }
-    };
-
-    $scope.addKubernetesEndpoint = function () {
       var name = $scope.formValues.Name;
-      $scope.state.actionInProgress = true;
-      EndpointService.createLocalKubernetesEndpoint(name)
-        .then(function success(result) {
-          Notifications.success('Endpoint created', name);
-          $state.go('portainer.endpoints.endpoint.kubernetesConfig', { id: result.Id });
-        })
-        .catch(function error(err) {
-          Notifications.error('Failure', err, 'Unable to create endpoint');
-        })
-        .finally(function final() {
-          $scope.state.actionInProgress = false;
-        });
+      var URL = $filter('stripprotocol')($scope.formValues.URL);
+      var publicURL = $scope.formValues.PublicURL === '' ? URL.split(':')[0] : $scope.formValues.PublicURL;
+      var groupId = $scope.formValues.GroupId;
+      var tagIds = $scope.formValues.TagIds;
+
+      var securityData = $scope.formValues.SecurityFormData;
+      var TLS = securityData.TLS;
+      var TLSMode = securityData.TLSMode;
+      var TLSSkipVerify = TLS && (TLSMode === 'tls_client_noca' || TLSMode === 'tls_only');
+      var TLSSkipClientVerify = TLS && (TLSMode === 'tls_ca' || TLSMode === 'tls_only');
+      var TLSCAFile = TLSSkipVerify ? null : securityData.TLSCACert;
+      var TLSCertFile = TLSSkipClientVerify ? null : securityData.TLSCert;
+      var TLSKeyFile = TLSSkipClientVerify ? null : securityData.TLSKey;
+
+      addEndpoint(
+        name,
+        PortainerEndpointCreationTypes.LocalDockerEnvironment,
+        URL,
+        publicURL,
+        groupId,
+        tagIds,
+        TLS,
+        TLSSkipVerify,
+        TLSSkipClientVerify,
+        TLSCAFile,
+        TLSCertFile,
+        TLSKeyFile
+      );
     };
 
     $scope.addAgentEndpoint = function () {

app/portainer/views/endpoints/create/createendpoint.html

@@ -44,16 +44,6 @@
                   <p>Directly connect to the Docker API</p>
                 </label>
               </div>
-              <div ng-click="resetEndpointURL()">
-                <input type="radio" id="kubernetes_endpoint" ng-model="state.EnvironmentType" value="kubernetes" />
-                <label for="kubernetes_endpoint">
-                  <div class="boxselector_header">
-                    <i class="fas fa-dharmachakra" aria-hidden="true" style="margin-right: 2px;"></i>
-                    Kubernetes
-                  </div>
-                  <p>Local Kubernetes environment</p>
-                </label>
-              </div>
               <div>
                 <input type="radio" id="azure_endpoint" ng-model="state.EnvironmentType" value="azure" />
                 <label for="azure_endpoint">
@@ -71,18 +61,10 @@
               Important notice
             </div>
             <div class="form-group">
-              <p class="col-sm-12 text-muted small">
-                You can connect Portainer to a Docker environment via socket or via TCP. You can find more information about how to expose the Docker API over TCP
-                <a href="https://docs.docker.com/engine/security/https/"> in the Docker documentation</a>.
-              </p>
-
-              <p class="col-sm-12 text-muted small">
-                When using the socket, ensure that you have started the Portainer container with the following Docker flag
-                <code> -v "/var/run/docker.sock:/var/run/docker.sock" </code>
-                (on Linux) or
-                <code> -v \.\pipe\docker_engine:\.\pipe\docker_engine </code>
-                (on Windows).
-              </p>
+              <span class="col-sm-12 text-muted small">
+                The Docker API must be exposed over TCP. You can find more information about how to expose the Docker API over TCP
+                <a href="https://docs.docker.com/engine/security/https/" target="_blank">in the Docker documentation</a>.
+              </span>
             </div>
           </div>
           <div ng-if="state.EnvironmentType === 'agent'">
@@ -92,33 +74,24 @@
             <div class="form-group">
               <span class="col-sm-12 text-muted small">
                 Ensure that you have deployed the Portainer agent in your cluster first. Refer to the platform related command below to deploy it.
-                <div class="input-group input-group-sm" style="margin-top: 10px; margin-bottom: 10px;">
-                  <div class="btn-group btn-group-sm">
-                    <label class="btn btn-primary" ng-model="state.PlatformType" uib-btn-radio="'linux'"><i class="fab fa-linux" style="margin-right: 2px;"></i> Linux</label>
-                    <label class="btn btn-primary" ng-model="state.PlatformType" uib-btn-radio="'windows'"><i class="fab fa-windows" style="margin-right: 2px;"></i> Windows</label>
-                  </div>
-                </div>
                 <div style="margin-top: 10px;">
                   <uib-tabset active="state.deploymentTab">
-                    <uib-tab index="0" ng-if="state.PlatformType === 'linux'" heading="Kubernetes via load balancer">
+                    <uib-tab index="0" heading="Kubernetes via load balancer">
                       <code style="display: block; white-space: pre-wrap; padding: 16px 90px;"
                         >curl -L https://downloads.portainer.io/portainer-agent-k8s-lb.yaml -o portainer-agent-k8s.yaml; kubectl apply -f portainer-agent-k8s.yaml</code
                       >
                     </uib-tab>
 
-                    <uib-tab index="1" ng-if="state.PlatformType === 'linux'" heading="Kubernetes via node port">
+                    <uib-tab index="1" heading="Kubernetes via node port">
                       <code style="display: block; white-space: pre-wrap; padding: 16px 90px;"
                         >curl -L https://downloads.portainer.io/portainer-agent-k8s-nodeport.yaml -o portainer-agent-k8s.yaml; kubectl apply -f portainer-agent-k8s.yaml</code
                       >
                     </uib-tab>
 
                     <uib-tab index="2" heading="Docker Swarm">
-                      <code ng-if="state.PlatformType === 'linux'" style="display: block; white-space: pre-wrap; padding: 16px 90px;"
+                      <code style="display: block; white-space: pre-wrap; padding: 16px 90px;"
                         >curl -L https://downloads.portainer.io/agent-stack.yml -o agent-stack.yml && docker stack deploy --compose-file=agent-stack.yml portainer-agent</code
                       >
-                      <code ng-if="state.PlatformType === 'windows'" style="display: block; white-space: pre-wrap; padding: 16px 90px;"
-                        >curl -L https://downloads.portainer.io/agent-stack-windows.yml -o agent-stack.yml && docker stack deploy --compose-file=agent-stack-windows.yml portainer-agent</code
-                      >
                     </uib-tab>
                   </uib-tabset>
                   <div style="margin-top: 10px;">
@@ -145,21 +118,6 @@
               </span>
             </div>
           </div>
-          <div ng-if="state.EnvironmentType === 'kubernetes'">
-            <div class="col-sm-12 form-section-title">
-              Important notice
-            </div>
-            <div class="form-group">
-              <p class="col-sm-12 text-muted small">
-                This will allow you to manage the Kubernetes environment where Portainer is running.
-              </p>
-
-              <p class="col-sm-12 text-muted small">
-                <i class="fa fa-info-circle blue-icon" aria-hidden="true" style="margin-right: 2px;"></i>
-                In order to manage a remote Kubernetes environment, please use the Agent or Edge agent options.
-              </p>
-            </div>
-          </div>
           <div ng-if="state.EnvironmentType === 'azure'">
             <div class="col-sm-12 form-section-title">
               Information
@@ -209,18 +167,8 @@
             </div>
           </div>
           <!-- !name-input -->
-          <!-- connect-via-socket-input -->
-          <div ng-if="state.EnvironmentType === 'docker'">
-            <div class="form-group" style="padding-left: 15px;">
-              <label for="connect_socket" class="col-sm_12 control-label text-left">
-                Connect via socket
-              </label>
-              <label class="switch" style="margin-left: 20px;"> <input type="checkbox" ng-model="formValues.ConnectSocket" /><i></i> </label>
-            </div>
-          </div>
-          <!-- !connect-via-socket-input -->
           <!-- endpoint-url-input -->
-          <div ng-if="(state.EnvironmentType === 'docker' && !formValues.ConnectSocket) || state.EnvironmentType === 'agent'">
+          <div ng-if="state.EnvironmentType === 'docker' || state.EnvironmentType === 'agent'">
             <div class="form-group">
               <label for="endpoint_url" class="col-sm-3 col-lg-2 control-label text-left">
                 Endpoint URL
@@ -446,17 +394,6 @@
                 <span ng-hide="state.actionInProgress"><i class="fa fa-plus" aria-hidden="true"></i> Add endpoint</span>
                 <span ng-show="state.actionInProgress">Creating endpoint...</span>
               </button>
-              <button
-                ng-if="state.EnvironmentType === 'kubernetes'"
-                type="submit"
-                class="btn btn-primary btn-sm"
-                ng-disabled="state.actionInProgress || !endpointCreationForm.$valid"
-                ng-click="addKubernetesEndpoint()"
-                button-spinner="state.actionInProgress"
-              >
-                <span ng-hide="state.actionInProgress"><i class="fa fa-plus" aria-hidden="true"></i> Add endpoint</span>
-                <span ng-show="state.actionInProgress">Creating endpoint...</span>
-              </button>
               <button
                 ng-if="state.EnvironmentType === 'azure'"
                 type="submit"

app/portainer/views/endpoints/edit/endpoint.html

@@ -33,26 +33,18 @@
       <p>
         The agent will communicate with Portainer via <u>{{ edgeKeyDetails.instanceURL }}</u> and <u>tcp://{{ edgeKeyDetails.tunnelServerAddr }}</u>
       </p>
-      <div class="input-group input-group-sm" style="margin-top: 10px; margin-bottom: 10px;">
-        <div class="btn-group btn-group-sm">
-          <label class="btn btn-primary" ng-model="state.platformType" uib-btn-radio="'linux'"><i class="fab fa-linux" style="margin-right: 2px;"></i> Linux</label>
-          <label class="btn btn-primary" ng-model="state.platformType" uib-btn-radio="'windows'"><i class="fab fa-windows" style="margin-right: 2px;"></i> Windows</label>
-        </div>
-      </div>
       <div style="margin-top: 10px;">
         <uib-tabset active="state.deploymentTab">
-          <uib-tab index="0" ng-if="state.platformType === 'linux'" heading="Kubernetes">
+          <uib-tab index="0" heading="Kubernetes">
             <code style="display: block; white-space: pre-wrap; padding: 16px 90px;"
               >curl https://downloads.portainer.io/portainer-edge-agent-setup.sh | sudo bash -s -- {{ randomEdgeID }} {{ endpoint.EdgeKey }}</code
             >
           </uib-tab>
           <uib-tab index="1" heading="Docker Swarm">
-            <code ng-if="state.platformType === 'linux'" style="display: block; white-space: pre-wrap; padding: 16px 90px;">{{ dockerCommands.linuxSwarm }}</code>
-            <code ng-if="state.platformType === 'windows'" style="display: block; white-space: pre-wrap; padding: 16px 90px;">{{ dockerCommands.windowsSwarm }}</code>
+            <code style="display: block; white-space: pre-wrap; padding: 16px 90px;">{{ dockerCommands.swarm }}</code>
           </uib-tab>
           <uib-tab index="2" heading="Docker Standalone">
-            <code ng-if="state.platformType === 'linux'" style="display: block; white-space: pre-wrap; padding: 16px 90px;">{{ dockerCommands.linuxStandalone }}</code>
-            <code ng-if="state.platformType === 'windows'" style="display: block; white-space: pre-wrap; padding: 16px 90px;">{{ dockerCommands.windowsStandalone }}</code>
+            <code style="display: block; white-space: pre-wrap; padding: 16px 90px;">{{ dockerCommands.standalone }}</code>
           </uib-tab>
         </uib-tabset>
         <div style="margin-top: 10px;">

app/portainer/views/endpoints/edit/endpointController.js

@@ -29,7 +29,6 @@ angular
       kubernetesEndpoint: false,
       agentEndpoint: false,
       edgeEndpoint: false,
-      platformType: 'linux',
       allowCreate: Authentication.isAdmin(),
       availableEdgeAgentCheckinOptions: [
         { key: 'Use default interval', value: 0 },
@@ -56,23 +55,15 @@ angular
     };
 
     $scope.copyEdgeAgentDeploymentCommand = function () {
-      if ($scope.state.deploymentTab === 2 && $scope.state.platformType === 'linux') {
+      if ($scope.state.deploymentTab === 2) {
         clipboard.copyText(
-          'docker run -d -v /var/run/docker.sock:/var/run/docker.sock -v /var/lib/docker/volumes:/var/lib/docker/volumes -v /:/host -v portainer_agent_data:/data --restart always -e EDGE=1 -e EDGE_ID=' +
+          'docker run -d -v /var/run/docker.sock:/var/run/docker.sock -v /var/lib/docker/volumes:/var/lib/docker/volumes -v /:/host --restart always -e EDGE=1 -e EDGE_ID=' +
             $scope.randomEdgeID +
             ' -e EDGE_KEY=' +
             $scope.endpoint.EdgeKey +
-            ' -e CAP_HOST_MANAGEMENT=1 --name portainer_edge_agent portainer/agent'
+            ' -e CAP_HOST_MANAGEMENT=1 -v portainer_agent_data:/data --name portainer_edge_agent portainer/agent'
         );
-      } else if ($scope.state.deploymentTab === 2 && $scope.state.platformType === 'windows') {
-        clipboard.copyText(
-          'docker run -d --mount type=npipe,src=\\\\.\\pipe\\docker_engine,dst=\\\\.\\pipe\\docker_engine --mount type=bind,src=C:\\ProgramData\\docker\\volumes,dst=C:\\ProgramData\\docker\\volumes --mount type=volume,src=portainer_agent_data,dst=C:\\data -e EDGE=1 -e EDGE_ID=' +
-            $scope.randomEdgeID +
-            ' -e EDGE_KEY=' +
-            $scope.endpoint.EdgeKey +
-            ' -e CAP_HOST_MANAGEMENT=1 --name portainer_edge_agent portainer/agent'
-        );
-      } else if ($scope.state.deploymentTab === 1 && $scope.state.platformType === 'linux') {
+      } else if ($scope.state.deploymentTab === 1) {
         clipboard.copyText(
           'docker network create --driver overlay portainer_agent_network; docker service create --name portainer_edge_agent --network portainer_agent_network -e AGENT_CLUSTER_ADDR=tasks.portainer_edge_agent -e EDGE=1 -e EDGE_ID=' +
             $scope.randomEdgeID +
@@ -80,14 +71,6 @@ angular
             $scope.endpoint.EdgeKey +
             " -e CAP_HOST_MANAGEMENT=1 --mode global --constraint 'node.platform.os == linux' --mount type=bind,src=//var/run/docker.sock,dst=/var/run/docker.sock --mount type=bind,src=//var/lib/docker/volumes,dst=/var/lib/docker/volumes --mount type=bind,src=//,dst=/host --mount type=volume,src=portainer_agent_data,dst=/data portainer/agent"
         );
-      } else if ($scope.state.deploymentTab === 1 && $scope.state.platformType === 'windows') {
-        clipboard.copyText(
-          'docker network create --driver overlay portainer_edge_agent_network && docker service create --name portainer_edge_agent --network portainer_edge_agent_network -e AGENT_CLUSTER_ADDR=tasks.portainer_edge_agent -e EDGE=1 -e EDGE_ID=' +
-            $scope.randomEdgeID +
-            ' -e EDGE_KEY=' +
-            $scope.endpoint.EdgeKey +
-            ' -e CAP_HOST_MANAGEMENT=1 --mode global --constraint node.platform.os==windows --mount type=npipe,src=\\\\.\\pipe\\docker_engine,dst=\\\\.\\pipe\\docker_engine --mount type=bind,src=C:\\ProgramData\\docker\\volumes,dst=C:\\ProgramData\\docker\\volumes --mount type=volume,src=portainer_agent_data,dst=C:\\data portainer/agent'
-        );
       } else {
         clipboard.copyText('curl https://downloads.portainer.io/portainer-edge-agent-setup.sh | bash -s -- ' + $scope.randomEdgeID + ' ' + $scope.endpoint.EdgeKey);
       }
@@ -223,10 +206,8 @@ angular
             $scope.edgeKeyDetails = decodeEdgeKey(endpoint.EdgeKey);
             $scope.randomEdgeID = uuidv4();
             $scope.dockerCommands = {
-              linuxStandalone: buildLinuxStandaloneCommand($scope.randomEdgeID, endpoint.EdgeKey),
-              windowsStandalone: buildWindowsStandaloneCommand($scope.randomEdgeID, endpoint.EdgeKey),
-              linuxSwarm: buildLinuxSwarmCommand($scope.randomEdgeID, endpoint.EdgeKey),
-              windowsSwarm: buildWindowsSwarmCommand($scope.randomEdgeID, endpoint.EdgeKey),
+              standalone: buildStandaloneCommand($scope.randomEdgeID, endpoint.EdgeKey),
+              swarm: buildSwarmCommand($scope.randomEdgeID, endpoint.EdgeKey),
             };
 
             const settings = data.settings;
@@ -242,36 +223,21 @@ angular
         });
     }
 
-    function buildLinuxStandaloneCommand(edgeId, edgeKey) {
-      return `docker run -d \\
-  -v /var/run/docker.sock:/var/run/docker.sock \\
+    function buildStandaloneCommand(edgeId, edgeKey) {
+      return `docker run -d -v /var/run/docker.sock:/var/run/docker.sock \\
   -v /var/lib/docker/volumes:/var/lib/docker/volumes \\
   -v /:/host \\
+  --restart always \\
+  -e EDGE=1 \\
+  -e EDGE_ID=${edgeId} \\
+  -e EDGE_KEY=${edgeKey} \\
+  -e CAP_HOST_MANAGEMENT=1 \\
   -v portainer_agent_data:/data \\
-  --restart always \\
-  -e EDGE=1 \\
-  -e EDGE_ID=${edgeId} \\
-  -e EDGE_KEY=${edgeKey} \\
-  -e CAP_HOST_MANAGEMENT=1 \\
-  --name portainer_edge_agent \\localhost
-  portainer/agent`;
-    }
-
-    function buildWindowsStandaloneCommand(edgeId, edgeKey) {
-      return `docker run -d \\
-  --mount type=npipe,src=\\\\.\\pipe\\docker_engine,dst=\\\\.\\pipe\\docker_engine \\
-  --mount type=bind,src=C:\\ProgramData\\docker\\volumes,dst=C:\\ProgramData\\docker\\volumes \\
-  --mount type=volume,src=portainer_agent_data,dst=C:\\data \\
-  --restart always \\
-  -e EDGE=1 \\
-  -e EDGE_ID=${edgeId} \\
-  -e EDGE_KEY=${edgeKey} \\
-  -e CAP_HOST_MANAGEMENT=1 \\
   --name portainer_edge_agent \\
   portainer/agent`;
     }
 
-    function buildLinuxSwarmCommand(edgeId, edgeKey) {
+    function buildSwarmCommand(edgeId, edgeKey) {
       return `docker network create \\
   --driver overlay \\
   portainer_agent_network;
@@ -293,25 +259,5 @@ docker service create \\
   portainer/agent`;
     }
 
-    function buildWindowsSwarmCommand(edgeId, edgeKey) {
-      return `docker network create \\
-  --driver overlay \\
-  portainer_edge_agent_network && \\
-docker service create \\
-  --name portainer_edge_agent \\
-  --network portainer_edge_agent_network \\
-  -e AGENT_CLUSTER_ADDR=tasks.portainer_edge_agent \\
-  -e EDGE=1 \\
-  -e EDGE_ID=${edgeId} \\
-  -e EDGE_KEY=${edgeKey} \\
-  -e CAP_HOST_MANAGEMENT=1 \\
-  --mode global \\
-  --constraint node.platform.os==windows \\
-  --mount type=npipe,src=\\\\.\\pipe\\docker_engine,dst=\\\\.\\pipe\\docker_engine \\
-  --mount type=bind,src=C:\\ProgramData\\docker\\volumes,dst=C:\\ProgramData\\docker\\volumes \\
-  --mount type=volume,src=portainer_agent_data,dst=C:\\data \\
-  portainer/agent`;
-    }
-
     initView();
   });

app/portainer/views/home/home.html

@@ -30,17 +30,6 @@
   <i class="fa fa-cog fa-spin" style="margin-left: 5px;"></i>
 </div>
 
-<information-panel ng-if="isAdmin && endpoints.length === 0" title-text="Information">
-  <span class="small text-muted">
-    <p>
-      <i class="fa fa-exclamation-circle orange-icon" aria-hidden="true" style="margin-right: 2px;"></i>
-      No environment available for management. Please head over the
-      <a ui-sref="portainer.endpoints.new"> endpoints view </a>
-      to add an endpoint.
-    </p>
-  </span>
-</information-panel>
-
 <div class="row" ng-if="!state.connectingToEdgeEndpoint">
   <div class="col-sm-12">
     <endpoint-list

app/portainer/views/init/endpoint/initEndpoint.html

@@ -62,9 +62,6 @@
                   <span ng-hide="ctrl.state.actionInProgress"><i class="fa fa-bolt" aria-hidden="true"></i> Connect</span>
                   <span ng-show="ctrl.state.actionInProgress">Connecting...</span>
                 </button>
-                <button type="submit" class="btn btn-sm btn-default" ng-click="ctrl.skipEndpointCreation()" button-spinner="ctrl.state.actionInProgress">
-                  <span ng-hide="ctrl.state.actionInProgress"><i class="fa fa-share" aria-hidden="true"></i> Skip</span>
-                </button>
               </div>
             </div>
             <!-- !actions -->

app/portainer/views/init/endpoint/initEndpointController.js

@@ -61,14 +61,10 @@ class InitEndpointController {
       case PortainerEndpointConnectionTypes.AGENT:
         return this.createAgentEndpoint();
       default:
-        this.Notifications.error('Failure', 'Unable to determine which action to do to create endpoint');
+        this.Notifications.error('Failure', 'Unable to determine which action to do');
     }
   }
 
-  skipEndpointCreation() {
-    this.$state.go('portainer.home');
-  }
-
   /**
    * DOCKER_LOCAL (1)
    */

app/portainer/views/roles/roles.html

@@ -1,56 +0,0 @@
-<rd-header>
-  <rd-header-title title-text="Roles">
-    <a data-toggle="tooltip" title="Refresh" ui-sref="portainer.roles" ui-sref-opts="{reload: true}">
-      <i class="fa fa-sync" aria-hidden="true"></i>
-    </a>
-  </rd-header-title>
-  <rd-header-content>Role management</rd-header-content>
-</rd-header>
-
-<information-panel title-text="Information">
-  <span class="small">
-    <p class="text-muted">
-      <i class="fa fa-user" aria-hidden="true" style="margin-right: 2px;"></i>
-      This feature is available in <a href="https://www.portainer.io/business-upsell?from=k8s-rbac-roles" target="_blank">Portainer Business Edition</a>.
-    </p>
-  </span>
-</information-panel>
-
-<div class="row">
-  <div class="col-sm-12">
-    <roles-datatable title-text="Roles" title-icon="fa-file-code" table-key="roles" order-by="Name"></roles-datatable>
-  </div>
-</div>
-
-<div class="row">
-  <div class="col-sm-12" style="margin-bottom: 0px;">
-    <rd-widget>
-      <rd-widget-header icon="fa-user-lock" title-text="Effective access viewer"></rd-widget-header>
-      <rd-widget-body>
-        <form class="form-horizontal">
-          <div class="col-sm-12 form-section-title">
-            User
-          </div>
-          <div class="form-group">
-            <div class="col-sm-12">
-              <span class="small text-muted">
-                No user available
-              </span>
-            </div>
-          </div>
-
-          <div class="col-sm-12 form-section-title">
-            Access
-          </div>
-          <div>
-            <div class="small text-muted" style="margin-bottom: 15px;">
-              <i class="fa fa-info-circle blue-icon" aria-hidden="true" style="margin-right: 2px;"></i>
-              Effective role for each endpoint will be displayed for the selected user
-            </div>
-          </div>
-          <access-viewer-datatable table-key="access_viewer" order-by="EndpointName"> </access-viewer-datatable>
-        </form>
-      </rd-widget-body>
-    </rd-widget>
-  </div>
-</div>

app/portainer/views/settings/authentication/settingsAuthentication.html

@@ -366,57 +366,6 @@
             <!-- !group-search-settings -->
           </div>
 
-          <div ng-if="isOauthEnabled()">
-            <div class="col-sm-12 form-section-title">
-              Provider
-            </div>
-            <div class="form-group"></div>
-            <div class="form-group" style="margin-bottom: 0;">
-              <div class="boxselector_wrapper">
-                <div data-toggle="tooltip" title="This feature is available in Portainer Business Edition" style="color: #767676;">
-                  <input type="radio" id="microsoft" disabled />
-                  <label for="microsoft" style="cursor: pointer; border-color: #767676;">
-                    <div class="boxselector_header">
-                      <i class="fab fa-microsoft" aria-hidden="true" style="margin-right: 2px;"></i>
-                      Microsoft
-                    </div>
-                    <p>Microsoft OAuth provider</p>
-                  </label>
-                </div>
-                <div data-toggle="tooltip" title="This feature is available in Portainer Business Edition" style="color: #767676;">
-                  <input type="radio" id="google" disabled />
-                  <label for="google" style="cursor: pointer; border-color: #767676;">
-                    <div class="boxselector_header">
-                      <i class="fab fa-google" aria-hidden="true" style="margin-right: 2px;"></i>
-                      Google
-                    </div>
-                    <p>Google OAuth provider</p>
-                  </label>
-                </div>
-                <div data-toggle="tooltip" title="This feature is available in Portainer Business Edition" style="color: #767676;">
-                  <input type="radio" id="registry_auth" disabled />
-                  <label for="Github" style="cursor: pointer; border-color: #767676;">
-                    <div class="boxselector_header">
-                      <i class="fab fa-github" aria-hidden="true" style="margin-right: 2px;"></i>
-                      Github
-                    </div>
-                    <p>Github OAuth provider</p>
-                  </label>
-                </div>
-                <div>
-                  <input type="radio" id="custom" ng-model="settings.AuthenticationMethod" ng-value="3" />
-                  <label for="custom">
-                    <div class="boxselector_header">
-                      <i class="fa fa-user-check" aria-hidden="true" style="margin-right: 2px;"></i>
-                      Custom
-                    </div>
-                    <p>Custom OAuth provider</p>
-                  </label>
-                </div>
-              </div>
-            </div>
-          </div>
-
           <oauth-settings ng-if="isOauthEnabled()" settings="OAuthSettings" teams="teams"></oauth-settings>
 
           <!-- actions -->

app/portainer/views/sidebar/sidebar.html

@@ -120,32 +120,14 @@
             ($state.current.name === 'portainer.users' ||
               $state.current.name === 'portainer.users.user' ||
               $state.current.name === 'portainer.teams' ||
-              $state.current.name === 'portainer.teams.team' ||
-              $state.current.name === 'portainer.roles')
+              $state.current.name === 'portainer.teams.team')
           "
         >
           <a ui-sref="portainer.teams" ui-sref-active="active">Teams</a>
         </div>
-        <div
-          class="sidebar-sublist"
-          ng-if="
-            toggle &&
-            ($state.current.name === 'portainer.users' ||
-              $state.current.name === 'portainer.users.user' ||
-              $state.current.name === 'portainer.teams' ||
-              $state.current.name === 'portainer.teams.team' ||
-              $state.current.name === 'portainer.roles')
-          "
-        >
-          <a ui-sref="portainer.roles" ui-sref-active="active">Roles</a>
-        </div>
       </li>
       <li class="sidebar-list" ng-if="isAdmin">
-        <a
-          ui-sref="portainer.endpoints"
-          ng-class="{ active: $state.current.name.includes('portainer.endpoints') && $state.current.name !== 'portainer.endpoints.endpoint.kubernetesConfig' }"
-          >Endpoints <span class="menu-icon fa fa-plug fa-fw"></span
-        ></a>
+        <a ui-sref="portainer.endpoints" ui-sref-active="active">Endpoints <span class="menu-icon fa fa-plug fa-fw"></span></a>
         <div
           class="sidebar-sublist"
           ng-if="
@@ -154,6 +136,7 @@
               $state.current.name === 'portainer.endpoints.endpoint' ||
               $state.current.name === 'portainer.endpoints.new' ||
               $state.current.name === 'portainer.endpoints.endpoint.access' ||
+              $state.current.name === 'portainer.endpoints.endpoint.kubernetesConfig' ||
               $state.current.name === 'portainer.groups' ||
               $state.current.name === 'portainer.groups.group' ||
               $state.current.name === 'portainer.groups.group.access' ||
@@ -171,6 +154,7 @@
               $state.current.name === 'portainer.endpoints.endpoint' ||
               $state.current.name === 'portainer.endpoints.new' ||
               $state.current.name === 'portainer.endpoints.endpoint.access' ||
+              $state.current.name === 'portainer.endpoints.endpoint.kubernetesConfig' ||
               $state.current.name === 'portainer.groups' ||
               $state.current.name === 'portainer.groups.group' ||
               $state.current.name === 'portainer.groups.group.access' ||

app/portainer/views/stacks/edit/stack.html

@@ -89,7 +89,7 @@
           </uib-tab>
           <!-- !tab-info -->
           <!-- tab-file -->
-          <uib-tab index="1" select="showEditor()">
+          <uib-tab index="1" ng-if="stackFileContent" select="showEditor()">
             <uib-tab-heading> <i class="fa fa-pencil-alt space-right" aria-hidden="true"></i> Editor </uib-tab-heading>
             <form class="form-horizontal" ng-if="state.showEditorTab" style="margin-top: 10px;">
               <div class="form-group">
@@ -165,7 +165,7 @@
                     <button
                       type="button"
                       class="btn btn-sm btn-primary"
-                      ng-disabled="state.actionInProgress || stack.Status === 2 || !stackFileContent"
+                      ng-disabled="state.actionInProgress || stack.Status === 2"
                       ng-click="deployStack()"
                       button-spinner="state.actionInProgress"
                     >

build/download_docker_compose_binary.ps1

@@ -1,7 +0,0 @@
-param (
-  [string]$docker_compose_version
-)
-
-$ErrorActionPreference = "Stop";
-
-Invoke-WebRequest -O "dist/docker-compose.exe" "https://github.com/docker/compose/releases/download/$($docker_compose_version)/docker-compose-Windows-x86_64.exe"

build/download_docker_compose_binary.sh

@@ -1,15 +0,0 @@
-#!/usr/bin/env bash
-
-PLATFORM=$1
-ARCH=$2
-DOCKER_COMPOSE_VERSION=$3
-
-if [ "${PLATFORM}" == 'win' ]; then
-  wget -O "dist/docker-compose.exe" "https://github.com/docker/compose/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose-Windows-x86_64.exe"
-elif [ "${PLATFORM}" == 'linux' ] && [ "${ARCH}" == 'amd64' ]; then
-  wget -O "dist/docker-compose" "https://github.com/portainer/docker-compose-linux-amd64-static-binary/releases/download/${DOCKER_COMPOSE_VERSION}/docker-compose"
-  chmod +x "dist/docker-compose"
-fi
-
-exit 0
-

docker-compose.pull-dog.yml

@@ -12,48 +12,5 @@ services:
       - /var/run/docker.sock:/var/run/docker.sock
       - portainer_data:/data
 
-  swarm:
-    image: docker:dind
-    privileged: true
-    restart: always
-    volumes:
-      - /tmp/manager_run:/var/run
-
-  swarm-init:
-    image: docker:dind
-    privileged: true
-    command:
-      - /bin/sh
-      - -c
-      - |
-        apk add curl
-        curl -L https://raw.githubusercontent.com/eficode/wait-for/master/wait-for -o /bin/wait-for
-        chmod +x /bin/wait-for
-        wait-for swarm:2376 -- docker -H unix://swarm/run/docker.sock swarm init
-        docker -H unix://swarm/run/docker.sock swarm init
-        docker -H unix://swarm/run/docker.sock network create --driver overlay portainer_agent_network
-        docker -H unix://swarm/run/docker.sock service create -q --name portainer_agent --network portainer_agent_network --publish mode=host,target=9001,published=9001 -e AGENT_CLUSTER_ADDR=tasks.portainer_agent --mode global --mount type=bind,src=//var/run/docker.sock,dst=/var/run/docker.sock --mount type=bind,src=//var/lib/docker/volumes,dst=/var/lib/docker/volumes --mount type=bind,src=/,dst=/host portainer/agent
-    depends_on:
-      - swarm
-    volumes:
-      - /tmp/manager_run:/swarm/run
-
-  kube:
-    image: portainer/kube-tools:latest
-    privileged: true
-    command:
-      - /bin/bash
-      - -c
-      - |
-        service docker start
-        sleep 3
-        kind create cluster --config=/kind.yaml
-        curl -L https://raw.githubusercontent.com/portainer/k8s/master/deploy/manifests/agent/portainer-agent-k8s-nodeport.yaml -o portainer-agent.yaml
-        kubectl apply -f portainer-agent.yaml
-        tail -f /dev/null
-    volumes:
-      - docker_data:/var/lib/docker
-
 volumes:
-  docker_data:
   portainer_data:

gruntfile.js

@@ -19,8 +19,7 @@ module.exports = function (grunt) {
     binaries: {
       dockerLinuxVersion: '18.09.3',
       dockerWindowsVersion: '17.09.0-ce',
-      dockerComposeVersion: '1.27.4',
-      komposeVersion: 'v1.22.0',
+      komposeVersion: 'v1.21.0',
       kubectlVersion: 'v1.18.0',
     },
     config: gruntfile_cfg.config,
@@ -38,7 +37,6 @@ module.exports = function (grunt) {
   grunt.registerTask('build:server', [
     'shell:build_binary:linux:' + arch,
     'shell:download_docker_binary:linux:' + arch,
-    'shell:download_docker_compose_binary:linux:' + arch,
     'shell:download_kompose_binary:linux:' + arch,
     'shell:download_kubectl_binary:linux:' + arch,
   ]);
@@ -65,7 +63,6 @@ module.exports = function (grunt) {
       'copy:assets',
       'shell:build_binary:' + p + ':' + a,
       'shell:download_docker_binary:' + p + ':' + a,
-      'shell:download_docker_compose_binary:' + p + ':' + a,
       'shell:download_kompose_binary:' + p + ':' + a,
       'shell:download_kubectl_binary:' + p + ':' + a,
       'webpack:prod',
@@ -80,7 +77,6 @@ module.exports = function (grunt) {
       'copy:assets',
       'shell:build_binary_azuredevops:' + p + ':' + a,
       'shell:download_docker_binary:' + p + ':' + a,
-      'shell:download_docker_compose_binary:' + p + ':' + a,
       'shell:download_kompose_binary:' + p + ':' + a,
       'shell:download_kubectl_binary:' + p + ':' + a,
       'webpack:prod',
@@ -142,7 +138,6 @@ gruntfile_cfg.shell = {
   download_docker_binary: { command: shell_download_docker_binary },
   download_kompose_binary: { command: shell_download_kompose_binary },
   download_kubectl_binary: { command: shell_download_kubectl_binary },
-  download_docker_compose_binary: { command: shell_download_docker_compose_binary },
   run_container: { command: shell_run_container },
   run_localserver: { command: shell_run_localserver, options: { async: true } },
   install_yarndeps: { command: shell_install_yarndeps },
@@ -209,33 +204,6 @@ function shell_download_docker_binary(p, a) {
   }
 }
 
-function shell_download_docker_compose_binary(p, a) {
-  var ps = { windows: 'win', darwin: 'mac' };
-  var as = { amd64: 'x86_64', arm: 'armhf', arm64: 'aarch64' };
-  var ip = ps[p] === undefined ? p : ps[p];
-  var ia = as[a] === undefined ? a : as[a];
-  var binaryVersion = '<%= binaries.dockerComposeVersion %>';
-
-  if (p === 'linux' || p === 'mac') {
-    return [
-      'if [ -f dist/docker ]; then',
-      'echo "Docker Compose binary exists";',
-      'else',
-      'build/download_docker_compose_binary.sh ' + ip + ' ' + ia + ' ' + binaryVersion + ';',
-      'fi',
-    ].join(' ');
-  } else {
-    return [
-      'powershell -Command "& {if (Test-Path -Path "dist/docker-compose.exe") {',
-      'Write-Host "Skipping download, Docker Compose binary exists"',
-      'return',
-      '} else {',
-      '& ".\\build\\download_docker_compose_binary.ps1" -docker_compose_version ' + binaryVersion + '',
-      '}}"',
-    ].join(' ');
-  }
-}
-
 function shell_download_kompose_binary(p, a) {
   var binaryVersion = '<%= binaries.komposeVersion %>';
 

webpack/webpack.develop.js

@@ -4,6 +4,7 @@ const commonConfig = require('./webpack.common.js');
 
 module.exports = webpackMerge(commonConfig, {
   mode: 'development',
+  devtool: 'source-map',
   module: {
     rules: [
       {