Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-08-04 13:25:26 +02:00
Code Issues Releases Activity

feat(docker/services): Add the ability to edit a service networks (#3957)

Browse source 
* feat(services): update services details view

* feat(services): Add the ability to edit a service networks

* feat(services): show ingress network

* refactor(services): use lodash

* feat(networks): disable sending when updating

* feat(networks): limit size of select

* feat(services): update networks only when network is new

* feat(services): prevent submitting of empty networks

* feat(services): show unique networks

* fix(service): use empty array default for networks

* feat(service): show only swarm networks

* feat(services): show placeholder for network

* feat(services): show spaced select box

* feat(services): show macvlan ip

* feat(service): fetch the network subnet

* feat(services): show empty ip when network is not connected

Co-authored-by: Chaim Lev-Ari <chiptus@gmail.com>
This commit is contained in:
Maxime Bajeux 2020-08-07 01:11:47 +02:00 • committed by GitHub
parent e4ca58a042
commit d85708f6ea
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 123 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

70
app/docker/views/services/edit/serviceController.js
View file

@ -17,6 +17,7 @@ require('./includes/servicelabels.html');
require('./includes/tasks.html');
require('./includes/updateconfig.html');
import _ from 'lodash-es';
import { PorImageRegistryModel } from 'Docker/models/porImageRegistry';
angular.module('portainer.docker').controller('ServiceController', [
@ -51,6 +52,7 @@ angular.module('portainer.docker').controller('ServiceController', [
'EndpointProvider',
'clipboard',
'WebhookHelper',
'NetworkService',
function (
$q,
$scope,
@ -82,7 +84,8 @@ angular.module('portainer.docker').controller('ServiceController', [
WebhookService,
EndpointProvider,
clipboard,
WebhookHelper
WebhookHelper,
NetworkService
) {
$scope.state = {
updateInProgress: false,
@ -210,6 +213,25 @@ angular.module('portainer.docker').controller('ServiceController', [
$scope.updateMount = function updateMount(service) {
updateServiceArray(service, 'ServiceMounts', service.ServiceMounts);
};
$scope.addNetwork = function addNetwork(service) {
if (!service.Networks) {
service.Networks = [];
}
service.Networks.push({ Editable: true });
};
$scope.removeNetwork = function removeNetwork(service, index) {
var removedElement = service.Networks.splice(index, 1);
if (removedElement && removedElement.length && removedElement[0].Id) {
updateServiceArray(service, 'Networks', service.Networks);
}
};
$scope.updateNetwork = function updateNetwork(service) {
updateServiceArray(service, 'Networks', service.Networks);
};
$scope.addPlacementConstraint = function addPlacementConstraint(service) {
service.ServiceConstraints.push({ key: '', operator: '==', value: '' });
updateServiceArray(service, 'ServiceConstraints', service.ServiceConstraints);
@ -370,6 +392,14 @@ angular.module('portainer.docker').controller('ServiceController', [
config.TaskTemplate.ContainerSpec.Image = service.Image;
}
if ($scope.hasChanges(service, ['Networks'])) {
config.Networks = _.map(
_.filter(service.Networks, (item) => item.Id && item.Editable),
(item) => ({ Target: item.Id })
);
config.TaskTemplate.Networks = config.Networks;
}
config.TaskTemplate.ContainerSpec.Secrets = service.ServiceSecrets ? service.ServiceSecrets.map(SecretHelper.secretConfig) : [];
config.TaskTemplate.ContainerSpec.Configs = service.ServiceConfigs ? service.ServiceConfigs.map(ConfigHelper.configConfig) : [];
config.TaskTemplate.ContainerSpec.Hosts = service.Hosts ? ServiceHelper.translateHostnameIPToHostsEntries(service.Hosts) : [];
@ -629,11 +659,12 @@ angular.module('portainer.docker').controller('ServiceController', [
configs: apiVersion >= 1.3 ? ConfigService.configs() : [],
availableImages: ImageService.images(),
availableLoggingDrivers: PluginService.loggingPlugins(apiVersion < 1.25),
availableNetworks: NetworkService.networks(true, true, apiVersion >= 1.25),
settings: SettingsService.publicSettings(),
webhooks: WebhookService.webhooks(service.Id, EndpointProvider.endpointID()),
});
})
.then(function success(data) {
.then(async function success(data) {
$scope.nodes = data.nodes;
$scope.configs = data.configs;
$scope.secrets = data.secrets;
@ -642,6 +673,36 @@ angular.module('portainer.docker').controller('ServiceController', [
$scope.availableVolumes = data.volumes;
$scope.allowBindMounts = data.settings.AllowBindMountsForRegularUsers;
$scope.isAdmin = Authentication.isAdmin();
$scope.availableNetworks = data.availableNetworks;
$scope.swarmNetworks = _.filter($scope.availableNetworks, (network) => network.Scope === 'swarm');
const serviceNetworks = _.uniqBy(_.concat($scope.service.Model.Spec.Networks || [], $scope.service.Model.Spec.TaskTemplate.Networks || []), 'Target');
const networks = _.filter(
_.map(serviceNetworks, ({ Target }) => _.find(data.availableNetworks, { Id: Target })),
Boolean
);
if (_.some($scope.service.Ports, (port) => port.PublishMode === 'ingress')) {
const ingressNetwork = _.find($scope.availableNetworks, (network) => network.Ingress);
if (ingressNetwork) {
networks.unshift(ingressNetwork);
}
}
$scope.service.Networks = await Promise.all(
_.map(networks, async (item) => {
let addr = '';
if (item.IPAM.Config.length) {
addr = item.IPAM.Config[0].Subnet;
} else {
const network = await NetworkService.network(item.Id);
addr = (network && network.IPAM && network.IPAM.Config && network.IPAM.Config.length && network.IPAM.Config[0].Subnet) || '';
}
return { Id: item.Id, Name: item.Name, Addr: addr, Editable: !item.Ingress };
})
);
originalService.Networks = angular.copy($scope.service.Networks);
if (data.webhooks.length > 0) {
var webhook = data.webhooks[0];
@ -699,6 +760,11 @@ angular.module('portainer.docker').controller('ServiceController', [
previousServiceValues.push(name);
}
$scope.filterNetworks = filterNetworks;
function filterNetworks(networks, current) {
return networks.filter((network) => !network.Ingress && (network.Id === current.Id || $scope.service.Networks.every((serviceNetwork) => network.Id !== serviceNetwork.Id)));
}
function updateServiceArray(service, name) {
previousServiceValues.push(name);
service.hasChanges = true;