mirror of
https://github.com/portainer/portainer.git
synced 2025-07-19 05:19:39 +02:00
* feat(helm): add helm chart backport to ce EE-1409 (#5425) * EE-1311 Helm Chart Backport from EE * backport to ce Co-authored-by: Matt Hook <hookenz@gmail.com> * feat(helm): list and configure helm chart (#5431) * backport and tidyup code * --amend * using rocket icon for charts * helm chart bugfix - clear category button * added matomo analytics for helm chart install * fix web editor exit warning without changes * editor modified exit bugfix * fixed notifications typo * updated helm template text * helper text to convey slow helm templates load Co-authored-by: zees-dev <dev.786zshan@gmail.com> * removing redundant time-consuming api call by using prop attribute * feat(helm) helm chart backport from ee EE-1311 (#5436) * Add missing defaultHelmRepoUrl and mock testing * Backport EE-1477 * Backport updates to helm tests from EE * add https by default changes and ssl to tls renaming from EE * Port install integration test. Disabled by default to pass CI checks * merged changes from EE for the integration test * kube proxy whitelist updated to support internal helm install command Co-authored-by: zees-dev <dev.786zshan@gmail.com> * Pull in all changes from tech review in EE-943 * added helm to sidebar after rebase, sync CE with EE * bugfix: kubectl shell not opening - bearer token bug * tidy go modules & remove yarn-error.log * removed redundant handler (not used) - to match EE * resolved merge conflicts, updated code * feat(helm/views): helm release and application views EE-1236 (#5529) * feat(helm): add helm chart backport to ce EE-1409 (#5425) * EE-1311 Helm Chart Backport from EE * backport to ce Co-authored-by: Matt Hook <hookenz@gmail.com> * Pull in all changes from tech review in EE-943 * added helm to sidebar after rebase, sync CE with EE * removed redundant handler (not used) - to match EE * feat(helm) display helm charts - backend EE-1236 * copy over components for new applications view EE-1236 * Add new applications datatable component * Add more migrated files * removed test not applicable to CE * baclkported EE app data table code to CE * removed redundant helm repo url * resolved conflicts, updated code * using endpoint middleware * PR review fixes * using constants, openapi updated Co-authored-by: Richard Wei <54336863+WaysonWei@users.noreply.github.com> Co-authored-by: zees-dev <dev.786zshan@gmail.com> * fixed test conflicts, go linted * feat(helm/templates-add): helm templates add repo for user support EE-1278 (#5514) * feat(helm): add helm chart backport to ce EE-1409 (#5425) * EE-1311 Helm Chart Backport from EE * backport to ce Co-authored-by: Matt Hook <hookenz@gmail.com> * feat(helm) helm chart backport from ee EE-1311 (#5436) * Add missing defaultHelmRepoUrl and mock testing * Backport EE-1477 * Backport updates to helm tests from EE * add https by default changes and ssl to tls renaming from EE * Port install integration test. Disabled by default to pass CI checks * merged changes from EE for the integration test * kube proxy whitelist updated to support internal helm install command Co-authored-by: zees-dev <dev.786zshan@gmail.com> * Pull in all changes from tech review in EE-943 * feat(helm): add helm chart backport to ce EE-1409 (#5425) * EE-1311 Helm Chart Backport from EE * backport to ce Co-authored-by: Matt Hook <hookenz@gmail.com> * Pull in all changes from tech review in EE-943 * added helm to sidebar after rebase, sync CE with EE * backport EE-1278, squashed, diffed, updated * helm install openapi spec update * resolved conflicts, updated code * - matching ee codebase at 0afe57034449ee0e9f333d92c252a13995a93019 - helm install using endpoint middleware - remove trailing slash from added/persisted helm repo urls * feat(helm) use libhelm url validator and improved path assembly EE-1554 (#5561) * feat(helm/userrepos) fix getting global repo for ordinary users EE-1562 (#5567) * feat(helm/userrepos) fix getting global repo for ordinary users EE-1562 * post review changes and further backported changes from EE * resolved conflicts, updated code * fixed helm_install handler unit test * user cannot add existing repo if suffix is '/' (#5571) * feat(helm/docs) fix broken swagger docs EE-1278 (#5572) * Fix swagger docs * minor correction * fix(helm): migrating code from user handler to helm handler (#5573) * - migrated user_helm_repos to helm endpoint handler - migrated api operations from user factory/service to helm factory/service - passing endpointId into helm service/factory as endpoint provider is deprecated * upgrade libhelm to hide secrets Co-authored-by: Matt Hook <hookenz@gmail.com> * removed duplicate file - due to merge conflict * dependency injection in helm factory Co-authored-by: Richard Wei <54336863+WaysonWei@users.noreply.github.com> Co-authored-by: Matt Hook <hookenz@gmail.com> * kubernetes.templates -> kubernetes.templates.helm name conflict fix * Validate the URL added as a public helm repo (#5579) * fix(helm): helm app deletion fix EE-1581 (#5582) * updated helm lib to show correct error on uninstall failure * passing down helm app namespace on deletion * fix(k8s): EE-1591 non-admin users cannot deploy charts containing secrets (#5590) Co-authored-by: Simon Meng <simon.meng@portainer.io> * fix(helm): helm epic bugfixes EE-1582 EE-1593 (#5585) * - trim trailing slash and lowercase before persisting helm repo - browser helm templates url /kubernetes/templates/templates -> /kubernetes/templates/helm - fix publish url - fix helm repo add refresh - semi-fix k8s app expansion * Tidy up swagger documentation related to helm. Make json consistent * fixed helm release page for non-default namespaces * k8s app view table expansion bugfix * EE-1593: publish url load balancer fallback Co-authored-by: Matt Hook <hookenz@gmail.com> * k8s app list fix for charts with deployments containing multiple pods - which use the same label (#5599) * fix(kubernetes): app list view fix for secrets with long keys or values EE-1600 (#5600) * k8s app secrets key value text overflow ellipses * wrapping key value pairs instead of ellipses * fix(helm): helm apps bundling issue across different namespaces EE-1619 (#5602) * helm apps bundling issue across different namespaces * - code comments and indentation to ease reading - moved namespace calc out of loop * feat(helm/test) disable slow helm search test by default EE-1599 (#5598) * skip helm_repo_search as it's an integration test * switch to portainer built in integration test checker * make module order match EE * don't print test struct out when skipping integration test Co-authored-by: Richard Wei <54336863+WaysonWei@users.noreply.github.com> Co-authored-by: Matt Hook <hookenz@gmail.com> Co-authored-by: cong meng <mcpacino@gmail.com> Co-authored-by: Simon Meng <simon.meng@portainer.io>
158 lines
5.8 KiB
JavaScript
158 lines
5.8 KiB
JavaScript
import { KubernetesApplicationDeploymentTypes, KubernetesApplicationTypes } from 'Kubernetes/models/application/models';
|
|
import KubernetesApplicationHelper from 'Kubernetes/helpers/application';
|
|
import KubernetesNamespaceHelper from 'Kubernetes/helpers/namespaceHelper';
|
|
import { KubernetesConfigurationTypes } from 'Kubernetes/models/configuration/models';
|
|
|
|
angular.module('portainer.docker').controller('KubernetesApplicationsDatatableController', [
|
|
'$scope',
|
|
'$controller',
|
|
'DatatableService',
|
|
'Authentication',
|
|
function ($scope, $controller, DatatableService, Authentication) {
|
|
angular.extend(this, $controller('GenericDatatableController', { $scope: $scope }));
|
|
|
|
const ctrl = this;
|
|
|
|
this.settings = Object.assign(this.settings, {
|
|
showSystem: false,
|
|
});
|
|
|
|
this.state = Object.assign(this.state, {
|
|
expandAll: false,
|
|
expandedItems: [],
|
|
});
|
|
|
|
this.expandAll = function () {
|
|
this.state.expandAll = !this.state.expandAll;
|
|
this.state.filteredDataSet.forEach((item) => this.expandItem(item, this.state.expandAll));
|
|
};
|
|
|
|
this.isItemExpanded = function (item) {
|
|
return this.state.expandedItems.includes(item.Id);
|
|
};
|
|
|
|
this.isExpandable = function (item) {
|
|
return item.KubernetesApplications || this.hasConfigurationSecrets(item) || !!this.getPublishedUrl(item).length;
|
|
};
|
|
|
|
this.expandItem = function (item, expanded) {
|
|
// collapse item
|
|
if (!expanded) {
|
|
this.state.expandedItems = this.state.expandedItems.filter((id) => id !== item.Id);
|
|
// expanded item
|
|
} else if (expanded && !this.state.expandedItems.includes(item.Id)) {
|
|
this.state.expandedItems = [...this.state.expandedItems, item.Id];
|
|
}
|
|
DatatableService.setDataTableExpandedItems(this.tableKey, this.state.expandedItems);
|
|
};
|
|
|
|
this.expandItems = function (storedExpandedItems) {
|
|
this.state.expandedItems = storedExpandedItems;
|
|
if (this.state.expandedItems.length === this.dataset.length) {
|
|
this.state.expandAll = true;
|
|
}
|
|
};
|
|
|
|
this.onDataRefresh = function () {
|
|
const storedExpandedItems = DatatableService.getDataTableExpandedItems(this.tableKey);
|
|
if (storedExpandedItems !== null) {
|
|
this.expandItems(storedExpandedItems);
|
|
}
|
|
};
|
|
|
|
this.onSettingsShowSystemChange = function () {
|
|
DatatableService.setDataTableSettings(this.tableKey, this.settings);
|
|
};
|
|
|
|
this.isExternalApplication = function (item) {
|
|
return KubernetesApplicationHelper.isExternalApplication(item);
|
|
};
|
|
|
|
this.isSystemNamespace = function (item) {
|
|
// if all charts in a helm app/release are in the system namespace
|
|
if (item.KubernetesApplications && item.KubernetesApplications.length > 0) {
|
|
return item.KubernetesApplications.some((app) => KubernetesNamespaceHelper.isSystemNamespace(app.ResourcePool));
|
|
}
|
|
return KubernetesNamespaceHelper.isSystemNamespace(item.ResourcePool);
|
|
};
|
|
|
|
this.isDisplayed = function (item) {
|
|
return !ctrl.isSystemNamespace(item) || ctrl.settings.showSystem;
|
|
};
|
|
|
|
this.getPublishedUrl = function (item) {
|
|
// Map all ingress rules in published ports to their respective URLs
|
|
const ingressUrls = item.PublishedPorts.flatMap((pp) => pp.IngressRules)
|
|
.filter(({ Host, IP }) => Host || IP)
|
|
.map(({ Host, IP, Port, Path }) => {
|
|
let scheme = Port === 443 ? 'https' : 'http';
|
|
let urlPort = Port === 80 || Port === 443 ? '' : `:${Port}`;
|
|
return `${scheme}://${Host || IP}${urlPort}${Path}`;
|
|
});
|
|
|
|
// Map all load balancer service ports to ip address
|
|
let loadBalancerURLs = [];
|
|
if (item.LoadBalancerIPAddress) {
|
|
loadBalancerURLs = item.PublishedPorts.map((pp) => `http://${item.LoadBalancerIPAddress}:${pp.Port}`);
|
|
}
|
|
|
|
// combine ingress urls
|
|
const publishedUrls = [...ingressUrls, ...loadBalancerURLs];
|
|
|
|
// Return the first URL - priority given to ingress urls, then services (load balancers)
|
|
return publishedUrls.length > 0 ? publishedUrls[0] : '';
|
|
};
|
|
|
|
this.hasConfigurationSecrets = function (item) {
|
|
return item.Configurations && item.Configurations.some((config) => config.Data && config.Type === KubernetesConfigurationTypes.SECRET);
|
|
};
|
|
|
|
/**
|
|
* Do not allow applications in system namespaces to be selected
|
|
*/
|
|
this.allowSelection = function (item) {
|
|
return !this.isSystemNamespace(item);
|
|
};
|
|
|
|
this.$onInit = function () {
|
|
this.isAdmin = Authentication.isAdmin();
|
|
this.KubernetesApplicationDeploymentTypes = KubernetesApplicationDeploymentTypes;
|
|
this.KubernetesApplicationTypes = KubernetesApplicationTypes;
|
|
this.setDefaults();
|
|
this.prepareTableFromDataset();
|
|
|
|
this.state.orderBy = this.orderBy;
|
|
const storedOrder = DatatableService.getDataTableOrder(this.tableKey);
|
|
if (storedOrder !== null) {
|
|
this.state.reverseOrder = storedOrder.reverse;
|
|
this.state.orderBy = storedOrder.orderBy;
|
|
}
|
|
|
|
const textFilter = DatatableService.getDataTableTextFilters(this.tableKey);
|
|
if (textFilter !== null) {
|
|
this.state.textFilter = textFilter;
|
|
this.onTextFilterChange();
|
|
}
|
|
|
|
const storedFilters = DatatableService.getDataTableFilters(this.tableKey);
|
|
if (storedFilters !== null) {
|
|
this.filters = storedFilters;
|
|
}
|
|
if (this.filters && this.filters.state) {
|
|
this.filters.state.open = false;
|
|
}
|
|
|
|
const storedExpandedItems = DatatableService.getDataTableExpandedItems(this.tableKey);
|
|
if (storedExpandedItems !== null) {
|
|
this.expandItems(storedExpandedItems);
|
|
}
|
|
|
|
const storedSettings = DatatableService.getDataTableSettings(this.tableKey);
|
|
if (storedSettings !== null) {
|
|
this.settings = storedSettings;
|
|
this.settings.open = false;
|
|
}
|
|
this.onSettingsRepeaterChange();
|
|
};
|
|
},
|
|
]);
|