diff --git a/app/kubernetes/views/resource-pools/edit/components/ingresses-datatable/controller.js b/app/kubernetes/views/resource-pools/edit/components/ingresses-datatable/controller.js deleted file mode 100644 index 158b03dc5..000000000 --- a/app/kubernetes/views/resource-pools/edit/components/ingresses-datatable/controller.js +++ /dev/null @@ -1,74 +0,0 @@ -import _ from 'lodash-es'; - -angular.module('portainer.kubernetes').controller('KubernetesResourcePoolIngressesDatatableController', function ($scope, $controller, DatatableService) { - angular.extend(this, $controller('GenericDatatableController', { $scope: $scope })); - this.state = Object.assign(this.state, { - expandedItems: [], - expandAll: false, - }); - - this.onSettingsRepeaterChange = function () { - DatatableService.setDataTableSettings(this.tableKey, this.settings); - }; - - this.expandItem = function (item, expanded) { - if (!this.itemCanExpand(item)) { - return; - } - - item.Expanded = expanded; - if (!expanded) { - item.Highlighted = false; - } - }; - - this.itemCanExpand = function (item) { - return item.Paths.length > 0; - }; - - this.hasExpandableItems = function () { - return _.filter(this.state.filteredDataSet, (item) => this.itemCanExpand(item)).length; - }; - - this.expandAll = function () { - this.state.expandAll = !this.state.expandAll; - _.forEach(this.state.filteredDataSet, (item) => { - if (this.itemCanExpand(item)) { - this.expandItem(item, this.state.expandAll); - } - }); - }; - - this.$onInit = function () { - this.setDefaults(); - this.prepareTableFromDataset(); - - this.state.orderBy = this.orderBy; - var storedOrder = DatatableService.getDataTableOrder(this.tableKey); - if (storedOrder !== null) { - this.state.reverseOrder = storedOrder.reverse; - this.state.orderBy = storedOrder.orderBy; - } - - var textFilter = DatatableService.getDataTableTextFilters(this.tableKey); - if (textFilter !== null) { - this.state.textFilter = textFilter; - this.onTextFilterChange(); - } - - var storedFilters = DatatableService.getDataTableFilters(this.tableKey); - if (storedFilters !== null) { - this.filters = storedFilters; - } - if (this.filters && this.filters.state) { - this.filters.state.open = false; - } - - var storedSettings = DatatableService.getDataTableSettings(this.tableKey); - if (storedSettings !== null) { - this.settings = storedSettings; - this.settings.open = false; - } - this.onSettingsRepeaterChange(); - }; -}); diff --git a/app/kubernetes/views/resource-pools/edit/components/ingresses-datatable/index.js b/app/kubernetes/views/resource-pools/edit/components/ingresses-datatable/index.js deleted file mode 100644 index 5dd88317f..000000000 --- a/app/kubernetes/views/resource-pools/edit/components/ingresses-datatable/index.js +++ /dev/null @@ -1,13 +0,0 @@ -angular.module('portainer.kubernetes').component('kubernetesResourcePoolIngressesDatatable', { - templateUrl: './template.html', - controller: 'KubernetesResourcePoolIngressesDatatableController', - bindings: { - titleText: '@', - titleIcon: '@', - dataset: '<', - tableKey: '@', - orderBy: '@', - reverseOrder: '<', - refreshCallback: '<', - }, -}); diff --git a/app/kubernetes/views/resource-pools/edit/components/ingresses-datatable/template.html b/app/kubernetes/views/resource-pools/edit/components/ingresses-datatable/template.html deleted file mode 100644 index b36cb7a43..000000000 --- a/app/kubernetes/views/resource-pools/edit/components/ingresses-datatable/template.html +++ /dev/null @@ -1,142 +0,0 @@ -
- - -
-
-
- -
- - {{ $ctrl.titleText }} -
- -
- - - - -
-
-
- - - - - - - - - - - - - - - - - - - - - - - -
-
- - -
-
- -
-
- - -
-
{{ item.Name }}{{ item.size }}
- - {{ path.Host ? path.Host : path.IP }}{{ path.Path }} - - - - {{ path.ApplicationName }} - - unused -
Loading...
No ingresses available.
-
- -
-
-
diff --git a/app/kubernetes/views/resource-pools/edit/resourcePool.html b/app/kubernetes/views/resource-pools/edit/resourcePool.html index 5e19bf4e5..eb77d2ffb 100644 --- a/app/kubernetes/views/resource-pools/edit/resourcePool.html +++ b/app/kubernetes/views/resource-pools/edit/resourcePool.html @@ -323,19 +323,4 @@ - -
-
- - -
-
diff --git a/app/kubernetes/views/resource-pools/edit/resourcePoolController.js b/app/kubernetes/views/resource-pools/edit/resourcePoolController.js index f72f88c48..7f2ccc1ed 100644 --- a/app/kubernetes/views/resource-pools/edit/resourcePoolController.js +++ b/app/kubernetes/views/resource-pools/edit/resourcePoolController.js @@ -6,8 +6,7 @@ import KubernetesResourceReservationHelper from 'Kubernetes/helpers/resourceRese import { KubernetesResourceReservation } from 'Kubernetes/models/resource-reservation/models'; import KubernetesEventHelper from 'Kubernetes/helpers/eventHelper'; -import { KubernetesResourcePoolFormValues, KubernetesResourcePoolIngressClassHostFormValue } from 'Kubernetes/models/resource-pool/formValues'; -import { KubernetesIngressConverter } from 'Kubernetes/ingress/converter'; +import { KubernetesResourcePoolFormValues } from 'Kubernetes/models/resource-pool/formValues'; import { KubernetesFormValidationReferences } from 'Kubernetes/models/application/formValues'; import { KubernetesIngressClassTypes } from 'Kubernetes/ingress/constants'; import KubernetesResourceQuotaConverter from 'Kubernetes/converters/resourceQuota'; @@ -269,30 +268,6 @@ class KubernetesResourcePoolController { } /* #endregion */ - /* #region GET INGRESSES */ - getIngresses() { - return this.$async(async () => { - this.state.ingressesLoading = true; - try { - const namespace = this.pool.Namespace.Name; - this.allIngresses = await this.KubernetesIngressService.get(this.state.hasWriteAuthorization ? '' : namespace); - this.ingresses = _.filter(this.allIngresses, { Namespace: namespace }); - _.forEach(this.ingresses, (ing) => { - ing.Namespace = namespace; - _.forEach(ing.Paths, (path) => { - const application = _.find(this.applications, { ServiceName: path.ServiceName }); - path.ApplicationName = application && application.Name ? application.Name : '-'; - }); - }); - } catch (err) { - this.Notifications.error('Failure', err, 'Unable to retrieve ingresses.'); - } finally { - this.state.ingressesLoading = false; - } - }); - } - /* #endregion */ - /* #region GET REGISTRIES */ getRegistries() { return this.$async(async () => { @@ -359,7 +334,6 @@ class KubernetesResourcePoolController { ingressesLoading: true, viewReady: false, eventWarningCount: 0, - canUseIngress: false, useServerMetrics: this.endpoint.Kubernetes.Configuration.UseServerMetrics, duplicates: { ingressHosts: new KubernetesFormValidationReferences(), @@ -407,17 +381,6 @@ class KubernetesResourcePoolController { await this.getEvents(); await this.getApplications(); - if (this.state.canUseIngress) { - await this.getIngresses(); - const ingressClasses = this.endpoint.Kubernetes.Configuration.IngressClasses; - this.formValues.IngressClasses = KubernetesIngressConverter.ingressClassesToFormValues(ingressClasses, this.ingresses); - _.forEach(this.formValues.IngressClasses, (ic) => { - if (ic.Hosts.length === 0) { - ic.Hosts.push(new KubernetesResourcePoolIngressClassHostFormValue()); - } - }); - } - await this.getRegistries(); this.savedFormValues = angular.copy(this.formValues);