From 3da9751c823e97f2faabde5de95daebd007a4aa9 Mon Sep 17 00:00:00 2001 From: xAt0mZ Date: Mon, 26 Oct 2020 19:34:07 +0100 Subject: [PATCH 001/157] feat(k8s/applications): add pod as new application type for apps list --- .../applicationsDatatable.html | 9 ++++--- .../applicationsDatatableController.js | 3 ++- app/kubernetes/converters/application.js | 25 ++++++++++++++---- app/kubernetes/filters/applicationFilters.js | 2 ++ app/kubernetes/helpers/application/index.js | 4 +-- .../helpers/application/rollback.js | 2 +- app/kubernetes/helpers/history/index.js | 2 +- app/kubernetes/helpers/serviceHelper.js | 3 +++ .../horizontal-pod-auto-scaler/helper.js | 3 ++- .../models/application/models/constants.js | 2 ++ app/kubernetes/models/common/params.js | 11 +++----- app/kubernetes/pod/service.js | 26 ++++++++++++++++--- app/kubernetes/services/applicationService.js | 23 +++++++++++++--- app/kubernetes/services/historyService.js | 14 ++++++---- .../init/endpoint/initEndpointController.js | 2 +- 15 files changed, 96 insertions(+), 35 deletions(-) diff --git a/app/kubernetes/components/datatables/applications-datatable/applicationsDatatable.html b/app/kubernetes/components/datatables/applications-datatable/applicationsDatatable.html index 5d0ece02c..e90ef8362 100644 --- a/app/kubernetes/components/datatables/applications-datatable/applicationsDatatable.html +++ b/app/kubernetes/components/datatables/applications-datatable/applicationsDatatable.html @@ -151,11 +151,14 @@ >{{ item.Image }} + {{ item.Containers.length - 1 }} {{ item.ApplicationType | kubernetesApplicationTypeText }} - + Replicated Global - {{ item.RunningPodsCount }} / {{ item.TotalPodsCount }} + {{ item.RunningPodsCount }} / {{ item.TotalPodsCount }} + + + {{ item.Pods[0].Status }} + diff --git a/app/kubernetes/components/datatables/applications-datatable/applicationsDatatableController.js b/app/kubernetes/components/datatables/applications-datatable/applicationsDatatableController.js index aaee33363..f195c2bc0 100644 --- a/app/kubernetes/components/datatables/applications-datatable/applicationsDatatableController.js +++ b/app/kubernetes/components/datatables/applications-datatable/applicationsDatatableController.js @@ -1,4 +1,4 @@ -import { KubernetesApplicationDeploymentTypes } from 'Kubernetes/models/application/models'; +import { KubernetesApplicationDeploymentTypes, KubernetesApplicationTypes } from 'Kubernetes/models/application/models'; import KubernetesApplicationHelper from 'Kubernetes/helpers/application'; angular.module('portainer.docker').controller('KubernetesApplicationsDatatableController', [ @@ -42,6 +42,7 @@ angular.module('portainer.docker').controller('KubernetesApplicationsDatatableCo this.$onInit = function () { this.isAdmin = Authentication.isAdmin(); this.KubernetesApplicationDeploymentTypes = KubernetesApplicationDeploymentTypes; + this.KubernetesApplicationTypes = KubernetesApplicationTypes; this.setDefaults(); this.prepareTableFromDataset(); diff --git a/app/kubernetes/converters/application.js b/app/kubernetes/converters/application.js index 56cfdf2bb..8e603cdf0 100644 --- a/app/kubernetes/converters/application.js +++ b/app/kubernetes/converters/application.js @@ -50,7 +50,7 @@ function _apiPortsToPublishedPorts(pList, pRefs) { class KubernetesApplicationConverter { static applicationCommon(res, data, pods, service, ingresses) { - const containers = _.without(_.concat(data.spec.template.spec.containers, data.spec.template.spec.initContainers), undefined); + const containers = data.spec.template ? _.without(_.concat(data.spec.template.spec.containers, data.spec.template.spec.initContainers), undefined) : data.spec.containers; res.Id = data.metadata.uid; res.Name = data.metadata.name; res.StackName = data.metadata.labels ? data.metadata.labels[KubernetesPortainerApplicationStackNameLabel] || '-' : '-'; @@ -61,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 = KubernetesApplicationHelper.associatePodsAndApplication(pods, data); + res.Pods = data.spec.selector ? KubernetesApplicationHelper.associatePodsAndApplication(pods, data.spec.selector) : [data]; const limits = { Cpu: 0, @@ -118,7 +118,11 @@ class KubernetesApplicationConverter { res.PublishedPorts = ports; } - res.Volumes = data.spec.template.spec.volumes ? data.spec.template.spec.volumes : []; + if (data.spec.templates) { + res.Volumes = data.spec.template.spec.volumes ? data.spec.template.spec.volumes : []; + } else { + res.Volumes = data.spec.volumes; + } // TODO: review // this if() fixs direct use of PVC reference inside spec.template.spec.containers[0].volumeMounts @@ -169,7 +173,7 @@ class KubernetesApplicationConverter { res.PersistedFolders = _.without(res.PersistedFolders, undefined); res.ConfigurationVolumes = _.reduce( - data.spec.template.spec.volumes, + res.Volumes, (acc, volume) => { if (volume.configMap || volume.secret) { const matchingVolumeMount = _.find(_.flatMap(_.map(containers, 'volumeMounts')), { name: volume.name }); @@ -213,6 +217,17 @@ class KubernetesApplicationConverter { ); } + static apiPodToApplication(data, pods, service, ingresses) { + const res = new KubernetesApplication(); + KubernetesApplicationConverter.applicationCommon(res, data, pods, service, ingresses); + res.ApplicationType = KubernetesApplicationTypes.POD; + // res.DeploymentType = KubernetesApplicationDeploymentTypes.REPLICATED; + // res.DataAccessPolicy = KubernetesApplicationDataAccessPolicies.SHARED; + // res.RunningPodsCount = data.status.availableReplicas || data.status.replicas - data.status.unavailableReplicas || 0; + // res.TotalPodsCount = data.spec.replicas; + return res; + } + static apiDeploymentToApplication(data, pods, service, ingresses) { const res = new KubernetesApplication(); KubernetesApplicationConverter.applicationCommon(res, data, pods, service, ingresses); @@ -310,7 +325,7 @@ class KubernetesApplicationConverter { } else if (daemonSet) { app = KubernetesDaemonSetConverter.applicationFormValuesToDaemonSet(formValues, claims); } else { - throw new PortainerError('Unable to determine which association to use'); + throw new PortainerError('Unable to determine which association to use to convert form'); } let headlessService; diff --git a/app/kubernetes/filters/applicationFilters.js b/app/kubernetes/filters/applicationFilters.js index 0629c12ff..0ce2d3831 100644 --- a/app/kubernetes/filters/applicationFilters.js +++ b/app/kubernetes/filters/applicationFilters.js @@ -57,6 +57,8 @@ angular return KubernetesApplicationTypeStrings.DAEMONSET; case KubernetesApplicationTypes.STATEFULSET: return KubernetesApplicationTypeStrings.STATEFULSET; + case KubernetesApplicationTypes.POD: + return KubernetesApplicationTypeStrings.POD; default: return '-'; } diff --git a/app/kubernetes/helpers/application/index.js b/app/kubernetes/helpers/application/index.js index 9bc898fca..3124f4247 100644 --- a/app/kubernetes/helpers/application/index.js +++ b/app/kubernetes/helpers/application/index.js @@ -38,8 +38,8 @@ class KubernetesApplicationHelper { return !application.ApplicationOwner; } - static associatePodsAndApplication(pods, app) { - return _.filter(pods, { Labels: app.spec.selector.matchLabels }); + static associatePodsAndApplication(pods, selector) { + return _.filter(pods, ['metadata.labels', selector.matchLabels]); } static associateContainerPersistedFoldersAndConfigurations(app, containers) { diff --git a/app/kubernetes/helpers/application/rollback.js b/app/kubernetes/helpers/application/rollback.js index f593e0cf5..7f110e8f8 100644 --- a/app/kubernetes/helpers/application/rollback.js +++ b/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'); + throw new PortainerError('Unable to determine which association to use to convert patch'); } return result; } diff --git a/app/kubernetes/helpers/history/index.js b/app/kubernetes/helpers/history/index.js index d611644a0..5f8851ab4 100644 --- a/app/kubernetes/helpers/history/index.js +++ b/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'); + throw new PortainerError('Unable to determine which association to use to get revisions'); } revisionsList = _.sortBy(revisionsList, 'revision'); return [currentRevision, revisionsList]; diff --git a/app/kubernetes/helpers/serviceHelper.js b/app/kubernetes/helpers/serviceHelper.js index c263a3766..247e4a441 100644 --- a/app/kubernetes/helpers/serviceHelper.js +++ b/app/kubernetes/helpers/serviceHelper.js @@ -7,6 +7,9 @@ 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)); } } diff --git a/app/kubernetes/horizontal-pod-auto-scaler/helper.js b/app/kubernetes/horizontal-pod-auto-scaler/helper.js index 663c3baf8..44bc10c49 100644 --- a/app/kubernetes/horizontal-pod-auto-scaler/helper.js +++ b/app/kubernetes/horizontal-pod-auto-scaler/helper.js @@ -18,7 +18,8 @@ export class KubernetesHorizontalPodAutoScalerHelper { return KubernetesApplicationTypeStrings.DAEMONSET; } else if ((app instanceof KubernetesApplication && app.ApplicationType === KubernetesApplicationTypes.STATEFULSET) || app instanceof KubernetesStatefulSet) { return KubernetesApplicationTypeStrings.STATEFULSET; - // } else if () { ---> TODO: refactor - handle bare pod type ! + } else if (app instanceof KubernetesApplication && app.ApplicationType === KubernetesApplicationTypes.POD) { + return KubernetesApplicationTypeStrings.POD; } else { throw new PortainerError('Unable to determine application type'); } diff --git a/app/kubernetes/models/application/models/constants.js b/app/kubernetes/models/application/models/constants.js index 2d42bba05..970cb3557 100644 --- a/app/kubernetes/models/application/models/constants.js +++ b/app/kubernetes/models/application/models/constants.js @@ -12,12 +12,14 @@ 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({ diff --git a/app/kubernetes/models/common/params.js b/app/kubernetes/models/common/params.js index fd37b8764..5c7de8d34 100644 --- a/app/kubernetes/models/common/params.js +++ b/app/kubernetes/models/common/params.js @@ -1,11 +1,8 @@ /** * Generic params */ -const _KubernetesCommonParams = Object.freeze({ - id: '', -}); -export class KubernetesCommonParams { - constructor() { - Object.assign(this, JSON.parse(JSON.stringify(_KubernetesCommonParams))); - } +export function KubernetesCommonParams() { + return { + id: '', + }; } diff --git a/app/kubernetes/pod/service.js b/app/kubernetes/pod/service.js index c2de34a2e..2aa3df981 100644 --- a/app/kubernetes/pod/service.js +++ b/app/kubernetes/pod/service.js @@ -1,9 +1,7 @@ -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 */ @@ -11,23 +9,43 @@ 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 _.map(data.items, (item) => KubernetesPodConverter.apiToModel(item)); + return data.items; } catch (err) { throw new PortainerError('Unable to retrieve pods', err); } } - get(namespace) { + get(namespace, name) { + if (name) { + return this.$async(this.getAsync, namespace, name); + } return this.$async(this.getAllAsync, namespace); } diff --git a/app/kubernetes/services/applicationService.js b/app/kubernetes/services/applicationService.js index 55bfa9908..075adb91f 100644 --- a/app/kubernetes/services/applicationService.js +++ b/app/kubernetes/services/applicationService.js @@ -18,6 +18,7 @@ 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,7 +72,7 @@ class KubernetesApplicationService { } else if (app instanceof KubernetesStatefulSet || (app instanceof KubernetesApplication && app.ApplicationType === KubernetesApplicationTypes.STATEFULSET)) { apiService = this.KubernetesStatefulSetService; } else { - throw new PortainerError('Unable to determine which association to use'); + throw new PortainerError('Unable to determine which association to use to retrieve API Service'); } return apiService; } @@ -87,15 +88,18 @@ class KubernetesApplicationService { /* #region GET */ async getAsync(namespace, name) { try { - const [deployment, daemonSet, statefulSet, pods, autoScalers, ingresses] = await Promise.allSettled([ + const [deployment, daemonSet, statefulSet, pod, 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') { @@ -107,8 +111,11 @@ 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'); + throw new PortainerError('Unable to determine which association to use to convert application'); } const services = await this.KubernetesServiceService.get(namespace); @@ -118,6 +125,7 @@ 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); @@ -173,7 +181,14 @@ class KubernetesApplicationService { convertToApplication(item, KubernetesApplicationConverter.apiStatefulSetToapplication, services, pods, ingresses) ); - const applications = _.concat(deploymentApplications, daemonSetApplications, statefulSetApplications); + 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)); + }); await Promise.all( _.forEach(applications, async (application) => { const boundScaler = KubernetesHorizontalPodAutoScalerHelper.findApplicationBoundScaler(autoScalers, application); diff --git a/app/kubernetes/services/historyService.js b/app/kubernetes/services/historyService.js index df0284166..b00bf7f3e 100644 --- a/app/kubernetes/services/historyService.js +++ b/app/kubernetes/services/historyService.js @@ -32,13 +32,17 @@ 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'); + 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; } - - const [currentRevision, revisionsList] = KubernetesHistoryHelper.getRevisions(rawRevisions, application); - application.CurrentRevision = currentRevision; - application.Revisions = revisionsList; return application; } catch (err) { throw new PortainerError('', err); diff --git a/app/portainer/views/init/endpoint/initEndpointController.js b/app/portainer/views/init/endpoint/initEndpointController.js index 15a2faa87..c5a39a737 100644 --- a/app/portainer/views/init/endpoint/initEndpointController.js +++ b/app/portainer/views/init/endpoint/initEndpointController.js @@ -61,7 +61,7 @@ class InitEndpointController { case PortainerEndpointConnectionTypes.AGENT: return this.createAgentEndpoint(); default: - this.Notifications.error('Failure', 'Unable to determine which action to do'); + this.Notifications.error('Failure', 'Unable to determine which action to do to create endpoint'); } } From 174e28b850aa3ef0cade6d27e1b9baeb71de7828 Mon Sep 17 00:00:00 2001 From: xAt0mZ Date: Mon, 26 Oct 2020 19:47:23 +0100 Subject: [PATCH 002/157] feat(k8s/application): app details for pods --- .../containers-datatable/containersDatatable.html | 4 ++-- .../containers-datatable/containersDatatable.js | 1 + app/kubernetes/converters/application.js | 4 ---- .../views/applications/edit/application.html | 12 +++++++++--- .../views/applications/edit/applicationController.js | 5 +++-- 5 files changed, 15 insertions(+), 11 deletions(-) diff --git a/app/kubernetes/components/datatables/application/containers-datatable/containersDatatable.html b/app/kubernetes/components/datatables/application/containers-datatable/containersDatatable.html index 8c291971d..1d77ab609 100644 --- a/app/kubernetes/components/datatables/application/containers-datatable/containersDatatable.html +++ b/app/kubernetes/components/datatables/application/containers-datatable/containersDatatable.html @@ -57,7 +57,7 @@ - + - + diff --git a/app/portainer/components/datatables/roles-datatable/rolesDatatable.html b/app/portainer/components/datatables/roles-datatable/rolesDatatable.html new file mode 100644 index 000000000..107e08fb6 --- /dev/null +++ b/app/portainer/components/datatables/roles-datatable/rolesDatatable.html @@ -0,0 +1,64 @@ +
+ + +
+
{{ $ctrl.titleText }}
+
+
+ + +
+
+
+ Pod @@ -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" > - {{ item.PodName }}{{ item.PodName }} {{ item.Name }} {{ item.Image }}
Status + Replicated Global {{ ctrl.application.RunningPodsCount }} / {{ ctrl.application.TotalPodsCount }} + {{ ctrl.application.Pods[0].Status }} +
Resource reservations
-
per instance
+
+ per instance +
CPU {{ ctrl.application.Requests.Cpu | kubernetesApplicationCPUValue }}
@@ -557,7 +562,8 @@ title-icon="fa-server" dataset="ctrl.allContainers" table-key="kubernetes.application.containers" - order-by="PodName" + is-pod="ctrl.application.ApplicationType === ctrl.KubernetesApplicationTypes.POD" + order-by="{{ ctrl.application.ApplicationType === ctrl.KubernetesApplicationTypes.POD ? 'Name' : 'PodName' }}" > diff --git a/app/kubernetes/views/applications/edit/applicationController.js b/app/kubernetes/views/applications/edit/applicationController.js index b3304df8c..773e2099c 100644 --- a/app/kubernetes/views/applications/edit/applicationController.js +++ b/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 } from 'Kubernetes/models/application/models'; +import { KubernetesApplicationDataAccessPolicies, KubernetesApplicationDeploymentTypes, KubernetesApplicationTypes } 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,6 +123,8 @@ class KubernetesApplicationController { this.KubernetesNamespaceHelper = KubernetesNamespaceHelper; + this.KubernetesApplicationDeploymentTypes = KubernetesApplicationDeploymentTypes; + this.KubernetesApplicationTypes = KubernetesApplicationTypes; this.ApplicationDataAccessPolicies = KubernetesApplicationDataAccessPolicies; this.KubernetesServiceTypes = KubernetesServiceTypes; this.KubernetesPodContainerTypes = KubernetesPodContainerTypes; @@ -340,7 +342,6 @@ class KubernetesApplicationController { SelectedRevision: undefined, }; - this.KubernetesApplicationDeploymentTypes = KubernetesApplicationDeploymentTypes; await this.getApplication(); await this.getEvents(); this.state.viewReady = true; From a12f2ee8933f844cf32df9f552e22ecd427a081d Mon Sep 17 00:00:00 2001 From: Mulia Nasution Date: Wed, 28 Oct 2020 05:33:23 +0700 Subject: [PATCH 003/157] Fix typo, change Matamo to Matomo (#4409) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 010c8ffa1..9d300a082 100644 --- a/README.md +++ b/README.md @@ -52,7 +52,7 @@ For community support: You can find more information about Portainer's community ## Privacy -**To make sure we focus our development effort in the right places we need to know which features get used most often. To give us this information we use [Matamo Analytics](https://matomo.org/), which is hosted in Germany and is fully GDPR compliant.** +**To make sure we focus our development effort in the right places we need to know which features get used most often. To give us this information we use [Matomo Analytics](https://matomo.org/), which is hosted in Germany and is fully GDPR compliant.** When Portainer first starts, you are given the option to DISABLE analytics. If you **don't** choose to disable it, we collect anonymous usage as per [our privacy policy](https://www.portainer.io/documentation/in-app-analytics-and-privacy-policy/). **Please note**, there is no personally identifiable information sent or stored at any time and we only use the data to help us improve Portainer. From 1545a42f083bf0836a03603f9b985c161aab12a0 Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Tue, 3 Nov 2020 06:16:18 +1300 Subject: [PATCH 004/157] chore(github): update bug report template Update documentation URLs --- .github/ISSUE_TEMPLATE/Bug_report.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/Bug_report.md b/.github/ISSUE_TEMPLATE/Bug_report.md index 00b13e087..3e9b69019 100644 --- a/.github/ISSUE_TEMPLATE/Bug_report.md +++ b/.github/ISSUE_TEMPLATE/Bug_report.md @@ -16,7 +16,7 @@ already open. You can ensure this by searching the issue list for this repository. If there is a duplicate, please close your issue and add a comment to the existing issue instead. -Also, be sure to check our FAQ and documentation first: https://portainer.readthedocs.io +Also, be sure to check our FAQ and documentation first: https://documentation.portainer.io/ --> **Bug description** @@ -27,7 +27,7 @@ A clear and concise description of what you expected to happen. **Portainer Logs** Provide the logs of your Portainer container or Service. -You can see how [here](https://portainer.readthedocs.io/en/stable/faq.html#how-do-i-get-the-logs-from-portainer) +You can see how [here](https://documentation.portainer.io/archive/1.23.2/faq/#how-do-i-get-the-logs-from-portainer) **Steps to reproduce the issue:** From 0d20988befe34a64fddc63635782e8f704bec046 Mon Sep 17 00:00:00 2001 From: Alice Groux Date: Thu, 5 Nov 2020 08:49:37 +0100 Subject: [PATCH 005/157] fix(rest): remove timeouts for all REST services (#4385) --- app/docker/rest/container.js | 4 ---- app/docker/rest/image.js | 2 +- app/docker/rest/network.js | 1 - app/docker/rest/service.js | 1 - app/docker/rest/system.js | 3 +-- app/docker/rest/task.js | 1 - app/docker/rest/volume.js | 2 +- app/integrations/storidge/rest/storidge.js | 4 ++-- app/kubernetes/component-status/rest.js | 1 - app/kubernetes/endpoint/rest.js | 1 - app/kubernetes/horizontal-pod-auto-scaler/rest.js | 1 - app/kubernetes/ingress/rest.js | 1 - app/kubernetes/node/rest.js | 1 - app/kubernetes/rest/configMap.js | 1 - app/kubernetes/rest/controllerRevision.js | 1 - app/kubernetes/rest/daemonSet.js | 1 - app/kubernetes/rest/deployment.js | 1 - app/kubernetes/rest/endpoint.js | 1 - app/kubernetes/rest/event.js | 1 - app/kubernetes/rest/health.js | 2 +- app/kubernetes/rest/namespace.js | 1 - app/kubernetes/rest/persistentVolumeClaim.js | 1 - app/kubernetes/rest/pod.js | 1 - app/kubernetes/rest/replicaSet.js | 1 - app/kubernetes/rest/resourceQuota.js | 1 - app/kubernetes/rest/secret.js | 1 - app/kubernetes/rest/service.js | 1 - app/kubernetes/rest/statefulSet.js | 1 - app/kubernetes/rest/storage.js | 1 - 29 files changed, 6 insertions(+), 34 deletions(-) diff --git a/app/docker/rest/container.js b/app/docker/rest/container.js index aae286f11..203d16201 100644 --- a/app/docker/rest/container.js +++ b/app/docker/rest/container.js @@ -19,7 +19,6 @@ angular.module('portainer.docker').factory('Container', [ params: { all: 0, action: 'json', filters: '@filters' }, isArray: true, interceptor: ContainersInterceptor, - timeout: 15000, }, get: { method: 'GET', @@ -48,20 +47,17 @@ angular.module('portainer.docker').factory('Container', [ logs: { method: 'GET', params: { id: '@id', action: 'logs' }, - timeout: 4500, ignoreLoadingBar: true, transformResponse: logsHandler, }, stats: { method: 'GET', params: { id: '@id', stream: false, action: 'stats' }, - timeout: 4500, ignoreLoadingBar: true, }, top: { method: 'GET', params: { id: '@id', action: 'top' }, - timeout: 4500, ignoreLoadingBar: true, }, start: { diff --git a/app/docker/rest/image.js b/app/docker/rest/image.js index aa0d8a6a9..c1dbb9f90 100644 --- a/app/docker/rest/image.js +++ b/app/docker/rest/image.js @@ -16,7 +16,7 @@ angular.module('portainer.docker').factory('Image', [ endpointId: EndpointProvider.endpointID, }, { - query: { method: 'GET', params: { all: 0, action: 'json' }, isArray: true, interceptor: ImagesInterceptor, timeout: 15000 }, + query: { method: 'GET', params: { all: 0, action: 'json' }, isArray: true, interceptor: ImagesInterceptor }, get: { method: 'GET', params: { action: 'json' } }, search: { method: 'GET', params: { action: 'search' } }, history: { method: 'GET', params: { action: 'history' }, isArray: true }, diff --git a/app/docker/rest/network.js b/app/docker/rest/network.js index 8c8480158..eb92ccdf6 100644 --- a/app/docker/rest/network.js +++ b/app/docker/rest/network.js @@ -18,7 +18,6 @@ angular.module('portainer.docker').factory('Network', [ method: 'GET', isArray: true, interceptor: NetworksInterceptor, - timeout: 15000, }, get: { method: 'GET', diff --git a/app/docker/rest/service.js b/app/docker/rest/service.js index aecd4acbe..d852e98c4 100644 --- a/app/docker/rest/service.js +++ b/app/docker/rest/service.js @@ -35,7 +35,6 @@ angular.module('portainer.docker').factory('Service', [ logs: { method: 'GET', params: { id: '@id', action: 'logs' }, - timeout: 4500, ignoreLoadingBar: true, transformResponse: logsHandler, }, diff --git a/app/docker/rest/system.js b/app/docker/rest/system.js index fa69df952..917146c4f 100644 --- a/app/docker/rest/system.js +++ b/app/docker/rest/system.js @@ -18,10 +18,9 @@ angular.module('portainer.docker').factory('System', [ info: { method: 'GET', params: { action: 'info' }, - timeout: 15000, interceptor: InfoInterceptor, }, - version: { method: 'GET', params: { action: 'version' }, timeout: 4500, interceptor: VersionInterceptor }, + version: { method: 'GET', params: { action: 'version' }, interceptor: VersionInterceptor }, events: { method: 'GET', params: { action: 'events', since: '@since', until: '@until' }, diff --git a/app/docker/rest/task.js b/app/docker/rest/task.js index e2fa19603..dd818b861 100644 --- a/app/docker/rest/task.js +++ b/app/docker/rest/task.js @@ -17,7 +17,6 @@ angular.module('portainer.docker').factory('Task', [ logs: { method: 'GET', params: { id: '@id', action: 'logs' }, - timeout: 4500, ignoreLoadingBar: true, transformResponse: logsHandler, }, diff --git a/app/docker/rest/volume.js b/app/docker/rest/volume.js index dd35f793b..76941ea5a 100644 --- a/app/docker/rest/volume.js +++ b/app/docker/rest/volume.js @@ -18,7 +18,7 @@ angular.module('portainer.docker').factory('Volume', [ endpointId: EndpointProvider.endpointID, }, { - query: { method: 'GET', interceptor: VolumesInterceptor, timeout: 15000 }, + query: { method: 'GET', interceptor: VolumesInterceptor }, get: { method: 'GET', params: { id: '@id' } }, create: { method: 'POST', diff --git a/app/integrations/storidge/rest/storidge.js b/app/integrations/storidge/rest/storidge.js index 7e46d89d4..83a9b107c 100644 --- a/app/integrations/storidge/rest/storidge.js +++ b/app/integrations/storidge/rest/storidge.js @@ -12,9 +12,9 @@ angular.module('portainer.integrations.storidge').factory('Storidge', [ { rebootCluster: { method: 'POST', params: { resource: 'clusters', action: 'reboot' } }, shutdownCluster: { method: 'POST', params: { resource: 'clusters', action: 'shutdown' } }, - queryEvents: { method: 'GET', params: { resource: 'clusters', action: 'events' }, timeout: 4500, ignoreLoadingBar: true, isArray: true }, + queryEvents: { method: 'GET', params: { resource: 'clusters', action: 'events' }, ignoreLoadingBar: true, isArray: true }, getVersion: { method: 'GET', params: { resource: 'clusters', action: 'version' } }, - getInfo: { method: 'GET', params: { resource: 'clusters', action: 'info' }, timeout: 4500, ignoreLoadingBar: true }, + getInfo: { method: 'GET', params: { resource: 'clusters', action: 'info' }, ignoreLoadingBar: true }, queryNodes: { method: 'GET', params: { resource: 'nodes' } }, getNode: { method: 'GET', params: { resource: 'nodes', id: '@id' } }, diff --git a/app/kubernetes/component-status/rest.js b/app/kubernetes/component-status/rest.js index a286b584f..1e27343ed 100644 --- a/app/kubernetes/component-status/rest.js +++ b/app/kubernetes/component-status/rest.js @@ -14,7 +14,6 @@ angular.module('portainer.kubernetes').factory('KubernetesComponentStatus', [ { get: { method: 'GET', - timeout: 15000, ignoreLoadingBar: true, }, } diff --git a/app/kubernetes/endpoint/rest.js b/app/kubernetes/endpoint/rest.js index 9728d0414..68cf483ee 100644 --- a/app/kubernetes/endpoint/rest.js +++ b/app/kubernetes/endpoint/rest.js @@ -15,7 +15,6 @@ angular.module('portainer.kubernetes').factory('KubernetesEndpoints', [ { get: { method: 'GET', - timeout: 15000, ignoreLoadingBar: true, }, } diff --git a/app/kubernetes/horizontal-pod-auto-scaler/rest.js b/app/kubernetes/horizontal-pod-auto-scaler/rest.js index a6cdc4cb1..a0500ada1 100644 --- a/app/kubernetes/horizontal-pod-auto-scaler/rest.js +++ b/app/kubernetes/horizontal-pod-auto-scaler/rest.js @@ -17,7 +17,6 @@ angular.module('portainer.kubernetes').factory('KubernetesHorizontalPodAutoScale { get: { method: 'GET', - timeout: 15000, ignoreLoadingBar: true, }, getYaml: { diff --git a/app/kubernetes/ingress/rest.js b/app/kubernetes/ingress/rest.js index 98f2eea97..df335653b 100644 --- a/app/kubernetes/ingress/rest.js +++ b/app/kubernetes/ingress/rest.js @@ -15,7 +15,6 @@ function factory($resource, API_ENDPOINT_ENDPOINTS, EndpointProvider) { { get: { method: 'GET', - timeout: 15000, ignoreLoadingBar: true, }, getYaml: { diff --git a/app/kubernetes/node/rest.js b/app/kubernetes/node/rest.js index a145ae017..cbb804216 100644 --- a/app/kubernetes/node/rest.js +++ b/app/kubernetes/node/rest.js @@ -16,7 +16,6 @@ angular.module('portainer.kubernetes').factory('KubernetesNodes', [ { get: { method: 'GET', - timeout: 15000, ignoreLoadingBar: true, }, getYaml: { diff --git a/app/kubernetes/rest/configMap.js b/app/kubernetes/rest/configMap.js index 62ad844dd..4b8772d18 100644 --- a/app/kubernetes/rest/configMap.js +++ b/app/kubernetes/rest/configMap.js @@ -17,7 +17,6 @@ angular.module('portainer.kubernetes').factory('KubernetesConfigMaps', [ { get: { method: 'GET', - timeout: 15000, ignoreLoadingBar: true, }, getYaml: { diff --git a/app/kubernetes/rest/controllerRevision.js b/app/kubernetes/rest/controllerRevision.js index fb8892c32..cd1cdd193 100644 --- a/app/kubernetes/rest/controllerRevision.js +++ b/app/kubernetes/rest/controllerRevision.js @@ -17,7 +17,6 @@ angular.module('portainer.kubernetes').factory('KubernetesControllerRevisions', { get: { method: 'GET', - timeout: 15000, ignoreLoadingBar: true, }, getYaml: { diff --git a/app/kubernetes/rest/daemonSet.js b/app/kubernetes/rest/daemonSet.js index f2cfa025d..6019cb4d3 100644 --- a/app/kubernetes/rest/daemonSet.js +++ b/app/kubernetes/rest/daemonSet.js @@ -17,7 +17,6 @@ angular.module('portainer.kubernetes').factory('KubernetesDaemonSets', [ { get: { method: 'GET', - timeout: 15000, ignoreLoadingBar: true, }, getYaml: { diff --git a/app/kubernetes/rest/deployment.js b/app/kubernetes/rest/deployment.js index 44b2eb662..99439f665 100644 --- a/app/kubernetes/rest/deployment.js +++ b/app/kubernetes/rest/deployment.js @@ -17,7 +17,6 @@ angular.module('portainer.kubernetes').factory('KubernetesDeployments', [ { get: { method: 'GET', - timeout: 15000, ignoreLoadingBar: true, }, getYaml: { diff --git a/app/kubernetes/rest/endpoint.js b/app/kubernetes/rest/endpoint.js index 7fce22e41..71fde10b4 100644 --- a/app/kubernetes/rest/endpoint.js +++ b/app/kubernetes/rest/endpoint.js @@ -11,7 +11,6 @@ angular.module('portainer.kubernetes').factory('KubernetesEndpoints', function K { get: { method: 'GET', - timeout: 15000, ignoreLoadingBar: true, }, } diff --git a/app/kubernetes/rest/event.js b/app/kubernetes/rest/event.js index 54f9b07a5..15393bf05 100644 --- a/app/kubernetes/rest/event.js +++ b/app/kubernetes/rest/event.js @@ -17,7 +17,6 @@ angular.module('portainer.kubernetes').factory('KubernetesEvents', [ { get: { method: 'GET', - timeout: 15000, ignoreLoadingBar: true, }, getYaml: { diff --git a/app/kubernetes/rest/health.js b/app/kubernetes/rest/health.js index cbfe3be73..bc41be4f3 100644 --- a/app/kubernetes/rest/health.js +++ b/app/kubernetes/rest/health.js @@ -7,7 +7,7 @@ angular.module('portainer.kubernetes').factory('KubernetesHealth', [ API_ENDPOINT_ENDPOINTS + '/:id/kubernetes/healthz', {}, { - ping: { method: 'GET', timeout: 15000, params: { id: 'id' } }, + ping: { method: 'GET', params: { id: 'id' } }, } ); }, diff --git a/app/kubernetes/rest/namespace.js b/app/kubernetes/rest/namespace.js index 843893d58..482ca4132 100644 --- a/app/kubernetes/rest/namespace.js +++ b/app/kubernetes/rest/namespace.js @@ -16,7 +16,6 @@ angular.module('portainer.kubernetes').factory('KubernetesNamespaces', [ { get: { method: 'GET', - timeout: 15000, ignoreLoadingBar: true, }, getYaml: { diff --git a/app/kubernetes/rest/persistentVolumeClaim.js b/app/kubernetes/rest/persistentVolumeClaim.js index 25dd65177..e19529430 100644 --- a/app/kubernetes/rest/persistentVolumeClaim.js +++ b/app/kubernetes/rest/persistentVolumeClaim.js @@ -17,7 +17,6 @@ angular.module('portainer.kubernetes').factory('KubernetesPersistentVolumeClaims { get: { method: 'GET', - timeout: 15000, ignoreLoadingBar: true, }, getYaml: { diff --git a/app/kubernetes/rest/pod.js b/app/kubernetes/rest/pod.js index 2726eadd3..000068e9c 100644 --- a/app/kubernetes/rest/pod.js +++ b/app/kubernetes/rest/pod.js @@ -18,7 +18,6 @@ angular.module('portainer.kubernetes').factory('KubernetesPods', [ { get: { method: 'GET', - timeout: 15000, ignoreLoadingBar: true, }, getYaml: { diff --git a/app/kubernetes/rest/replicaSet.js b/app/kubernetes/rest/replicaSet.js index 45dbf6c2c..29b0440c6 100644 --- a/app/kubernetes/rest/replicaSet.js +++ b/app/kubernetes/rest/replicaSet.js @@ -17,7 +17,6 @@ angular.module('portainer.kubernetes').factory('KubernetesReplicaSets', [ { get: { method: 'GET', - timeout: 15000, ignoreLoadingBar: true, }, getYaml: { diff --git a/app/kubernetes/rest/resourceQuota.js b/app/kubernetes/rest/resourceQuota.js index c1eae1036..a2bf9e8c2 100644 --- a/app/kubernetes/rest/resourceQuota.js +++ b/app/kubernetes/rest/resourceQuota.js @@ -17,7 +17,6 @@ angular.module('portainer.kubernetes').factory('KubernetesResourceQuotas', [ { get: { method: 'GET', - timeout: 15000, ignoreLoadingBar: true, }, getYaml: { diff --git a/app/kubernetes/rest/secret.js b/app/kubernetes/rest/secret.js index 1767871aa..6595ce5d4 100644 --- a/app/kubernetes/rest/secret.js +++ b/app/kubernetes/rest/secret.js @@ -17,7 +17,6 @@ angular.module('portainer.kubernetes').factory('KubernetesSecrets', [ { get: { method: 'GET', - timeout: 15000, ignoreLoadingBar: true, }, getYaml: { diff --git a/app/kubernetes/rest/service.js b/app/kubernetes/rest/service.js index c483f13f2..1cbe21e75 100644 --- a/app/kubernetes/rest/service.js +++ b/app/kubernetes/rest/service.js @@ -17,7 +17,6 @@ angular.module('portainer.kubernetes').factory('KubernetesServices', [ { get: { method: 'GET', - timeout: 15000, ignoreLoadingBar: true, }, getYaml: { diff --git a/app/kubernetes/rest/statefulSet.js b/app/kubernetes/rest/statefulSet.js index 3fa962aa0..50551b87a 100644 --- a/app/kubernetes/rest/statefulSet.js +++ b/app/kubernetes/rest/statefulSet.js @@ -17,7 +17,6 @@ angular.module('portainer.kubernetes').factory('KubernetesStatefulSets', [ { get: { method: 'GET', - timeout: 15000, ignoreLoadingBar: true, }, getYaml: { diff --git a/app/kubernetes/rest/storage.js b/app/kubernetes/rest/storage.js index d3ef80d68..4a79439a5 100644 --- a/app/kubernetes/rest/storage.js +++ b/app/kubernetes/rest/storage.js @@ -16,7 +16,6 @@ angular.module('portainer.kubernetes').factory('KubernetesStorage', [ { get: { method: 'GET', - timeout: 15000, ignoreLoadingBar: true, }, getYaml: { From 9136ba30ebea3040f0bf562aa292e02e4dd42e01 Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Wed, 2 Dec 2020 08:27:30 +1300 Subject: [PATCH 006/157] feat(build-system): update pull-dog configuration (#4532) * feat(build-system): update pull-dog configuration * feat(build): update pull-dog configuration --- docker-compose.pull-dog.yml | 43 +++++++++++++++++++++++++++++++++++++ 1 file changed, 43 insertions(+) diff --git a/docker-compose.pull-dog.yml b/docker-compose.pull-dog.yml index 76e571a83..e080d7714 100644 --- a/docker-compose.pull-dog.yml +++ b/docker-compose.pull-dog.yml @@ -12,5 +12,48 @@ 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: From aa5277de2e2c7b29c481d1b5d53850595fe0f7eb Mon Sep 17 00:00:00 2001 From: cong meng Date: Thu, 10 Dec 2020 13:58:10 +1300 Subject: [PATCH 007/157] fix(frontend): cannnot access configuration details view containing binary data (#4503) (#4561) Co-authored-by: Simon Meng --- app/kubernetes/services/configMapService.js | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/app/kubernetes/services/configMapService.js b/app/kubernetes/services/configMapService.js index 247af7497..be863eaeb 100644 --- a/app/kubernetes/services/configMapService.js +++ b/app/kubernetes/services/configMapService.js @@ -24,8 +24,11 @@ class KubernetesConfigMapService { try { const params = new KubernetesCommonParams(); params.id = name; - const [raw, yaml] = await Promise.all([this.KubernetesConfigMaps(namespace).get(params).$promise, this.KubernetesConfigMaps(namespace).getYaml(params).$promise]); - const configMap = KubernetesConfigMapConverter.apiToConfigMap(raw, yaml); + 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); return configMap; } catch (err) { if (err.status === 404) { From 865c8d899b1bdec142b542bcbc8ae23bfdd2cdf5 Mon Sep 17 00:00:00 2001 From: cong meng Date: Thu, 10 Dec 2020 14:21:43 +1300 Subject: [PATCH 008/157] fix(frontend): revalidate configuration name when change resource pool (#4553) (#4562) Co-authored-by: Simon Meng --- .../configurations/create/createConfigurationController.js | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/app/kubernetes/views/configurations/create/createConfigurationController.js b/app/kubernetes/views/configurations/create/createConfigurationController.js index 7182c267d..31b76b918 100644 --- a/app/kubernetes/views/configurations/create/createConfigurationController.js +++ b/app/kubernetes/views/configurations/create/createConfigurationController.js @@ -25,6 +25,10 @@ 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) { From 890bbf4058173b616a85b74e9c2ce744169a0004 Mon Sep 17 00:00:00 2001 From: Alice Groux Date: Thu, 10 Dec 2020 03:11:45 +0100 Subject: [PATCH 009/157] fix(k8s/sidebar): accessing cluster setup not expand endpoint sidebar (#4496) --- .../kubernetesSidebarContent.html | 2 +- app/portainer/views/sidebar/sidebar.html | 8 +++++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/kubernetes/components/kubernetes-sidebar-content/kubernetesSidebarContent.html b/app/kubernetes/components/kubernetes-sidebar-content/kubernetesSidebarContent.html index b83f8c2f9..90785a22c 100644 --- a/app/kubernetes/components/kubernetes-sidebar-content/kubernetesSidebarContent.html +++ b/app/kubernetes/components/kubernetes-sidebar-content/kubernetesSidebarContent.html @@ -16,6 +16,6 @@
  • Cluster
    - Setup + Setup
    • diff --git a/app/portainer/views/sidebar/sidebar.html b/app/portainer/views/sidebar/sidebar.html index 578e4dd58..ca89daa22 100644 --- a/app/portainer/views/sidebar/sidebar.html +++ b/app/portainer/views/sidebar/sidebar.html @@ -127,7 +127,11 @@
  • - Endpoints + Endpoints
    +
    + + +
    +
    - + curl https://downloads.portainer.io/portainer-edge-agent-setup.sh | sudo bash -s -- {{ randomEdgeID }} {{ endpoint.EdgeKey }} - {{ dockerCommands.swarm }} + {{ dockerCommands.linuxSwarm }} + {{ dockerCommands.windowsSwarm }} - {{ dockerCommands.standalone }} + {{ dockerCommands.linuxStandalone }} + {{ dockerCommands.windowsStandalone }}
    diff --git a/app/portainer/views/endpoints/edit/endpointController.js b/app/portainer/views/endpoints/edit/endpointController.js index 5f96e2bfe..5349bd8ba 100644 --- a/app/portainer/views/endpoints/edit/endpointController.js +++ b/app/portainer/views/endpoints/edit/endpointController.js @@ -29,6 +29,7 @@ angular kubernetesEndpoint: false, agentEndpoint: false, edgeEndpoint: false, + platformType: 'linux', allowCreate: Authentication.isAdmin(), availableEdgeAgentCheckinOptions: [ { key: 'Use default interval', value: 0 }, @@ -55,15 +56,23 @@ angular }; $scope.copyEdgeAgentDeploymentCommand = function () { - if ($scope.state.deploymentTab === 2) { + if ($scope.state.deploymentTab === 2 && $scope.state.platformType === 'linux') { 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 --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 -v portainer_agent_data:/data --restart always -e EDGE=1 -e EDGE_ID=' + $scope.randomEdgeID + ' -e EDGE_KEY=' + $scope.endpoint.EdgeKey + - ' -e CAP_HOST_MANAGEMENT=1 -v portainer_agent_data:/data --name portainer_edge_agent portainer/agent' + ' -e CAP_HOST_MANAGEMENT=1 --name portainer_edge_agent portainer/agent' ); - } else if ($scope.state.deploymentTab === 1) { + } 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') { 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 + @@ -71,6 +80,14 @@ 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); } @@ -206,8 +223,10 @@ angular $scope.edgeKeyDetails = decodeEdgeKey(endpoint.EdgeKey); $scope.randomEdgeID = uuidv4(); $scope.dockerCommands = { - standalone: buildStandaloneCommand($scope.randomEdgeID, endpoint.EdgeKey), - swarm: buildSwarmCommand($scope.randomEdgeID, endpoint.EdgeKey), + linuxStandalone: buildLinuxStandaloneCommand($scope.randomEdgeID, endpoint.EdgeKey), + windowsStandalone: buildWindowsStandaloneCommand($scope.randomEdgeID, endpoint.EdgeKey), + linuxSwarm: buildLinuxSwarmCommand($scope.randomEdgeID, endpoint.EdgeKey), + windowsSwarm: buildWindowsSwarmCommand($scope.randomEdgeID, endpoint.EdgeKey), }; const settings = data.settings; @@ -223,21 +242,36 @@ angular }); } - function buildStandaloneCommand(edgeId, edgeKey) { - return `docker run -d -v /var/run/docker.sock:/var/run/docker.sock \\ + function buildLinuxStandaloneCommand(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 \\ + -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 \\ - -v portainer_agent_data:/data \\ --name portainer_edge_agent \\ portainer/agent`; } - function buildSwarmCommand(edgeId, edgeKey) { + function buildLinuxSwarmCommand(edgeId, edgeKey) { return `docker network create \\ --driver overlay \\ portainer_agent_network; @@ -259,5 +293,25 @@ 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(); }); From 341378e7832869168525e9536552c92a43001a85 Mon Sep 17 00:00:00 2001 From: Alice Groux Date: Sun, 13 Dec 2020 03:50:42 +0100 Subject: [PATCH 019/157] feat(app/endpoint): add deployment instructions for windows (#4442) * feat(app/endpoint): add deployment instructions for windows * feat(app/endpoint): hide instructions for kubernetes via load balancer and kubernetes via node port when windows is selected * feat(endpoint): minor UI update Co-authored-by: Anthony Lapenna --- .../endpoints/create/createEndpointController.js | 7 ++++++- .../views/endpoints/create/createendpoint.html | 15 ++++++++++++--- 2 files changed, 18 insertions(+), 4 deletions(-) diff --git a/app/portainer/views/endpoints/create/createEndpointController.js b/app/portainer/views/endpoints/create/createEndpointController.js index e75d25c7e..b54fa8dc2 100644 --- a/app/portainer/views/endpoints/create/createEndpointController.js +++ b/app/portainer/views/endpoints/create/createEndpointController.js @@ -19,6 +19,7 @@ angular ) { $scope.state = { EnvironmentType: 'agent', + PlatformType: 'linux', actionInProgress: false, deploymentTab: 0, allowCreateTag: Authentication.isAdmin(), @@ -56,8 +57,12 @@ angular }; $scope.copyAgentCommand = function () { - if ($scope.state.deploymentTab === 2) { + if ($scope.state.deploymentTab === 2 && $scope.state.PlatformType === 'linux') { 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 { diff --git a/app/portainer/views/endpoints/create/createendpoint.html b/app/portainer/views/endpoints/create/createendpoint.html index 77e5fef64..5d885a947 100644 --- a/app/portainer/views/endpoints/create/createendpoint.html +++ b/app/portainer/views/endpoints/create/createendpoint.html @@ -74,24 +74,33 @@
    Ensure that you have deployed the Portainer agent in your cluster first. Refer to the platform related command below to deploy it. +
    +
    + + +
    +
    - + curl -L https://downloads.portainer.io/portainer-agent-k8s-lb.yaml -o portainer-agent-k8s.yaml; kubectl apply -f portainer-agent-k8s.yaml - + curl -L https://downloads.portainer.io/portainer-agent-k8s-nodeport.yaml -o portainer-agent-k8s.yaml; kubectl apply -f portainer-agent-k8s.yaml - curl -L https://downloads.portainer.io/agent-stack.yml -o agent-stack.yml && docker stack deploy --compose-file=agent-stack.yml portainer-agent + 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
    From 380f106571330e778e2ef8790cc6f2a617643e97 Mon Sep 17 00:00:00 2001 From: cong meng Date: Sun, 13 Dec 2020 16:22:18 +1300 Subject: [PATCH 020/157] chore(build): bump Kompose version (#4475) Co-authored-by: Simon Meng --- gruntfile.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/gruntfile.js b/gruntfile.js index c9da104db..8ea90856c 100644 --- a/gruntfile.js +++ b/gruntfile.js @@ -19,7 +19,7 @@ module.exports = function (grunt) { binaries: { dockerLinuxVersion: '18.09.3', dockerWindowsVersion: '17.09.0-ce', - komposeVersion: 'v1.21.0', + komposeVersion: 'v1.22.0', kubectlVersion: 'v1.18.0', }, config: gruntfile_cfg.config, From 487123491e0d521196126a2c67482b1cd62250f4 Mon Sep 17 00:00:00 2001 From: Alice Groux Date: Sun, 13 Dec 2020 05:22:46 +0100 Subject: [PATCH 021/157] fix(k8s/application): improve ux for instance count input in creation/edition application (#4498) --- .../views/applications/create/createApplication.html | 12 +++++++++++- .../create/createApplicationController.js | 6 ------ 2 files changed, 11 insertions(+), 7 deletions(-) diff --git a/app/kubernetes/views/applications/create/createApplication.html b/app/kubernetes/views/applications/create/createApplication.html index 78e7b2674..e87c5db36 100644 --- a/app/kubernetes/views/applications/create/createApplication.html +++ b/app/kubernetes/views/applications/create/createApplication.html @@ -778,6 +778,7 @@
    +
    +
    + +

    Instance count is required.

    +

    Instance count must be greater than 0.

    +     +
    +
    Date: Sun, 13 Dec 2020 05:54:38 +0100 Subject: [PATCH 022/157] feat(k8s/advanced-deployment): update extra information message when kubernetes type is selected (#4542) --- app/kubernetes/views/deploy/deploy.html | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/app/kubernetes/views/deploy/deploy.html b/app/kubernetes/views/deploy/deploy.html index 2f657ab54..ceed8c17e 100644 --- a/app/kubernetes/views/deploy/deploy.html +++ b/app/kubernetes/views/deploy/deploy.html @@ -69,8 +69,14 @@

    - You can get more information about Kubernetes file format in the - official documentation. +

    + + This feature allows you to deploy any kind of Kubernetes resource in this environment (Deployment, Secret, ConfigMap...). +

    +

    + You can get more information about Kubernetes file format in the + official documentation. +

    From 92ad3e788d819d573a188ab42e28ca1c5610185d Mon Sep 17 00:00:00 2001 From: Alice Groux Date: Sun, 13 Dec 2020 09:42:54 +0100 Subject: [PATCH 023/157] feat(k8s/configuration): rename create entry file button (#4515) --- .../kubernetesConfigurationData.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/kubernetes/components/kubernetes-configuration-data/kubernetesConfigurationData.html b/app/kubernetes/components/kubernetes-configuration-data/kubernetesConfigurationData.html index 09a4baf1f..baf86f9e7 100644 --- a/app/kubernetes/components/kubernetes-configuration-data/kubernetesConfigurationData.html +++ b/app/kubernetes/components/kubernetes-configuration-data/kubernetesConfigurationData.html @@ -30,7 +30,7 @@ Create entry
    From fdb9bf09deeb273869c7029a0aeb7d97a921c26e Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Mon, 14 Dec 2020 09:18:41 +1300 Subject: [PATCH 024/157] docs(README): update README contribution link (#4587) --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 9d300a082..9da782e5a 100644 --- a/README.md +++ b/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://www.portainer.io/documentation/how-to-contribute/) 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://documentation.portainer.io/contributing/instructions/) to build it locally and make a pull request. We need all the help we can get! ## Security From f681e2d5328c7340668813a8a3b99b3333e1e46b Mon Sep 17 00:00:00 2001 From: Alice Groux Date: Sun, 13 Dec 2020 22:20:35 +0100 Subject: [PATCH 025/157] feat(endpoint): start Portainer without endpoint (#4460) * feat(endpoint): start Portainer without endpoint * feat(endpoint): minor UI update Co-authored-by: Anthony Lapenna --- app/portainer/services/api/endpointService.js | 8 +- .../create/createEndpointController.js | 90 +++++++++++++------ .../endpoints/create/createendpoint.html | 64 +++++++++++-- app/portainer/views/home/home.html | 11 +++ .../views/init/endpoint/initEndpoint.html | 3 + .../init/endpoint/initEndpointController.js | 4 + 6 files changed, 142 insertions(+), 38 deletions(-) diff --git a/app/portainer/services/api/endpointService.js b/app/portainer/services/api/endpointService.js index 19b05260a..43f55201d 100644 --- a/app/portainer/services/api/endpointService.js +++ b/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 () { + service.createLocalEndpoint = function (name = 'local') { var deferred = $q.defer(); - FileUploadService.createEndpoint('local', PortainerEndpointCreationTypes.LocalDockerEnvironment, '', '', 1, [], false) + FileUploadService.createEndpoint(name, 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 () { + service.createLocalKubernetesEndpoint = function (name = 'local') { var deferred = $q.defer(); - FileUploadService.createEndpoint('local', PortainerEndpointCreationTypes.LocalKubernetesEnvironment, '', '', 1, [], true, true, true) + FileUploadService.createEndpoint(name, PortainerEndpointCreationTypes.LocalKubernetesEnvironment, '', '', 1, [], true, true, true) .then(function success(response) { deferred.resolve(response.data); }) diff --git a/app/portainer/views/endpoints/create/createEndpointController.js b/app/portainer/views/endpoints/create/createEndpointController.js index b54fa8dc2..abb039440 100644 --- a/app/portainer/views/endpoints/create/createEndpointController.js +++ b/app/portainer/views/endpoints/create/createEndpointController.js @@ -89,40 +89,72 @@ angular $scope.availableTags = $scope.availableTags.concat(tag); $scope.formValues.TagIds = $scope.formValues.TagIds.concat(tag.Id); } catch (err) { - Notifications.error('Failue', err, 'Unable to create tag'); + Notifications.error('Failure', 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; - 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.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; + }); }; $scope.addAgentEndpoint = function () { diff --git a/app/portainer/views/endpoints/create/createendpoint.html b/app/portainer/views/endpoints/create/createendpoint.html index 5d885a947..2f3f62814 100644 --- a/app/portainer/views/endpoints/create/createendpoint.html +++ b/app/portainer/views/endpoints/create/createendpoint.html @@ -44,6 +44,16 @@

    Directly connect to the Docker API

    +
    + + +
    - - The Docker API must be exposed over TCP. You can find more information about how to expose the Docker API over TCP - in the Docker documentation. - +

    + 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 + in the Docker documentation. +

    + +

    + When using the socket, ensure that you have started the Portainer container with the following Docker flag + -v "/var/run/docker.sock:/var/run/docker.sock" + (on Linux) or + -v \.\pipe\docker_engine:\.\pipe\docker_engine + (on Windows). +

    @@ -127,6 +145,21 @@
    +
    +
    + Important notice +
    +
    +

    + This will allow you to manage the Kubernetes environment where Portainer is running. +

    + +

    + + In order to manage a remote Kubernetes environment, please use the Agent or Edge agent options. +

    +
    +
    Information @@ -176,8 +209,18 @@
    + +
    +
    + + +
    +
    + -
    +
    + + +

    + + No environment available for management. Please head over the + endpoints view + to add an endpoint. +

    +     +     +
    Connect Connecting... +
    diff --git a/app/portainer/views/init/endpoint/initEndpointController.js b/app/portainer/views/init/endpoint/initEndpointController.js index c5a39a737..235390a23 100644 --- a/app/portainer/views/init/endpoint/initEndpointController.js +++ b/app/portainer/views/init/endpoint/initEndpointController.js @@ -65,6 +65,10 @@ class InitEndpointController { } } + skipEndpointCreation() { + this.$state.go('portainer.home'); + } + /** * DOCKER_LOCAL (1) */ From f656ad71240f1ef5ef46420f48121eb7d62c668c Mon Sep 17 00:00:00 2001 From: cong meng Date: Mon, 14 Dec 2020 12:25:00 +1300 Subject: [PATCH 026/157] fix(frontend): fix incorrect datatable selection count on text filter change (#4474) Co-authored-by: Simon Meng --- .../components/datatables/genericDatatableController.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/portainer/components/datatables/genericDatatableController.js b/app/portainer/components/datatables/genericDatatableController.js index a98a66fbf..8567dcb87 100644 --- a/app/portainer/components/datatables/genericDatatableController.js +++ b/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 = this.dataset.filter((i) => i.Checked); + this.state.selectedItems = _.uniq(_.concat(this.state.selectedItems, this.state.filteredDataSet)).filter((i) => i.Checked); if (event && this.state.selectAll && this.state.selectedItems.length !== this.state.filteredDataSet.length) { this.state.selectAll = false; } From 5f2f7a87ab7a195706cb78b79fba89ecea54492e Mon Sep 17 00:00:00 2001 From: Alice Groux Date: Mon, 14 Dec 2020 02:31:59 +0100 Subject: [PATCH 027/157] feat(app): add a preview for business edition features (#4578) * feat(app): add a preview for business edition features * feat(app): open links in new tab + show storage quota section + grey out unavailable providers --- app/kubernetes/views/configure/configure.html | 48 +++++++++++++- .../create/createResourcePool.html | 57 +++++++++++++++++ .../resource-pools/edit/resourcePool.html | 57 +++++++++++++++++ app/portainer/__module.js | 11 ++++ .../accessManagement/porAccessManagement.html | 12 ++++ .../accessViewerDatatable.html | 26 ++++++++ .../accessViewerDatatable.js | 11 ++++ .../registriesDatatable.html | 3 + .../roles-datatable/rolesDatatable.html | 64 +++++++++++++++++++ .../roles-datatable/rolesDatatable.js | 12 ++++ app/portainer/views/roles/roles.html | 56 ++++++++++++++++ .../settingsAuthentication.html | 51 +++++++++++++++ app/portainer/views/sidebar/sidebar.html | 16 ++++- 13 files changed, 422 insertions(+), 2 deletions(-) create mode 100644 app/portainer/components/datatables/access-viewer-datatable/accessViewerDatatable.html create mode 100644 app/portainer/components/datatables/access-viewer-datatable/accessViewerDatatable.js create mode 100644 app/portainer/components/datatables/roles-datatable/rolesDatatable.html create mode 100644 app/portainer/components/datatables/roles-datatable/rolesDatatable.js create mode 100644 app/portainer/views/roles/roles.html diff --git a/app/kubernetes/views/configure/configure.html b/app/kubernetes/views/configure/configure.html index d79e6bbe4..68a506561 100644 --- a/app/kubernetes/views/configure/configure.html +++ b/app/kubernetes/views/configure/configure.html @@ -132,7 +132,53 @@
    - Metrics + Security +
    + +
    + + By default, all the users have access to the default namespace. Enable this option to set accesses on the default namespace. + +
    +
    +
    + + + + + This feature is available in Portainer Business Edition. + +
    +
    + +
    + Resources and Metrics +
    + +
    + + 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. +

    + + 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. +

    +     +
    +
    +
    + + + + + This feature is available in Portainer Business Edition. + +
    diff --git a/app/kubernetes/views/resource-pools/create/createResourcePool.html b/app/kubernetes/views/resource-pools/create/createResourcePool.html index 8bfa7db51..e2357da86 100644 --- a/app/kubernetes/views/resource-pools/create/createResourcePool.html +++ b/app/kubernetes/views/resource-pools/create/createResourcePool.html @@ -129,6 +129,63 @@
    + +
    + Load balancers +
    + +
    + + + 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. + +
    +
    +
    + + + + + This feature is available in Portainer Business Edition. + +
    +
    + + + +
    + Storages +
    + +
    + + + 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. + +
    +
    + + standard +
    +
    +
    + + + + + This feature is available in + Portainer Business Edition. + +
    +
    + +
    Ingresses diff --git a/app/kubernetes/views/resource-pools/edit/resourcePool.html b/app/kubernetes/views/resource-pools/edit/resourcePool.html index 4076ea583..16a04f15e 100644 --- a/app/kubernetes/views/resource-pools/edit/resourcePool.html +++ b/app/kubernetes/views/resource-pools/edit/resourcePool.html @@ -250,6 +250,63 @@
    + +
    + Load balancers +
    + +
    + + + 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. + +
    +
    +
    + + + + + This feature is available in Portainer Business Edition. + +
    +
    + + + +
    + Storages +
    + +
    + + + 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. + +
    +
    + + standard +
    +
    +
    + + + + + This feature is available in + Portainer Business Edition. + +
    +
    + +
    Actions diff --git a/app/portainer/__module.js b/app/portainer/__module.js index f615d488e..b8f01310c 100644 --- a/app/portainer/__module.js +++ b/app/portainer/__module.js @@ -392,6 +392,16 @@ 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); @@ -422,6 +432,7 @@ angular.module('portainer.app', ['portainer.oauth']).config([ $stateRegistryProvider.register(user); $stateRegistryProvider.register(teams); $stateRegistryProvider.register(team); + $stateRegistryProvider.register(roles); }, ]); diff --git a/app/portainer/components/accessManagement/porAccessManagement.html b/app/portainer/components/accessManagement/porAccessManagement.html index 47319f0bb..011394d5f 100644 --- a/app/portainer/components/accessManagement/porAccessManagement.html +++ b/app/portainer/components/accessManagement/porAccessManagement.html @@ -28,6 +28,18 @@
    +
    + +
    + + + This feature is available in Portainer Business Edition. + +
    +
    +
    diff --git a/app/portainer/components/datatables/access-viewer-datatable/accessViewerDatatable.html b/app/portainer/components/datatables/access-viewer-datatable/accessViewerDatatable.html new file mode 100644 index 000000000..3eef02b90 --- /dev/null +++ b/app/portainer/components/datatables/access-viewer-datatable/accessViewerDatatable.html @@ -0,0 +1,26 @@ +
    +
    + + +
    +
    + + + + + + + + + + + + + +
    + Endpoint + + Role + Access origin
    Select a user to show associated access and role
    +
    +
    diff --git a/app/portainer/components/datatables/access-viewer-datatable/accessViewerDatatable.js b/app/portainer/components/datatables/access-viewer-datatable/accessViewerDatatable.js new file mode 100644 index 000000000..39bf39f70 --- /dev/null +++ b/app/portainer/components/datatables/access-viewer-datatable/accessViewerDatatable.js @@ -0,0 +1,11 @@ +angular.module('portainer.app').component('accessViewerDatatable', { + templateUrl: './accessViewerDatatable.html', + controller: 'GenericDatatableController', + bindings: { + titleText: '@', + titleIcon: '@', + tableKey: '@', + orderBy: '@', + dataset: '<', + }, +}); diff --git a/app/portainer/components/datatables/registries-datatable/registriesDatatable.html b/app/portainer/components/datatables/registries-datatable/registriesDatatable.html index 342102e5e..697e7fd47 100644 --- a/app/portainer/components/datatables/registries-datatable/registriesDatatable.html +++ b/app/portainer/components/datatables/registries-datatable/registriesDatatable.html @@ -66,6 +66,9 @@
    		• Manage access + + Browse
    + + + + + + + + + + + + + + + + + + + + + + + + +
    + Name + + Description +
    Endpoint administratorFull control of all resources in an endpoint
    HelpdeskRead-only access of all resources in an endpoint
    Read-only userRead-only access of assigned resources in an endpoint
    Standard userFull control of assigned resources in an endpoint
    +
    +
    +
    + + + Items per page + + + + +
    +
    +
    + + + + diff --git a/app/portainer/components/datatables/roles-datatable/rolesDatatable.js b/app/portainer/components/datatables/roles-datatable/rolesDatatable.js new file mode 100644 index 000000000..3cb7cf24a --- /dev/null +++ b/app/portainer/components/datatables/roles-datatable/rolesDatatable.js @@ -0,0 +1,12 @@ +angular.module('portainer.app').component('rolesDatatable', { + templateUrl: './rolesDatatable.html', + controller: 'GenericDatatableController', + bindings: { + titleText: '@', + titleIcon: '@', + dataset: '<', + tableKey: '@', + orderBy: '@', + reverseOrder: '<', + }, +}); diff --git a/app/portainer/views/roles/roles.html b/app/portainer/views/roles/roles.html new file mode 100644 index 000000000..a595909f1 --- /dev/null +++ b/app/portainer/views/roles/roles.html @@ -0,0 +1,56 @@ + + + + + + + Role management + + + + +

    + + This feature is available in Portainer Business Edition. +

    +     +     + +
    +
    + +
    +
    + +
    +
    + + + +
    +
    + User +
    +
    +
    + + No user available + +
    +
    + +
    + Access +
    +
    +
    + + Effective role for each endpoint will be displayed for the selected user +
    +
    + +
    +     +     +
    +
    diff --git a/app/portainer/views/settings/authentication/settingsAuthentication.html b/app/portainer/views/settings/authentication/settingsAuthentication.html index 0ecab33e1..9ceca1874 100644 --- a/app/portainer/views/settings/authentication/settingsAuthentication.html +++ b/app/portainer/views/settings/authentication/settingsAuthentication.html @@ -366,6 +366,57 @@ +
    +
    + Provider +
    +
    +
    +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    + + +
    +
    +
    +
    + diff --git a/app/portainer/views/sidebar/sidebar.html b/app/portainer/views/sidebar/sidebar.html index ca89daa22..d1d181d92 100644 --- a/app/portainer/views/sidebar/sidebar.html +++ b/app/portainer/views/sidebar/sidebar.html @@ -120,11 +120,25 @@ ($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.teams.team' || + $state.current.name === 'portainer.roles') " > Teams +
    + Roles +
  • Date: Mon, 14 Dec 2020 05:27:05 +0200 Subject: [PATCH 028/157] fix(services): prevent adding volume without source and target (#4538) * feat(services): check that target mounts are non empty * feat(services): prevent creating service when no source * refactor(services): remove ng-form * fix(services): check that every volume is valid --- app/assets/css/app.css | 4 ++ .../create/createServiceController.js | 6 +++ .../views/services/create/createservice.html | 47 ++++++++++++------- .../views/services/edit/includes/mounts.html | 7 ++- .../views/services/edit/serviceController.js | 6 +++ 5 files changed, 51 insertions(+), 19 deletions(-) diff --git a/app/assets/css/app.css b/app/assets/css/app.css index d42b10ee0..4f9ca5881 100644 --- a/app/assets/css/app.css +++ b/app/assets/css/app.css @@ -1042,3 +1042,7 @@ json-tree .branch-preview { background-color: #337ab7; } /* !spinkit override */ + +.w-full { + width: 100%; +} diff --git a/app/docker/views/services/create/createServiceController.js b/app/docker/views/services/create/createServiceController.js index 2edddb658..a59d74207 100644 --- a/app/docker/views/services/create/createServiceController.js +++ b/app/docker/views/services/create/createServiceController.js @@ -520,6 +520,12 @@ 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; diff --git a/app/docker/views/services/create/createservice.html b/app/docker/views/services/create/createservice.html index cc304b3e1..2dcdea2de 100644 --- a/app/docker/views/services/create/createservice.html +++ b/app/docker/views/services/create/createservice.html @@ -123,7 +123,7 @@ + diff --git a/app/docker/views/services/edit/serviceController.js b/app/docker/views/services/edit/serviceController.js index f3cd5ae87..b73938d74 100644 --- a/app/docker/views/services/edit/serviceController.js +++ b/app/docker/views/services/edit/serviceController.js @@ -378,6 +378,12 @@ 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; From b67c0e870c24883f02217081cb411e8701562e82 Mon Sep 17 00:00:00 2001 From: aravind-korada <70788131+aravind-korada@users.noreply.github.com> Date: Tue, 15 Dec 2020 04:12:54 +0530 Subject: [PATCH 029/157] #4470 fix(stack): fix a display issue with the stack editor tab. (#4543) --- app/portainer/views/stacks/edit/stack.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/portainer/views/stacks/edit/stack.html b/app/portainer/views/stacks/edit/stack.html index 114a1712f..47856bb78 100644 --- a/app/portainer/views/stacks/edit/stack.html +++ b/app/portainer/views/stacks/edit/stack.html @@ -89,7 +89,7 @@ - + Editor
    @@ -165,7 +165,7 @@ +

    + + diff --git a/app/kubernetes/views/applications/applications.html b/app/kubernetes/views/applications/applications.html index d60033ade..c0c86d0b8 100644 --- a/app/kubernetes/views/applications/applications.html +++ b/app/kubernetes/views/applications/applications.html @@ -5,19 +5,7 @@
    - - -

    - - As an administrator user, you have access to the advanced deployment feature allowing you to deploy any Kubernetes manifest inside your cluster. -

    -

    - -

    -     -     +
    diff --git a/app/kubernetes/views/applications/applicationsController.js b/app/kubernetes/views/applications/applicationsController.js index 1f8b137be..8a7dfec4b 100644 --- a/app/kubernetes/views/applications/applicationsController.js +++ b/app/kubernetes/views/applications/applicationsController.js @@ -1,3 +1,5 @@ +require('../../templates/advancedDeploymentPanel.html'); + import angular from 'angular'; import * as _ from 'lodash-es'; import KubernetesStackHelper from 'Kubernetes/helpers/stackHelper'; diff --git a/app/kubernetes/views/applications/edit/application.html b/app/kubernetes/views/applications/edit/application.html index 822ef9adc..e5751e236 100644 --- a/app/kubernetes/views/applications/edit/application.html +++ b/app/kubernetes/views/applications/edit/application.html @@ -7,6 +7,8 @@
    +
    +
    diff --git a/app/kubernetes/views/applications/edit/applicationController.js b/app/kubernetes/views/applications/edit/applicationController.js index 0d4b3482a..a723cbaf9 100644 --- a/app/kubernetes/views/applications/edit/applicationController.js +++ b/app/kubernetes/views/applications/edit/applicationController.js @@ -1,3 +1,5 @@ +require('../../../templates/advancedDeploymentPanel.html'); + import angular from 'angular'; import * as _ from 'lodash-es'; import * as JsonPatch from 'fast-json-patch'; @@ -101,6 +103,7 @@ class KubernetesApplicationController { Notifications, LocalStorage, ModalService, + Authentication, KubernetesApplicationService, KubernetesEventService, KubernetesStackService, @@ -114,6 +117,7 @@ class KubernetesApplicationController { this.Notifications = Notifications; this.LocalStorage = LocalStorage; this.ModalService = ModalService; + this.Authentication = Authentication; this.KubernetesApplicationService = KubernetesApplicationService; this.KubernetesEventService = KubernetesEventService; @@ -333,6 +337,7 @@ class KubernetesApplicationController { eventWarningCount: 0, expandedNote: false, useIngress: false, + isAdmin: this.Authentication.isAdmin(), }; this.state.activeTab = this.LocalStorage.getActiveTab('application'); diff --git a/app/kubernetes/views/configurations/configurations.html b/app/kubernetes/views/configurations/configurations.html index 8e55b4fc8..6d07dc244 100644 --- a/app/kubernetes/views/configurations/configurations.html +++ b/app/kubernetes/views/configurations/configurations.html @@ -5,6 +5,8 @@
    +
    +
    +
    +
    diff --git a/app/kubernetes/views/volumes/volumesController.js b/app/kubernetes/views/volumes/volumesController.js index 90d44cf9f..9dc18f866 100644 --- a/app/kubernetes/views/volumes/volumesController.js +++ b/app/kubernetes/views/volumes/volumesController.js @@ -1,3 +1,5 @@ +require('../../templates/advancedDeploymentPanel.html'); + import * as _ from 'lodash-es'; import filesizeParser from 'filesize-parser'; import angular from 'angular'; @@ -39,10 +41,22 @@ function computeSize(volumes) { class KubernetesVolumesController { /* @ngInject */ - constructor($async, $state, Notifications, ModalService, LocalStorage, EndpointProvider, KubernetesStorageService, KubernetesVolumeService, KubernetesApplicationService) { + constructor( + $async, + $state, + Notifications, + Authentication, + ModalService, + LocalStorage, + EndpointProvider, + KubernetesStorageService, + KubernetesVolumeService, + KubernetesApplicationService + ) { this.$async = $async; this.$state = $state; this.Notifications = Notifications; + this.Authentication = Authentication; this.ModalService = ModalService; this.LocalStorage = LocalStorage; this.EndpointProvider = EndpointProvider; @@ -117,6 +131,7 @@ class KubernetesVolumesController { currentName: this.$state.$current.name, endpointId: this.EndpointProvider.endpointID(), activeTab: this.LocalStorage.getActiveTab('volumes'), + isAdmin: this.Authentication.isAdmin(), }; await this.getVolumes(); From c9f68a4d8fc1ae5ef1dd4237adee7c3638581015 Mon Sep 17 00:00:00 2001 From: cong meng Date: Fri, 8 Jan 2021 11:55:42 +1300 Subject: [PATCH 042/157] fix(kubernetes): removes kube client cache when edge proxy is removed (#4487) (#4574) Co-authored-by: Simon Meng --- .../proxy/factory/kubernetes/transport.go | 73 +++++++++---------- api/http/proxy/manager.go | 5 ++ api/kubernetes/cli/client.go | 5 ++ 3 files changed, 45 insertions(+), 38 deletions(-) diff --git a/api/http/proxy/factory/kubernetes/transport.go b/api/http/proxy/factory/kubernetes/transport.go index 4fbacf590..c1d0de13b 100644 --- a/api/http/proxy/factory/kubernetes/transport.go +++ b/api/http/proxy/factory/kubernetes/transport.go @@ -3,6 +3,7 @@ package kubernetes import ( "crypto/tls" "fmt" + "log" "net/http" "github.com/portainer/portainer/api/http/security" @@ -13,14 +14,16 @@ import ( type ( localTransport struct { - httpTransport *http.Transport - tokenManager *tokenManager + httpTransport *http.Transport + tokenManager *tokenManager + endpointIdentifier portainer.EndpointID } agentTransport struct { - httpTransport *http.Transport - tokenManager *tokenManager - signatureService portainer.DigitalSignatureService + httpTransport *http.Transport + tokenManager *tokenManager + signatureService portainer.DigitalSignatureService + endpointIdentifier portainer.EndpointID } edgeTransport struct { @@ -50,21 +53,11 @@ func NewLocalTransport(tokenManager *tokenManager) (*localTransport, error) { // RoundTrip is the implementation of the the http.RoundTripper interface func (transport *localTransport) RoundTrip(request *http.Request) (*http.Response, error) { - tokenData, err := security.RetrieveTokenData(request) + token, err := getRoundTripToken(request, transport.tokenManager, transport.endpointIdentifier) if err != nil { return nil, err } - var token string - if tokenData.Role == portainer.AdministratorRole { - token = transport.tokenManager.getAdminServiceAccountToken() - } else { - token, err = transport.tokenManager.getUserServiceAccountToken(int(tokenData.ID)) - if err != nil { - return nil, err - } - } - request.Header.Set("Authorization", fmt.Sprintf("Bearer %s", token)) return transport.httpTransport.RoundTrip(request) @@ -85,21 +78,11 @@ func NewAgentTransport(signatureService portainer.DigitalSignatureService, tlsCo // RoundTrip is the implementation of the the http.RoundTripper interface func (transport *agentTransport) RoundTrip(request *http.Request) (*http.Response, error) { - tokenData, err := security.RetrieveTokenData(request) + token, err := getRoundTripToken(request, transport.tokenManager, transport.endpointIdentifier) if err != nil { return nil, err } - var token string - if tokenData.Role == portainer.AdministratorRole { - token = transport.tokenManager.getAdminServiceAccountToken() - } else { - token, err = transport.tokenManager.getUserServiceAccountToken(int(tokenData.ID)) - if err != nil { - return nil, err - } - } - request.Header.Set(portainer.PortainerAgentKubernetesSATokenHeader, token) signature, err := transport.signatureService.CreateSignature(portainer.PortainerAgentSignatureMessage) @@ -127,21 +110,11 @@ func NewEdgeTransport(reverseTunnelService portainer.ReverseTunnelService, endpo // RoundTrip is the implementation of the the http.RoundTripper interface func (transport *edgeTransport) RoundTrip(request *http.Request) (*http.Response, error) { - tokenData, err := security.RetrieveTokenData(request) + token, err := getRoundTripToken(request, transport.tokenManager, transport.endpointIdentifier) if err != nil { return nil, err } - var token string - if tokenData.Role == portainer.AdministratorRole { - token = transport.tokenManager.getAdminServiceAccountToken() - } else { - token, err = transport.tokenManager.getUserServiceAccountToken(int(tokenData.ID)) - if err != nil { - return nil, err - } - } - request.Header.Set(portainer.PortainerAgentKubernetesSATokenHeader, token) response, err := transport.httpTransport.RoundTrip(request) @@ -154,3 +127,27 @@ func (transport *edgeTransport) RoundTrip(request *http.Request) (*http.Response return response, err } + +func getRoundTripToken( + request *http.Request, + tokenManager *tokenManager, + endpointIdentifier portainer.EndpointID, +) (string, error) { + tokenData, err := security.RetrieveTokenData(request) + if err != nil { + return "", err + } + + var token string + if tokenData.Role == portainer.AdministratorRole { + token = tokenManager.getAdminServiceAccountToken() + } else { + token, err = tokenManager.getUserServiceAccountToken(int(tokenData.ID)) + if err != nil { + log.Printf("Failed retrieving service account token: %v", err) + return "", err + } + } + + return token, nil +} diff --git a/api/http/proxy/manager.go b/api/http/proxy/manager.go index e539d89c2..491a709c9 100644 --- a/api/http/proxy/manager.go +++ b/api/http/proxy/manager.go @@ -21,6 +21,7 @@ type ( proxyFactory *factory.ProxyFactory endpointProxies cmap.ConcurrentMap legacyExtensionProxies cmap.ConcurrentMap + k8sClientFactory *cli.ClientFactory } ) @@ -29,6 +30,7 @@ func NewManager(dataStore portainer.DataStore, signatureService portainer.Digita return &Manager{ endpointProxies: cmap.New(), legacyExtensionProxies: cmap.New(), + k8sClientFactory: kubernetesClientFactory, proxyFactory: factory.NewProxyFactory(dataStore, signatureService, tunnelService, clientFactory, kubernetesClientFactory, kubernetesTokenCacheManager), } } @@ -56,8 +58,11 @@ func (manager *Manager) GetEndpointProxy(endpoint *portainer.Endpoint) http.Hand } // DeleteEndpointProxy deletes the proxy associated to a key +// and cleans the k8s endpoint client cache. DeleteEndpointProxy +// is currently only called for edge connection clean up. func (manager *Manager) DeleteEndpointProxy(endpoint *portainer.Endpoint) { manager.endpointProxies.Remove(string(endpoint.ID)) + manager.k8sClientFactory.RemoveKubeClient(endpoint) } // CreateLegacyExtensionProxy creates a new HTTP reverse proxy for a legacy extension and adds it to the registered proxies diff --git a/api/kubernetes/cli/client.go b/api/kubernetes/cli/client.go index 707bf3924..a268150c9 100644 --- a/api/kubernetes/cli/client.go +++ b/api/kubernetes/cli/client.go @@ -40,6 +40,11 @@ func NewClientFactory(signatureService portainer.DigitalSignatureService, revers } } +// Remove the cached kube client so a new one can be created +func (factory *ClientFactory) RemoveKubeClient(endpoint *portainer.Endpoint) { + factory.endpointClients.Remove(strconv.Itoa(int(endpoint.ID))) +} + // GetKubeClient checks if an existing client is already registered for the endpoint and returns it if one is found. // If no client is registered, it will create a new client, register it, and returns it. func (factory *ClientFactory) GetKubeClient(endpoint *portainer.Endpoint) (portainer.KubeClient, error) { From d5763a970b62f0303dc5f0ab850d99fff038ccc8 Mon Sep 17 00:00:00 2001 From: cong meng Date: Fri, 8 Jan 2021 12:45:06 +1300 Subject: [PATCH 043/157] fix(frontend): Resource pool 'created' attribute is showing the time you view it at & not actual creation time (#4568) (#4599) Co-authored-by: Simon Meng --- .../resource-pools-datatable/resourcePoolsDatatable.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/kubernetes/components/datatables/resource-pools-datatable/resourcePoolsDatatable.html b/app/kubernetes/components/datatables/resource-pools-datatable/resourcePoolsDatatable.html index 088f737df..30ccd126f 100644 --- a/app/kubernetes/components/datatables/resource-pools-datatable/resourcePoolsDatatable.html +++ b/app/kubernetes/components/datatables/resource-pools-datatable/resourcePoolsDatatable.html @@ -118,7 +118,7 @@ system {{ item.Quota ? 'Yes' : 'No' }} - {{ item.CreationDate | getisodate }} {{ item.Namespace.ResourcePoolOwner ? 'by ' + item.Namespace.ResourcePoolOwner : '' }} + {{ item.Namespace.CreationDate | getisodate }} {{ item.Namespace.ResourcePoolOwner ? 'by ' + item.Namespace.ResourcePoolOwner : '' }} Manage access From eab828279e03d845fb273ef48b9743d2462e2180 Mon Sep 17 00:00:00 2001 From: itsconquest Date: Fri, 8 Jan 2021 12:46:57 +1300 Subject: [PATCH 044/157] chore(project): exclude refactors (#4689) --- .github/stale.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/stale.yml b/.github/stale.yml index a5d534d01..fce5d3700 100644 --- a/.github/stale.yml +++ b/.github/stale.yml @@ -15,6 +15,7 @@ issues: - kind/question - kind/style - kind/workaround + - kind/refactor - bug/need-confirmation - bug/confirmed - status/discuss From cf508065ecb8bc0aeff572fa5367dd51d89d0744 Mon Sep 17 00:00:00 2001 From: cong meng Date: Fri, 8 Jan 2021 12:51:27 +1300 Subject: [PATCH 045/157] fix(frontend): application edit page initializes the overridenKeyType of new added configuration key to NONE so that the user can select how to load it (#4548) (#4593) Co-authored-by: Simon Meng --- app/kubernetes/helpers/application/index.js | 5 ++++- app/kubernetes/models/application/formValues.js | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/app/kubernetes/helpers/application/index.js b/app/kubernetes/helpers/application/index.js index 3124f4247..daf993719 100644 --- a/app/kubernetes/helpers/application/index.js +++ b/app/kubernetes/helpers/application/index.js @@ -175,7 +175,10 @@ class KubernetesApplicationHelper { item.OverridenKeys = _.map(keys, (k) => { const fvKey = new KubernetesApplicationConfigurationFormValueOverridenKey(); fvKey.Key = k.Key; - if (index < k.EnvCount) { + if (!k.Count) { + // !k.Count indicates k.Key is new added to the configuration and has not been loaded to the application yet + fvKey.Type = KubernetesApplicationConfigurationFormValueOverridenKeyTypes.NONE; + } else if (index < k.EnvCount) { fvKey.Type = KubernetesApplicationConfigurationFormValueOverridenKeyTypes.ENVIRONMENT; } else { fvKey.Type = KubernetesApplicationConfigurationFormValueOverridenKeyTypes.FILESYSTEM; diff --git a/app/kubernetes/models/application/formValues.js b/app/kubernetes/models/application/formValues.js index 1f1df1197..12d6151c3 100644 --- a/app/kubernetes/models/application/formValues.js +++ b/app/kubernetes/models/application/formValues.js @@ -35,6 +35,7 @@ export class KubernetesApplicationFormValues { } export const KubernetesApplicationConfigurationFormValueOverridenKeyTypes = Object.freeze({ + NONE: 0, ENVIRONMENT: 1, FILESYSTEM: 2, }); From 105d1ae5195545405f376cf8852d14649c9f5a7a Mon Sep 17 00:00:00 2001 From: cong meng Date: Fri, 8 Jan 2021 15:30:43 +1300 Subject: [PATCH 046/157] feat(frontend): de-emphasize internal login when OAuth is enabled (#3065) (#4565) * feat(frontend): de-emphasize internal login when OAuth is enabled (#3065) * feat(frontend): change the "Use internal authentication" style to be primary (#3065) * feat(frontend): resize the login with "provider" button to use a 120% font size (#3065) * feat(frontend): remove unused css for h1 tag (#3065) Co-authored-by: Simon Meng --- app/assets/css/app.css | 21 +++++++ app/portainer/views/auth/auth.html | 73 ++++++++++++++-------- app/portainer/views/auth/authController.js | 11 +++- 3 files changed, 77 insertions(+), 28 deletions(-) diff --git a/app/assets/css/app.css b/app/assets/css/app.css index 4f9ca5881..f813dbb2c 100644 --- a/app/assets/css/app.css +++ b/app/assets/css/app.css @@ -927,6 +927,27 @@ ul.sidebar .sidebar-list .sidebar-sublist a.active { z-index: 2; } +.striketext:before, +.striketext:after { + background-color: #777777; + content: ''; + display: inline-block; + height: 1px; + position: relative; + vertical-align: middle; + width: 50%; +} + +.striketext:before { + right: 0.5em; + margin-left: -50%; +} + +.striketext:after { + left: 0.5em; + margin-right: -50%; +} + /*bootbox override*/ .modal-open { padding-right: 0 !important; diff --git a/app/portainer/views/auth/auth.html b/app/portainer/views/auth/auth.html index 84c960464..20d81fe0d 100644 --- a/app/portainer/views/auth/auth.html +++ b/app/portainer/views/auth/auth.html @@ -8,41 +8,62 @@
    +
    - -
    - - -
    - - -
    - - -
    - -
    -
    - -
    +
    + +
    Login with Microsoft
    -
    +
    Login with Google
    -
    +
    Login with Github
    -
    +
    Login with OAuth
    +
    +
    + +
    +
    +
    or
    +
    +
    + + +
    +
    +
    + Use internal authentication +
    +
    +
    + + +
    + + +
    + + +
    + + +
    + +
    + +
    - - - - {{ ctrl.state.AuthenticationError }} -
    - - + + +
    + + {{ ctrl.state.AuthenticationError }} +
    +
    diff --git a/app/portainer/views/auth/authController.js b/app/portainer/views/auth/authController.js index b5f7a4b0f..f87d2271a 100644 --- a/app/portainer/views/auth/authController.js +++ b/app/portainer/views/auth/authController.js @@ -40,6 +40,8 @@ class AuthenticationController { Password: '', }; this.state = { + showOAuthLogin: false, + showStandardLogin: false, AuthenticationError: '', loginInProgress: true, OAuthProvider: '', @@ -222,12 +224,17 @@ class AuthenticationController { } } + toggleStandardLogin() { + this.state.showStandardLogin = !this.state.showStandardLogin; + } + async onInit() { try { const settings = await this.SettingsService.publicSettings(); - this.AuthenticationMethod = settings.AuthenticationMethod; - this.state.OAuthProvider = this.determineOauthProvider(settings.OAuthLoginURI); + this.state.showOAuthLogin = settings.AuthenticationMethod === 3; + this.state.showStandardLogin = !this.state.showOAuthLogin; this.state.OAuthLoginURI = settings.OAuthLoginURI; + this.state.OAuthProvider = this.determineOauthProvider(settings.OAuthLoginURI); const code = this.URLHelper.getParameter('code'); const state = this.URLHelper.getParameter('state'); From 769e6a4c6c7a739df20353548044510617fd14a9 Mon Sep 17 00:00:00 2001 From: Alice Groux Date: Sun, 10 Jan 2021 23:30:31 +0100 Subject: [PATCH 047/157] feat(k8s/configuration): add extra information panel when creating a sensitive configuration (#4541) --- .../configurations/create/createConfiguration.html | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/app/kubernetes/views/configurations/create/createConfiguration.html b/app/kubernetes/views/configurations/create/createConfiguration.html index 446f7a334..b258473f2 100644 --- a/app/kubernetes/views/configurations/create/createConfiguration.html +++ b/app/kubernetes/views/configurations/create/createConfiguration.html @@ -106,6 +106,16 @@
    +
    + Information +
    +
    +
    + Creating a sensitive configuration will create a Kubernetes Secret of type Opaque. You can find more information about this in the + official documentation. +
    +
    + From 51ba0876a5ce0b033a229a64423416aa1ed2eb0d Mon Sep 17 00:00:00 2001 From: Alice Groux Date: Mon, 11 Jan 2021 00:51:46 +0100 Subject: [PATCH 048/157] feat(k8s/configuration): rename add ingress controller button and changed information text (#4540) --- app/kubernetes/views/configure/configure.html | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/kubernetes/views/configure/configure.html b/app/kubernetes/views/configure/configure.html index 68a506561..a94bcc2e0 100644 --- a/app/kubernetes/views/configure/configure.html +++ b/app/kubernetes/views/configure/configure.html @@ -33,7 +33,7 @@
    - Adding ingress controllers will allow users to expose application they deploy over a HTTP route.
    + Configuring ingress controllers will allow users to expose application they deploy over a HTTP route.

    Ingress classes must be manually specified for each controller you want to use in the cluster. Make sure that each controller is running inside your cluster. @@ -44,7 +44,7 @@

    - add ingress controller + configure ingress controller
    From 6a504e71345b4fb4fe2cd77ceaf4cdbca906a36c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Busso?= Date: Mon, 11 Jan 2021 14:44:15 +1300 Subject: [PATCH 049/157] fix(settings): Use default setting if UserSessionTimeout not set (#4521) * fix(settings): Use default settings if UserSessionTimeout not set * Update UserSessionTimeout settings in database if set to empty string --- api/cmd/portainer/main.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/api/cmd/portainer/main.go b/api/cmd/portainer/main.go index 5d83916be..65e45f216 100644 --- a/api/cmd/portainer/main.go +++ b/api/cmd/portainer/main.go @@ -6,7 +6,7 @@ import ( "strings" "time" - "github.com/portainer/portainer/api" + portainer "github.com/portainer/portainer/api" "github.com/portainer/portainer/api/bolt" "github.com/portainer/portainer/api/chisel" "github.com/portainer/portainer/api/cli" @@ -89,6 +89,10 @@ func initJWTService(dataStore portainer.DataStore) (portainer.JWTService, error) return nil, err } + if settings.UserSessionTimeout == "" { + settings.UserSessionTimeout = portainer.DefaultUserSessionTimeout + dataStore.Settings().UpdateSettings(settings) + } jwtService, err := jwt.NewService(settings.UserSessionTimeout) if err != nil { return nil, err From b9fe8009dd6b1351ac7bc458967baeed48d1ffe2 Mon Sep 17 00:00:00 2001 From: DarkAEther <30438425+DarkAEther@users.noreply.github.com> Date: Mon, 11 Jan 2021 08:05:19 +0530 Subject: [PATCH 050/157] feat(image-details): Show labels in images datatable (#4287) * feat(images): show labels in images datatable * move labels to image details view --- app/docker/models/image.js | 2 +- app/docker/models/imageDetails.js | 1 + app/docker/views/images/edit/image.html | 11 +++++++++++ 3 files changed, 13 insertions(+), 1 deletion(-) diff --git a/app/docker/models/image.js b/app/docker/models/image.js index 414e0b77d..b0d2417e9 100644 --- a/app/docker/models/image.js +++ b/app/docker/models/image.js @@ -4,7 +4,6 @@ export function ImageViewModel(data) { this.Repository = data.Repository; this.Created = data.Created; this.Checked = false; - this.RepoTags = data.RepoTags; if (!this.RepoTags && data.RepoDigests) { this.RepoTags = []; @@ -21,6 +20,7 @@ export function ImageViewModel(data) { if (data.Portainer && data.Portainer.Agent && data.Portainer.Agent.NodeName) { this.NodeName = data.Portainer.Agent.NodeName; } + this.Labels = data.Labels; } export function ImageBuildModel(data) { diff --git a/app/docker/models/imageDetails.js b/app/docker/models/imageDetails.js index 8e8285ca7..50fbdebba 100644 --- a/app/docker/models/imageDetails.js +++ b/app/docker/models/imageDetails.js @@ -16,4 +16,5 @@ export function ImageDetailsViewModel(data) { this.ExposedPorts = data.ContainerConfig.ExposedPorts ? Object.keys(data.ContainerConfig.ExposedPorts) : []; this.Volumes = data.ContainerConfig.Volumes ? Object.keys(data.ContainerConfig.Volumes) : []; this.Env = data.ContainerConfig.Env ? data.ContainerConfig.Env : []; + this.Labels = data.ContainerConfig.Labels; } diff --git a/app/docker/views/images/edit/image.html b/app/docker/views/images/edit/image.html index ba3de195a..b8a686edb 100644 --- a/app/docker/views/images/edit/image.html +++ b/app/docker/views/images/edit/image.html @@ -128,6 +128,17 @@ Build Docker {{ image.DockerVersion }} on {{ image.Os }}, {{ image.Architecture }} + + Labels + + + + + + +
    {{ k }}{{ v }}
    + + Author {{ image.Author }} From cbd7fdc62ebd667cf3c6671c664e74da7743d911 Mon Sep 17 00:00:00 2001 From: Chaim Lev-Ari Date: Tue, 12 Jan 2021 01:38:49 +0200 Subject: [PATCH 051/157] feat(docker/stacks): introduce date info for stacks (#4660) * feat(docker/stacks): add creation and update dates * feat(docker/stacks): put ownership column as the last column * feat(docker/stacks): fix the no stacks message * refactor(docker/stacks): make external stacks helpers more readable * feat(docker/stacks): add updated and created by * feat(docker/stacks): toggle updated column * refactor(datatable): create column visibility component Co-authored-by: alice groux --- .../handler/stacks/create_compose_stack.go | 54 ++++++----- api/http/handler/stacks/create_swarm_stack.go | 60 +++++++----- api/http/handler/stacks/stack_update.go | 9 +- api/portainer.go | 4 + .../containersDatatable.html | 96 +------------------ .../containersDatatableController.js | 12 +-- ...datatable-columns-visibility.controller.js | 7 ++ .../datatable-columns-visibility.html | 19 ++++ .../datatable-columns-visibility/index.js | 12 +++ .../datatables/genericDatatableController.js | 6 ++ .../stacks-datatable/stacksDatatable.html | 27 +++++- .../stacksDatatableController.js | 23 +++++ app/portainer/helpers/stackHelper.js | 36 +++---- app/portainer/models/stack.js | 7 +- app/portainer/services/api/stackService.js | 20 +--- 15 files changed, 202 insertions(+), 190 deletions(-) create mode 100644 app/portainer/components/datatables/datatable-columns-visibility/datatable-columns-visibility.controller.js create mode 100644 app/portainer/components/datatables/datatable-columns-visibility/datatable-columns-visibility.html create mode 100644 app/portainer/components/datatables/datatable-columns-visibility/index.js diff --git a/api/http/handler/stacks/create_compose_stack.go b/api/http/handler/stacks/create_compose_stack.go index 6ceab991c..d81a55798 100644 --- a/api/http/handler/stacks/create_compose_stack.go +++ b/api/http/handler/stacks/create_compose_stack.go @@ -7,11 +7,12 @@ import ( "regexp" "strconv" "strings" + "time" "github.com/asaskevich/govalidator" httperror "github.com/portainer/libhttp/error" "github.com/portainer/libhttp/request" - "github.com/portainer/portainer/api" + portainer "github.com/portainer/portainer/api" "github.com/portainer/portainer/api/filesystem" "github.com/portainer/portainer/api/http/security" ) @@ -60,13 +61,14 @@ func (handler *Handler) createComposeStackFromFileContent(w http.ResponseWriter, stackID := handler.DataStore.Stack().GetNextIdentifier() stack := &portainer.Stack{ - ID: portainer.StackID(stackID), - Name: payload.Name, - Type: portainer.DockerComposeStack, - EndpointID: endpoint.ID, - EntryPoint: filesystem.ComposeFileDefaultName, - Env: payload.Env, - Status: portainer.StackStatusActive, + ID: portainer.StackID(stackID), + Name: payload.Name, + Type: portainer.DockerComposeStack, + EndpointID: endpoint.ID, + EntryPoint: filesystem.ComposeFileDefaultName, + Env: payload.Env, + Status: portainer.StackStatusActive, + CreationDate: time.Now().Unix(), } stackFolder := strconv.Itoa(int(stack.ID)) @@ -89,6 +91,8 @@ func (handler *Handler) createComposeStackFromFileContent(w http.ResponseWriter, return &httperror.HandlerError{http.StatusInternalServerError, err.Error(), err} } + stack.CreatedBy = config.user.Username + err = handler.DataStore.Stack().CreateStack(stack) if err != nil { return &httperror.HandlerError{http.StatusInternalServerError, "Unable to persist the stack inside the database", err} @@ -146,13 +150,14 @@ func (handler *Handler) createComposeStackFromGitRepository(w http.ResponseWrite stackID := handler.DataStore.Stack().GetNextIdentifier() stack := &portainer.Stack{ - ID: portainer.StackID(stackID), - Name: payload.Name, - Type: portainer.DockerComposeStack, - EndpointID: endpoint.ID, - EntryPoint: payload.ComposeFilePathInRepository, - Env: payload.Env, - Status: portainer.StackStatusActive, + ID: portainer.StackID(stackID), + Name: payload.Name, + Type: portainer.DockerComposeStack, + EndpointID: endpoint.ID, + EntryPoint: payload.ComposeFilePathInRepository, + Env: payload.Env, + Status: portainer.StackStatusActive, + CreationDate: time.Now().Unix(), } projectPath := handler.FileService.GetStackProjectPath(strconv.Itoa(int(stack.ID))) @@ -185,6 +190,8 @@ func (handler *Handler) createComposeStackFromGitRepository(w http.ResponseWrite return &httperror.HandlerError{http.StatusInternalServerError, err.Error(), err} } + stack.CreatedBy = config.user.Username + err = handler.DataStore.Stack().CreateStack(stack) if err != nil { return &httperror.HandlerError{http.StatusInternalServerError, "Unable to persist the stack inside the database", err} @@ -242,13 +249,14 @@ func (handler *Handler) createComposeStackFromFileUpload(w http.ResponseWriter, stackID := handler.DataStore.Stack().GetNextIdentifier() stack := &portainer.Stack{ - ID: portainer.StackID(stackID), - Name: payload.Name, - Type: portainer.DockerComposeStack, - EndpointID: endpoint.ID, - EntryPoint: filesystem.ComposeFileDefaultName, - Env: payload.Env, - Status: portainer.StackStatusActive, + ID: portainer.StackID(stackID), + Name: payload.Name, + Type: portainer.DockerComposeStack, + EndpointID: endpoint.ID, + EntryPoint: filesystem.ComposeFileDefaultName, + Env: payload.Env, + Status: portainer.StackStatusActive, + CreationDate: time.Now().Unix(), } stackFolder := strconv.Itoa(int(stack.ID)) @@ -271,6 +279,8 @@ func (handler *Handler) createComposeStackFromFileUpload(w http.ResponseWriter, return &httperror.HandlerError{http.StatusInternalServerError, err.Error(), err} } + stack.CreatedBy = config.user.Username + err = handler.DataStore.Stack().CreateStack(stack) if err != nil { return &httperror.HandlerError{http.StatusInternalServerError, "Unable to persist the stack inside the database", err} diff --git a/api/http/handler/stacks/create_swarm_stack.go b/api/http/handler/stacks/create_swarm_stack.go index 0113e8a41..f7afbdeb5 100644 --- a/api/http/handler/stacks/create_swarm_stack.go +++ b/api/http/handler/stacks/create_swarm_stack.go @@ -6,11 +6,12 @@ import ( "path" "strconv" "strings" + "time" "github.com/asaskevich/govalidator" httperror "github.com/portainer/libhttp/error" "github.com/portainer/libhttp/request" - "github.com/portainer/portainer/api" + portainer "github.com/portainer/portainer/api" "github.com/portainer/portainer/api/filesystem" "github.com/portainer/portainer/api/http/security" ) @@ -55,14 +56,15 @@ func (handler *Handler) createSwarmStackFromFileContent(w http.ResponseWriter, r stackID := handler.DataStore.Stack().GetNextIdentifier() stack := &portainer.Stack{ - ID: portainer.StackID(stackID), - Name: payload.Name, - Type: portainer.DockerSwarmStack, - SwarmID: payload.SwarmID, - EndpointID: endpoint.ID, - EntryPoint: filesystem.ComposeFileDefaultName, - Env: payload.Env, - Status: portainer.StackStatusActive, + ID: portainer.StackID(stackID), + Name: payload.Name, + Type: portainer.DockerSwarmStack, + SwarmID: payload.SwarmID, + EndpointID: endpoint.ID, + EntryPoint: filesystem.ComposeFileDefaultName, + Env: payload.Env, + Status: portainer.StackStatusActive, + CreationDate: time.Now().Unix(), } stackFolder := strconv.Itoa(int(stack.ID)) @@ -85,6 +87,8 @@ func (handler *Handler) createSwarmStackFromFileContent(w http.ResponseWriter, r return &httperror.HandlerError{http.StatusInternalServerError, err.Error(), err} } + stack.CreatedBy = config.user.Username + err = handler.DataStore.Stack().CreateStack(stack) if err != nil { return &httperror.HandlerError{http.StatusInternalServerError, "Unable to persist the stack inside the database", err} @@ -145,14 +149,15 @@ func (handler *Handler) createSwarmStackFromGitRepository(w http.ResponseWriter, stackID := handler.DataStore.Stack().GetNextIdentifier() stack := &portainer.Stack{ - ID: portainer.StackID(stackID), - Name: payload.Name, - Type: portainer.DockerSwarmStack, - SwarmID: payload.SwarmID, - EndpointID: endpoint.ID, - EntryPoint: payload.ComposeFilePathInRepository, - Env: payload.Env, - Status: portainer.StackStatusActive, + ID: portainer.StackID(stackID), + Name: payload.Name, + Type: portainer.DockerSwarmStack, + SwarmID: payload.SwarmID, + EndpointID: endpoint.ID, + EntryPoint: payload.ComposeFilePathInRepository, + Env: payload.Env, + Status: portainer.StackStatusActive, + CreationDate: time.Now().Unix(), } projectPath := handler.FileService.GetStackProjectPath(strconv.Itoa(int(stack.ID))) @@ -185,6 +190,8 @@ func (handler *Handler) createSwarmStackFromGitRepository(w http.ResponseWriter, return &httperror.HandlerError{http.StatusInternalServerError, err.Error(), err} } + stack.CreatedBy = config.user.Username + err = handler.DataStore.Stack().CreateStack(stack) if err != nil { return &httperror.HandlerError{http.StatusInternalServerError, "Unable to persist the stack inside the database", err} @@ -249,14 +256,15 @@ func (handler *Handler) createSwarmStackFromFileUpload(w http.ResponseWriter, r stackID := handler.DataStore.Stack().GetNextIdentifier() stack := &portainer.Stack{ - ID: portainer.StackID(stackID), - Name: payload.Name, - Type: portainer.DockerSwarmStack, - SwarmID: payload.SwarmID, - EndpointID: endpoint.ID, - EntryPoint: filesystem.ComposeFileDefaultName, - Env: payload.Env, - Status: portainer.StackStatusActive, + ID: portainer.StackID(stackID), + Name: payload.Name, + Type: portainer.DockerSwarmStack, + SwarmID: payload.SwarmID, + EndpointID: endpoint.ID, + EntryPoint: filesystem.ComposeFileDefaultName, + Env: payload.Env, + Status: portainer.StackStatusActive, + CreationDate: time.Now().Unix(), } stackFolder := strconv.Itoa(int(stack.ID)) @@ -279,6 +287,8 @@ func (handler *Handler) createSwarmStackFromFileUpload(w http.ResponseWriter, r return &httperror.HandlerError{http.StatusInternalServerError, err.Error(), err} } + stack.CreatedBy = config.user.Username + err = handler.DataStore.Stack().CreateStack(stack) if err != nil { return &httperror.HandlerError{http.StatusInternalServerError, "Unable to persist the stack inside the database", err} diff --git a/api/http/handler/stacks/stack_update.go b/api/http/handler/stacks/stack_update.go index df4178f8f..adc1ca792 100644 --- a/api/http/handler/stacks/stack_update.go +++ b/api/http/handler/stacks/stack_update.go @@ -4,12 +4,13 @@ import ( "errors" "net/http" "strconv" + "time" "github.com/asaskevich/govalidator" httperror "github.com/portainer/libhttp/error" "github.com/portainer/libhttp/request" "github.com/portainer/libhttp/response" - "github.com/portainer/portainer/api" + portainer "github.com/portainer/portainer/api" bolterrors "github.com/portainer/portainer/api/bolt/errors" httperrors "github.com/portainer/portainer/api/http/errors" "github.com/portainer/portainer/api/http/security" @@ -135,6 +136,9 @@ func (handler *Handler) updateComposeStack(r *http.Request, stack *portainer.Sta return configErr } + stack.UpdateDate = time.Now().Unix() + stack.UpdatedBy = config.user.Username + err = handler.deployComposeStack(config) if err != nil { return &httperror.HandlerError{http.StatusInternalServerError, err.Error(), err} @@ -163,6 +167,9 @@ func (handler *Handler) updateSwarmStack(r *http.Request, stack *portainer.Stack return configErr } + stack.UpdateDate = time.Now().Unix() + stack.UpdatedBy = config.user.Username + err = handler.deploySwarmStack(config) if err != nil { return &httperror.HandlerError{http.StatusInternalServerError, err.Error(), err} diff --git a/api/portainer.go b/api/portainer.go index 64197edef..62e872918 100644 --- a/api/portainer.go +++ b/api/portainer.go @@ -554,6 +554,10 @@ type ( Env []Pair `json:"Env"` ResourceControl *ResourceControl `json:"ResourceControl"` Status StackStatus `json:"Status"` + CreationDate int64 + CreatedBy string + UpdateDate int64 + UpdatedBy string ProjectPath string } diff --git a/app/docker/components/datatables/containers-datatable/containersDatatable.html b/app/docker/components/datatables/containers-datatable/containersDatatable.html index 9ba136c4c..36835997d 100644 --- a/app/docker/components/datatables/containers-datatable/containersDatatable.html +++ b/app/docker/components/datatables/containers-datatable/containersDatatable.html @@ -4,100 +4,8 @@
    {{ $ctrl.titleText }}
    - - Columns -
    -
    -
    - Show / Hide Columns -
    -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    - - -
    -
    -     -
    -
    - + + Settings
    diff --git a/app/docker/components/datatables/containers-datatable/containersDatatableController.js b/app/docker/components/datatables/containers-datatable/containersDatatableController.js index cc02ab678..bbaf52b8c 100644 --- a/app/docker/components/datatables/containers-datatable/containersDatatableController.js +++ b/app/docker/components/datatables/containers-datatable/containersDatatableController.js @@ -36,9 +36,6 @@ angular.module('portainer.docker').controller('ContainersDatatableController', [ }; this.columnVisibility = { - state: { - open: false, - }, columns: { state: { label: 'State', @@ -75,9 +72,11 @@ angular.module('portainer.docker').controller('ContainersDatatableController', [ }, }; - this.onColumnVisibilityChange = function (columnVisibility) { - DatatableService.setColumnVisibilitySettings(this.tableKey, columnVisibility); - }; + this.onColumnVisibilityChange = onColumnVisibilityChange.bind(this); + function onColumnVisibilityChange(columns) { + this.columnVisibility.columns = columns; + DatatableService.setColumnVisibilitySettings(this.tableKey, this.columnVisibility); + } this.onSelectionChanged = function () { this.updateSelectionState(); @@ -199,7 +198,6 @@ angular.module('portainer.docker').controller('ContainersDatatableController', [ var storedColumnVisibility = DatatableService.getColumnVisibilitySettings(this.tableKey); if (storedColumnVisibility !== null) { this.columnVisibility = storedColumnVisibility; - this.columnVisibility.state.open = false; } }; }, diff --git a/app/portainer/components/datatables/datatable-columns-visibility/datatable-columns-visibility.controller.js b/app/portainer/components/datatables/datatable-columns-visibility/datatable-columns-visibility.controller.js new file mode 100644 index 000000000..d4597e769 --- /dev/null +++ b/app/portainer/components/datatables/datatable-columns-visibility/datatable-columns-visibility.controller.js @@ -0,0 +1,7 @@ +export default class DatatableColumnsVisibilityController { + constructor() { + this.state = { + isOpen: false, + }; + } +} diff --git a/app/portainer/components/datatables/datatable-columns-visibility/datatable-columns-visibility.html b/app/portainer/components/datatables/datatable-columns-visibility/datatable-columns-visibility.html new file mode 100644 index 000000000..dc8668edd --- /dev/null +++ b/app/portainer/components/datatables/datatable-columns-visibility/datatable-columns-visibility.html @@ -0,0 +1,19 @@ + + Columns +
    +
    +
    + Show / Hide Columns +
    +
    +
    + + +
    +
    +
    + Close +
    +
    +
    +     diff --git a/app/portainer/components/datatables/datatable-columns-visibility/index.js b/app/portainer/components/datatables/datatable-columns-visibility/index.js new file mode 100644 index 000000000..22b9c4463 --- /dev/null +++ b/app/portainer/components/datatables/datatable-columns-visibility/index.js @@ -0,0 +1,12 @@ +import angular from 'angular'; + +import controller from './datatable-columns-visibility.controller'; + +angular.module('portainer.app').component('datatableColumnsVisibility', { + templateUrl: './datatable-columns-visibility.html', + controller, + bindings: { + columns: '<', + onChange: '<', + }, +}); diff --git a/app/portainer/components/datatables/genericDatatableController.js b/app/portainer/components/datatables/genericDatatableController.js index 8567dcb87..60a7a2fe6 100644 --- a/app/portainer/components/datatables/genericDatatableController.js +++ b/app/portainer/components/datatables/genericDatatableController.js @@ -33,6 +33,7 @@ angular.module('portainer.app').controller('GenericDatatableController', [ refreshRate: '30', }, }; + this.resetSelectionState = function () { this.state.selectAll = false; this.state.selectedItems = []; @@ -158,6 +159,11 @@ angular.module('portainer.app').controller('GenericDatatableController', [ this.settings.open = false; } this.onSettingsRepeaterChange(); + + var storedColumnVisibility = DatatableService.getColumnVisibilitySettings(this.tableKey); + if (storedColumnVisibility !== null) { + this.columnVisibility = storedColumnVisibility; + } }; /** diff --git a/app/portainer/components/datatables/stacks-datatable/stacksDatatable.html b/app/portainer/components/datatables/stacks-datatable/stacksDatatable.html index 1bd2c313d..3612faeaa 100644 --- a/app/portainer/components/datatables/stacks-datatable/stacksDatatable.html +++ b/app/portainer/components/datatables/stacks-datatable/stacksDatatable.html @@ -4,6 +4,7 @@
    {{ $ctrl.titleText }}
    + Settings
    @@ -117,6 +118,20 @@ Control + + + Created + + + + + + + Updated + + + + Ownership @@ -154,6 +169,14 @@ Total + + {{ item.CreationDate | getisodatefromtimestamp }} {{ item.CreatedBy ? 'by ' + item.CreatedBy : '' }} + - + + + {{ item.UpdateDate | getisodatefromtimestamp }} {{ item.UpdatedBy ? 'by ' + item.UpdatedBy : '' }} + - + @@ -162,10 +185,10 @@ - Loading... + Loading... - No stack available. + No stack available. diff --git a/app/portainer/components/datatables/stacks-datatable/stacksDatatableController.js b/app/portainer/components/datatables/stacks-datatable/stacksDatatableController.js index 94b0ec0f4..3fe0f6b7c 100644 --- a/app/portainer/components/datatables/stacks-datatable/stacksDatatableController.js +++ b/app/portainer/components/datatables/stacks-datatable/stacksDatatableController.js @@ -15,6 +15,24 @@ angular.module('portainer.app').controller('StacksDatatableController', [ }, }; + this.columnVisibility = { + state: { + open: false, + }, + columns: { + updated: { + label: 'Updated', + display: false, + }, + }, + }; + + this.onColumnVisibilityChange = onColumnVisibilityChange.bind(this); + function onColumnVisibilityChange(columns) { + this.columnVisibility.columns = columns; + DatatableService.setColumnVisibilitySettings(this.tableKey, this.columnVisibility); + } + /** * Do not allow external items */ @@ -71,6 +89,11 @@ angular.module('portainer.app').controller('StacksDatatableController', [ this.settings.open = false; } this.onSettingsRepeaterChange(); + + var storedColumnVisibility = DatatableService.getColumnVisibilitySettings(this.tableKey); + if (storedColumnVisibility !== null) { + this.columnVisibility = storedColumnVisibility; + } }; }, ]); diff --git a/app/portainer/helpers/stackHelper.js b/app/portainer/helpers/stackHelper.js index b9beb6172..77d43949b 100644 --- a/app/portainer/helpers/stackHelper.js +++ b/app/portainer/helpers/stackHelper.js @@ -1,37 +1,27 @@ import _ from 'lodash-es'; +import { ExternalStackViewModel } from '@/portainer/models/stack'; + angular.module('portainer.app').factory('StackHelper', [ function StackHelperFactory() { 'use strict'; var helper = {}; - helper.getExternalStackNamesFromContainers = function (containers) { - var stackNames = []; - - for (var i = 0; i < containers.length; i++) { - var container = containers[i]; - if (!container.Labels || !container.Labels['com.docker.compose.project']) continue; - var stackName = container.Labels['com.docker.compose.project']; - stackNames.push(stackName); - } - - return _.uniq(stackNames); + helper.getExternalStacksFromContainers = function (containers) { + return getExternalStacksFromLabel(containers, 'com.docker.compose.project', 2); }; - helper.getExternalStackNamesFromServices = function (services) { - var stackNames = []; - - for (var i = 0; i < services.length; i++) { - var service = services[i]; - if (!service.Labels || !service.Labels['com.docker.stack.namespace']) continue; - - var stackName = service.Labels['com.docker.stack.namespace']; - stackNames.push(stackName); - } - - return _.uniq(stackNames); + helper.getExternalStacksFromServices = function (services) { + return getExternalStacksFromLabel(services, 'com.docker.stack.namespace', 1); }; + function getExternalStacksFromLabel(items, label, type) { + return _.uniqBy( + items.filter((item) => item.Labels && item.Labels[label]).map((item) => new ExternalStackViewModel(item.Labels[label], type, item.Created)), + 'Name' + ); + } + return helper; }, ]); diff --git a/app/portainer/models/stack.js b/app/portainer/models/stack.js index ef28f97e3..c2c6d5d1a 100644 --- a/app/portainer/models/stack.js +++ b/app/portainer/models/stack.js @@ -13,11 +13,16 @@ export function StackViewModel(data) { } this.External = false; this.Status = data.Status; + this.CreationDate = data.CreationDate; + this.CreatedBy = data.CreatedBy; + this.UpdateDate = data.UpdateDate; + this.UpdatedBy = data.UpdatedBy; } -export function ExternalStackViewModel(name, type) { +export function ExternalStackViewModel(name, type, creationDate) { this.Name = name; this.Type = type; this.External = true; this.Checked = false; + this.CreationDate = creationDate; } diff --git a/app/portainer/services/api/stackService.js b/app/portainer/services/api/stackService.js index 68bebbd56..477740725 100644 --- a/app/portainer/services/api/stackService.js +++ b/app/portainer/services/api/stackService.js @@ -1,5 +1,5 @@ import _ from 'lodash-es'; -import { ExternalStackViewModel, StackViewModel } from '../../models/stack'; +import { StackViewModel } from '../../models/stack'; angular.module('portainer.app').factory('StackService', [ '$q', @@ -121,13 +121,8 @@ angular.module('portainer.app').factory('StackService', [ var deferred = $q.defer(); ServiceService.services() - .then(function success(data) { - var services = data; - var stackNames = StackHelper.getExternalStackNamesFromServices(services); - var stacks = stackNames.map(function (name) { - return new ExternalStackViewModel(name, 1); - }); - deferred.resolve(stacks); + .then(function success(services) { + deferred.resolve(StackHelper.getExternalStacksFromServices(services)); }) .catch(function error(err) { deferred.reject({ msg: 'Unable to retrieve external stacks', err: err }); @@ -140,13 +135,8 @@ angular.module('portainer.app').factory('StackService', [ var deferred = $q.defer(); ContainerService.containers(1) - .then(function success(data) { - var containers = data; - var stackNames = StackHelper.getExternalStackNamesFromContainers(containers); - var stacks = stackNames.map(function (name) { - return new ExternalStackViewModel(name, 2); - }); - deferred.resolve(stacks); + .then(function success(containers) { + deferred.resolve(StackHelper.getExternalStacksFromContainers(containers)); }) .catch(function error(err) { deferred.reject({ msg: 'Unable to retrieve external stacks', err: err }); From 4cd468ce21bb584cac765c55a132a927274a3680 Mon Sep 17 00:00:00 2001 From: Maxime Bajeux Date: Tue, 12 Jan 2021 02:35:59 +0100 Subject: [PATCH 052/157] Can't create kubernetes resources with a username longer than 63 characters (#4672) * fix(kubernetes): truncate username when we create resource * fix(k8s): remove forbidden characters in owner label --- app/kubernetes/converters/configMap.js | 3 ++- app/kubernetes/converters/daemonSet.js | 1 - app/kubernetes/converters/namespace.js | 4 +++- app/kubernetes/converters/secret.js | 3 ++- app/kubernetes/converters/service.js | 2 +- app/kubernetes/helpers/commonHelper.js | 6 +++++- 6 files changed, 13 insertions(+), 6 deletions(-) diff --git a/app/kubernetes/converters/configMap.js b/app/kubernetes/converters/configMap.js index 76c142145..1c3e09b63 100644 --- a/app/kubernetes/converters/configMap.js +++ b/app/kubernetes/converters/configMap.js @@ -39,7 +39,8 @@ class KubernetesConfigMapConverter { const res = new KubernetesConfigMapCreatePayload(); res.metadata.name = data.Name; res.metadata.namespace = data.Namespace; - res.metadata.labels[KubernetesPortainerConfigurationOwnerLabel] = data.ConfigurationOwner; + const configurationOwner = _.truncate(data.ConfigurationOwner, { length: 63, omission: '' }); + res.metadata.labels[KubernetesPortainerConfigurationOwnerLabel] = configurationOwner; res.data = data.Data; return res; } diff --git a/app/kubernetes/converters/daemonSet.js b/app/kubernetes/converters/daemonSet.js index 8360ca9a7..063005593 100644 --- a/app/kubernetes/converters/daemonSet.js +++ b/app/kubernetes/converters/daemonSet.js @@ -1,5 +1,4 @@ import * as JsonPatch from 'fast-json-patch'; - import { KubernetesDaemonSet } from 'Kubernetes/models/daemon-set/models'; import { KubernetesDaemonSetCreatePayload } from 'Kubernetes/models/daemon-set/payloads'; import { diff --git a/app/kubernetes/converters/namespace.js b/app/kubernetes/converters/namespace.js index 2a95a4c95..46f2c33e3 100644 --- a/app/kubernetes/converters/namespace.js +++ b/app/kubernetes/converters/namespace.js @@ -1,3 +1,4 @@ +import _ from 'lodash-es'; import { KubernetesNamespace } from 'Kubernetes/models/namespace/models'; import { KubernetesNamespaceCreatePayload } from 'Kubernetes/models/namespace/payloads'; import { KubernetesPortainerResourcePoolNameLabel, KubernetesPortainerResourcePoolOwnerLabel } from 'Kubernetes/models/resource-pool/models'; @@ -20,7 +21,8 @@ class KubernetesNamespaceConverter { res.metadata.name = namespace.Name; res.metadata.labels[KubernetesPortainerResourcePoolNameLabel] = namespace.ResourcePoolName; if (namespace.ResourcePoolOwner) { - res.metadata.labels[KubernetesPortainerResourcePoolOwnerLabel] = namespace.ResourcePoolOwner; + const resourcePoolOwner = _.truncate(namespace.ResourcePoolOwner, { length: 63, omission: '' }); + res.metadata.labels[KubernetesPortainerResourcePoolOwnerLabel] = resourcePoolOwner; } return res; } diff --git a/app/kubernetes/converters/secret.js b/app/kubernetes/converters/secret.js index 8c05e46bb..14eee19e5 100644 --- a/app/kubernetes/converters/secret.js +++ b/app/kubernetes/converters/secret.js @@ -9,7 +9,8 @@ class KubernetesSecretConverter { const res = new KubernetesSecretCreatePayload(); res.metadata.name = secret.Name; res.metadata.namespace = secret.Namespace; - res.metadata.labels[KubernetesPortainerConfigurationOwnerLabel] = secret.ConfigurationOwner; + const configurationOwner = _.truncate(secret.configurationOwner, { length: 63, omission: '' }); + res.metadata.labels[KubernetesPortainerConfigurationOwnerLabel] = configurationOwner; res.stringData = secret.Data; return res; } diff --git a/app/kubernetes/converters/service.js b/app/kubernetes/converters/service.js index 6376bf3d6..7c8897be5 100644 --- a/app/kubernetes/converters/service.js +++ b/app/kubernetes/converters/service.js @@ -69,7 +69,7 @@ class KubernetesServiceConverter { payload.metadata.namespace = service.Namespace; payload.metadata.labels[KubernetesPortainerApplicationStackNameLabel] = service.StackName; payload.metadata.labels[KubernetesPortainerApplicationNameLabel] = service.ApplicationName; - payload.metadata.labels[KubernetesPortainerApplicationOwnerLabel] = service.ApplicationOwner; + payload.metadata.labels[KubernetesPortainerApplicationOwnerLabel] = service.Application; payload.spec.ports = service.Ports; payload.spec.selector.app = service.ApplicationName; if (service.Headless) { diff --git a/app/kubernetes/helpers/commonHelper.js b/app/kubernetes/helpers/commonHelper.js index 9767de3b9..fab1bdf28 100644 --- a/app/kubernetes/helpers/commonHelper.js +++ b/app/kubernetes/helpers/commonHelper.js @@ -10,7 +10,11 @@ class KubernetesCommonHelper { } static ownerToLabel(owner) { - return _.replace(owner, /[^-A-Za-z0-9_.]/g, '.'); + let label = _.replace(owner, /[^-A-Za-z0-9_.]/g, '.'); + label = _.truncate(label, { length: 63, omission: '' }); + label = _.replace(label, /^[-_.]*/g, ''); + label = _.replace(label, /[-_.]*$/g, ''); + return label; } } export default KubernetesCommonHelper; From 486ffa5bbd424701b80210644a8f1133e482fc5e Mon Sep 17 00:00:00 2001 From: Chaim Lev-Ari Date: Tue, 12 Jan 2021 23:40:09 +0200 Subject: [PATCH 053/157] chore(webpack): add source maps (#4471) * chore(webpack): add source maps * feat(build): fetch source maps for 3rd party libs --- package.json | 1 + webpack/webpack.common.js | 5 +++ webpack/webpack.develop.js | 1 + webpack/webpack.production.js | 1 + yarn.lock | 70 ++++++++++++++++++++++++++++++++++- 5 files changed, 77 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index fb5a2ec7d..38938a011 100644 --- a/package.json +++ b/package.json @@ -82,6 +82,7 @@ "lodash-es": "^4.17.15", "moment": "^2.21.0", "ng-file-upload": "~12.2.13", + "source-map-loader": "^1.1.2", "spinkit": "^2.0.1", "splitargs": "github:deviantony/splitargs#semver:~0.2.0", "strip-ansi": "^6.0.0", diff --git a/webpack/webpack.common.js b/webpack/webpack.common.js index 21dea8091..684db2a8b 100644 --- a/webpack/webpack.common.js +++ b/webpack/webpack.common.js @@ -19,6 +19,11 @@ module.exports = { }, module: { rules: [ + { + test: /\.js$/, + enforce: 'pre', + use: ['source-map-loader'], + }, { test: /\.js$/, exclude: /node_modules/, diff --git a/webpack/webpack.develop.js b/webpack/webpack.develop.js index 05c8f64ff..5802a363b 100644 --- a/webpack/webpack.develop.js +++ b/webpack/webpack.develop.js @@ -4,6 +4,7 @@ const commonConfig = require('./webpack.common.js'); module.exports = webpackMerge(commonConfig, { mode: 'development', + devtool: 'eval-source-map', module: { rules: [ { diff --git a/webpack/webpack.production.js b/webpack/webpack.production.js index c516a4bee..5f2d8e331 100644 --- a/webpack/webpack.production.js +++ b/webpack/webpack.production.js @@ -3,6 +3,7 @@ const commonConfig = require('./webpack.common.js'); module.exports = webpackMerge(commonConfig, { mode: 'production', + devtool: 'source-map', module: { rules: [ { diff --git a/yarn.lock b/yarn.lock index c1d064749..f47449ba4 100644 --- a/yarn.lock +++ b/yarn.lock @@ -925,6 +925,11 @@ resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.5.tgz#dcce4430e64b443ba8945f0290fb564ad5bac6dd" integrity sha512-7+2BITlgjgDhH0vvwZU/HZJVyk+2XUlvxXe8dFMedNX/aMkaOq++rMAFXc0tM7ij15QaWlbdQASBR9dihi+bDQ== +"@types/json-schema@^7.0.6": + version "7.0.6" + resolved "https://registry.yarnpkg.com/@types/json-schema/-/json-schema-7.0.6.tgz#f4c7ec43e81b319a9815115031709f26987891f0" + integrity sha512-3c+yGKvVP5Y9TYBEibGNR+kLtijnj7mYrXRg+WpFb2X9xm04g/DXYkfg4hmzJQosc9snFNUPkbYIhu+KAm6jJw== + "@types/json5@^0.0.29": version "0.0.29" resolved "https://registry.yarnpkg.com/@types/json5/-/json5-0.0.29.tgz#ee28707ae94e11d2b827bcbe5270bcea7f3e71ee" @@ -1150,6 +1155,11 @@ LiveScript@1.0.1: dependencies: prelude-ls ">= 0.6.0" +abab@^2.0.5: + version "2.0.5" + resolved "https://registry.yarnpkg.com/abab/-/abab-2.0.5.tgz#c0b678fb32d60fc1219c784d6a826fe385aeb79a" + integrity sha512-9IK9EadsbHo6jLWIpxpR6pL0sazTXV6+SQv25ZB+F7Bj9mJNaOc4nCRabwd5M/JwmUa8idz6Eci6eKfJryPs6Q== + abbrev@1: version "1.1.1" resolved "https://registry.yarnpkg.com/abbrev/-/abbrev-1.1.1.tgz#f8f2c887ad10bf67f634f005b6987fed3179aac8" @@ -1225,6 +1235,11 @@ ajv-keywords@^3.1.0, ajv-keywords@^3.4.1: resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.0.tgz#5c894537098785926d71e696114a53ce768ed773" integrity sha512-eyoaac3btgU8eJlvh01En8OCKzRqlLe2G5jDsCr3RiE2uLGMEEB1aaGwVVpwR8M95956tGH6R+9edC++OvzaVw== +ajv-keywords@^3.5.2: + version "3.5.2" + resolved "https://registry.yarnpkg.com/ajv-keywords/-/ajv-keywords-3.5.2.tgz#31f29da5ab6e00d1c2d329acf7b5929614d5014d" + integrity sha512-5p6WTN0DdTGVQk6VjcEju19IgaHudalcfabD7yhDGeA6bcQnmL+CpveLJq/3hvfwd1aof6L386Ougkx6RfyMIQ== + ajv@^4.7.0: version "4.11.8" resolved "https://registry.yarnpkg.com/ajv/-/ajv-4.11.8.tgz#82ffb02b29e662ae53bdc20af15947706739c536" @@ -1253,6 +1268,16 @@ ajv@^6.12.3: json-schema-traverse "^0.4.1" uri-js "^4.2.2" +ajv@^6.12.5: + version "6.12.6" + resolved "https://registry.yarnpkg.com/ajv/-/ajv-6.12.6.tgz#baf5a62e802b07d977034586f8c3baf5adf26df4" + integrity sha512-j3fVLgvTo527anyYyJOGTYJbG+vnnQYvE0m5mmkc1TK+nxAppkCLMIL0aZ4dblVCNoGShhm+kzE4ZUykBoMg4g== + dependencies: + fast-deep-equal "^3.1.1" + fast-json-stable-stringify "^2.0.0" + json-schema-traverse "^0.4.1" + uri-js "^4.2.2" + alphanum-sort@^1.0.1, alphanum-sort@^1.0.2: version "1.0.2" resolved "https://registry.yarnpkg.com/alphanum-sort/-/alphanum-sort-1.0.2.tgz#97a1119649b211ad33691d9f9f486a8ec9fbe0a3" @@ -1327,6 +1352,7 @@ angular-moment-picker@^0.10.2: dependencies: angular-mocks "1.6.1" angular-sanitize "1.6.1" + lodash-es "^4.17.15" angular-resource@1.8.0: version "1.8.0" @@ -5748,6 +5774,13 @@ iconv-lite@0.4.24, iconv-lite@^0.4.24, iconv-lite@~0.4.13: dependencies: safer-buffer ">= 2.1.2 < 3" +iconv-lite@^0.6.2: + version "0.6.2" + resolved "https://registry.yarnpkg.com/iconv-lite/-/iconv-lite-0.6.2.tgz#ce13d1875b0c3a674bd6a04b7f76b01b1b6ded01" + integrity sha512-2y91h5OpQlolefMPmUlivelittSWy0rP+oYVpn6A7GwVHNE8AWzoYOBNmlwks3LobaJxgHCYZAnyNo2GgpNRNQ== + dependencies: + safer-buffer ">= 2.1.2 < 3.0.0" + icss-replace-symbols@^1.1.0: version "1.1.0" resolved "https://registry.yarnpkg.com/icss-replace-symbols/-/icss-replace-symbols-1.1.0.tgz#06ea6f83679a7749e386cfe1fe812ae5db223ded" @@ -6923,6 +6956,15 @@ loader-utils@^1.0.2, loader-utils@^1.1.0, loader-utils@^1.2.3, loader-utils@^1.4 emojis-list "^3.0.0" json5 "^1.0.1" +loader-utils@^2.0.0: + version "2.0.0" + resolved "https://registry.yarnpkg.com/loader-utils/-/loader-utils-2.0.0.tgz#e4cace5b816d425a166b5f097e10cd12b36064b0" + integrity sha512-rP4F0h2RaWSvPEkD7BLDFQnvSf+nK+wr3ESUjNTyAGobqrijmW92zc+SO6d4p4B1wh7+B/Jg1mkQe5NYUEHtHQ== + dependencies: + big.js "^5.2.2" + emojis-list "^3.0.0" + json5 "^2.1.2" + locate-path@^2.0.0: version "2.0.0" resolved "https://registry.yarnpkg.com/locate-path/-/locate-path-2.0.0.tgz#2b568b265eec944c6d9c0de9c3dbbbca0354cd8e" @@ -9521,7 +9563,7 @@ safe-regex@^1.1.0: dependencies: ret "~0.1.10" -"safer-buffer@>= 2.1.2 < 3", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: +"safer-buffer@>= 2.1.2 < 3", "safer-buffer@>= 2.1.2 < 3.0.0", safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: version "2.1.2" resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== @@ -9557,6 +9599,15 @@ schema-utils@^2.6.5: ajv "^6.12.2" ajv-keywords "^3.4.1" +schema-utils@^3.0.0: + version "3.0.0" + resolved "https://registry.yarnpkg.com/schema-utils/-/schema-utils-3.0.0.tgz#67502f6aa2b66a2d4032b4279a2944978a0913ef" + integrity sha512-6D82/xSzO094ajanoOSbe4YvXWMfn2A//8Y1+MUqFAJul5Bs+yn36xbK9OtNDcRVSBJ9jjeoXftM6CfztsjOAA== + dependencies: + "@types/json-schema" "^7.0.6" + ajv "^6.12.5" + ajv-keywords "^3.5.2" + seek-bzip@^1.0.5: version "1.0.5" resolved "https://registry.yarnpkg.com/seek-bzip/-/seek-bzip-1.0.5.tgz#cfe917cb3d274bcffac792758af53173eb1fabdc" @@ -9903,6 +9954,18 @@ source-list-map@^2.0.0: resolved "https://registry.yarnpkg.com/source-list-map/-/source-list-map-2.0.1.tgz#3993bd873bfc48479cca9ea3a547835c7c154b34" integrity sha512-qnQ7gVMxGNxsiL4lEuJwe/To8UnK7fAnmbGEEH8RpLouuKbeEm0lhbQVFIrNSuB+G7tVrAlVsZgETT5nljf+Iw== +source-map-loader@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/source-map-loader/-/source-map-loader-1.1.2.tgz#5b782bf08496d3a7f355e1780df0e25190a80991" + integrity sha512-bjf6eSENOYBX4JZDfl9vVLNsGAQ6Uz90fLmOazcmMcyDYOBFsGxPNn83jXezWLY9bJsVAo1ObztxPcV8HAbjVA== + dependencies: + abab "^2.0.5" + iconv-lite "^0.6.2" + loader-utils "^2.0.0" + schema-utils "^3.0.0" + source-map "^0.6.1" + whatwg-mimetype "^2.3.0" + source-map-resolve@^0.5.0: version "0.5.3" resolved "https://registry.yarnpkg.com/source-map-resolve/-/source-map-resolve-0.5.3.tgz#190866bece7553e1f8f267a2ee82c606b5509a1a" @@ -11175,6 +11238,11 @@ websocket-extensions@>=0.1.1: resolved "https://registry.yarnpkg.com/websocket-extensions/-/websocket-extensions-0.1.4.tgz#7f8473bc839dfd87608adb95d7eb075211578a42" integrity sha512-OqedPIGOfsDlo31UNwYbCFMSaO9m9G/0faIHj5/dZFDMFqPTcx6UwqyOy3COEaEOg/9VsGIpdqn62W5KhoKSpg== +whatwg-mimetype@^2.3.0: + version "2.3.0" + resolved "https://registry.yarnpkg.com/whatwg-mimetype/-/whatwg-mimetype-2.3.0.tgz#3d4b1e0312d2079879f826aff18dbeeca5960fbf" + integrity sha512-M4yMwr6mAnQz76TbJm914+gPpB/nCwvZbJU28cUD6dR004SAxDLOOSUaB1JDRqLtaOV/vi0IC5lEAGFgrjGv/g== + whet.extend@~0.9.9: version "0.9.9" resolved "https://registry.yarnpkg.com/whet.extend/-/whet.extend-0.9.9.tgz#f877d5bf648c97e5aa542fadc16d6a259b9c11a1" From 839198fbff92eb4429fd3f6bbff906fd4a96d72a Mon Sep 17 00:00:00 2001 From: Avadhut Tanugade <30384908+mrwhoknows55@users.noreply.github.com> Date: Wed, 13 Jan 2021 04:49:18 +0530 Subject: [PATCH 054/157] #4424 style(stack-details): shift button position in stack details (#4439) --- app/portainer/views/stacks/edit/stack.html | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/app/portainer/views/stacks/edit/stack.html b/app/portainer/views/stacks/edit/stack.html index bdf3f81f7..d665c49de 100644 --- a/app/portainer/views/stacks/edit/stack.html +++ b/app/portainer/views/stacks/edit/stack.html @@ -39,14 +39,6 @@
    {{ stackName }} - - Create template from stack - - + +
    From d336ada3c23716f57c24241926a945bafcaced34 Mon Sep 17 00:00:00 2001 From: Anthony Lapenna Date: Wed, 13 Jan 2021 16:13:27 +1300 Subject: [PATCH 055/157] feat(k8s/application): review application creation warning style (#4613) --- .../applications/create/createApplication.html | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/app/kubernetes/views/applications/create/createApplication.html b/app/kubernetes/views/applications/create/createApplication.html index e87c5db36..38bb3d04f 100644 --- a/app/kubernetes/views/applications/create/createApplication.html +++ b/app/kubernetes/views/applications/create/createApplication.html @@ -92,8 +92,8 @@
    -
    - +
    + This resource pool has exhausted its resource capacity and you will not be able to deploy the application. Contact your administrator to expand the capacity of the resource pool.
    @@ -634,8 +634,8 @@
    -
    - +
    + This resource pool has exhausted its resource capacity and you will not be able to deploy the application. Contact your administrator to expand the capacity of the resource pool.
    @@ -813,8 +813,8 @@
    -
    - +
    + This application would exceed available resources. Please review resource reservations or the instance count.
    @@ -930,8 +930,8 @@
    -
    - +
    + This application would exceed available resources. Please review resource reservations or the maximum instance count of the auto-scaling policy.
    From d1eddaa188e85bd0d0c8a20941fcd4ba392bf5b3 Mon Sep 17 00:00:00 2001 From: Alice Groux Date: Thu, 14 Jan 2021 00:24:56 +0100 Subject: [PATCH 056/157] feat(app/network): rename restrict external acces to the network label and add a tooltip (#4514) --- app/docker/views/networks/create/createnetwork.html | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/docker/views/networks/create/createnetwork.html b/app/docker/views/networks/create/createnetwork.html index 56a3f06bf..d352268af 100644 --- a/app/docker/views/networks/create/createnetwork.html +++ b/app/docker/views/networks/create/createnetwork.html @@ -196,7 +196,8 @@