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

feat(networks): add ipv6 support (#3717)

Browse source 
* feat(portainer-core): add ipv6 support

* feat(networks): add few changes

* refacto(networks): write regex once

* fix(networks): fix indentation

* refacto(networks): use foreach instead map and pluralize ipvxconfig

* refacto(networks): pluralize ipvxconfig

* feat(networks): support ipv6 with ports

* feat(networks): add an explicit error message

* fix(networks): hide ipv6 configuration when creating macvlan
This commit is contained in:
Maxime Bajeux 2020-04-28 02:34:54 +02:00 • committed by GitHub
parent b2f36a3bbe
commit 3de533042d
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
16 changed files with 262 additions and 72 deletions
Download patch file Download diff file Expand all files Collapse all files

50
app/docker/views/networks/create/createNetworkController.js
View file

@ -16,10 +16,18 @@ angular.module('portainer.docker').controller('CreateNetworkController', [
function ($q, $scope, $state, PluginService, Notifications, NetworkService, LabelHelper, Authentication, ResourceControlService, FormValidator, HttpRequestHelper) {
$scope.formValues = {
DriverOptions: [],
Subnet: '',
Gateway: '',
IPRange: '',
AuxAddress: '',
IPV4: {
Subnet: '',
Gateway: '',
IPRange: '',
AuxAddress: ''
},
IPV6: {
Subnet: '',
Gateway: '',
IPRange: '',
AuxAddress: ''
},
Labels: [],
AccessControlData: new AccessControlFormData(),
NodeName: null,
@ -38,6 +46,7 @@ angular.module('portainer.docker').controller('CreateNetworkController', [
CheckDuplicate: true,
Internal: false,
Attachable: false,
EnableIPv6: false,
// Force IPAM Driver to 'default', should not be required.
// See: https://github.com/docker/docker/issues/25735
IPAM: {
@ -70,20 +79,35 @@ angular.module('portainer.docker').controller('CreateNetworkController', [
};
function prepareIPAMConfiguration(config) {
if ($scope.formValues.Subnet) {
var ipamConfig = {};
ipamConfig.Subnet = $scope.formValues.Subnet;
if ($scope.formValues.Gateway) {
ipamConfig.Gateway = $scope.formValues.Gateway;
if ($scope.formValues.IPV4.Subnet) {
let ipamConfig = {};
ipamConfig.Subnet = $scope.formValues.IPV4.Subnet;
if ($scope.formValues.IPV4.Gateway) {
ipamConfig.Gateway = $scope.formValues.IPV4.Gateway;
}
if ($scope.formValues.IPRange) {
ipamConfig.IPRange = $scope.formValues.IPRange;
if ($scope.formValues.IPV4.IPRange) {
ipamConfig.IPRange = $scope.formValues.IPV4.IPRange;
}
if ($scope.formValues.AuxAddress) {
ipamConfig.AuxAddress = $scope.formValues.AuxAddress;
if ($scope.formValues.IPV4.AuxAddress) {
ipamConfig.AuxAddress = $scope.formValues.IPV4.AuxAddress;
}
config.IPAM.Config.push(ipamConfig);
}
if ($scope.formValues.IPV6.Subnet) {
let ipamConfig = {};
ipamConfig.Subnet = $scope.formValues.IPV6.Subnet;
if ($scope.formValues.IPV6.Gateway) {
ipamConfig.Gateway = $scope.formValues.IPV6.Gateway;
}
if ($scope.formValues.IPV6.IPRange) {
ipamConfig.IPRange = $scope.formValues.IPV6.IPRange;
}
if ($scope.formValues.IPV6.AuxAddress) {
ipamConfig.AuxAddress = $scope.formValues.IPV6.AuxAddress;
}
config.EnableIPv6 = true;
config.IPAM.Config.push(ipamConfig);
}
}
function prepareDriverOptions(config) {

47
app/docker/views/networks/create/createnetwork.html
View file

@ -68,29 +68,58 @@
<!-- !macvlan-management -->
<div ng-hide="config.Driver === 'macvlan' && formValues.Macvlan.Scope === 'swarm'">
<div class="col-sm-12 form-section-title">
Network configuration
IPV4 Network configuration
</div>
<!-- subnet-gateway-inputs -->
<div class="form-group">
<label for="network_subnet" class="col-sm-2 col-lg-1 control-label text-left">Subnet</label>
<label for="ipv4_network_subnet" class="col-sm-2 col-lg-1 control-label text-left">Subnet</label>
<div class="col-sm-4 col-lg-5">
<input type="text" class="form-control" ng-model="formValues.Subnet" id="network_subnet" placeholder="e.g. 172.20.0.0/16" />
<input type="text" class="form-control" ng-model="formValues.IPV4.Subnet" id="ipv4_network_subnet" placeholder="e.g. 172.20.0.0/16" />
</div>
<label for="network_gateway" class="col-sm-2 col-lg-1 control-label text-left">Gateway</label>
<label for="ipv4_network_gateway" class="col-sm-2 col-lg-1 control-label text-left">Gateway</label>
<div class="col-sm-4 col-lg-5">
<input type="text" class="form-control" ng-model="formValues.Gateway" id="network_gateway" placeholder="e.g. 172.20.10.11" />
<input type="text" class="form-control" ng-model="formValues.IPV4.Gateway" id="ipv4_network_gateway" placeholder="e.g. 172.20.10.11" />
</div>
</div>
<!-- !subnet-gateway-inputs -->
<!-- iprange-auxaddr-inputs -->
<div class="form-group">
<label for="network_iprange" class="col-sm-2 col-lg-1 control-label text-left">IP range</label>
<label for="ipv4_network_iprange" class="col-sm-2 col-lg-1 control-label text-left">IP range</label>
<div class="col-sm-4 col-lg-5">
<input type="text" class="form-control" ng-model="formValues.IPRange" id="network_iprange" placeholder="e.g. 172.20.10.128/25" />
<input type="text" class="form-control" ng-model="formValues.IPV4.IPRange" id="ipv4_network_iprange" placeholder="e.g. 172.20.10.128/25" />
</div>
<label for="network_auxaddr" class="col-sm-2 col-lg-1 control-label text-left">Exclude IPs</label>
<label for="ipv4_network_auxaddr" class="col-sm-2 col-lg-1 control-label text-left">Exclude IPs</label>
<div class="col-sm-4 col-lg-5">
<input type="text" class="form-control" ng-model="formValues.AuxAddress" id="network_auxaddr" placeholder="e.g. my-router=172.20.10.129" />
<input type="text" class="form-control" ng-model="formValues.IPV4.AuxAddress" id="ipv4_network_auxaddr" placeholder="e.g. my-router=172.20.10.129" />
</div>
</div>
<!-- !iprange-auxaddr-inputs -->
</div>
<div ng-show="config.Driver === 'bridge' || (config.Driver === 'macvlan' && formValues.Macvlan.Scope !== 'swarm')">
<div class="col-sm-12 form-section-title">
IPV6 Network configuration
</div>
<!-- subnet-gateway-inputs -->
<div class="form-group">
<label for="ipv6_network_subnet" class="col-sm-2 col-lg-1 control-label text-left">Subnet</label>
<div class="col-sm-4 col-lg-5">
<input type="text" class="form-control" ng-model="formValues.IPV6.Subnet" id="ipv6_network_subnet" placeholder="e.g. 2001:db8::/48" />
</div>
<label for="ipv6_network_gateway" class="col-sm-2 col-lg-1 control-label text-left">Gateway</label>
<div class="col-sm-4 col-lg-5">
<input type="text" class="form-control" ng-model="formValues.IPV6.Gateway" id="ipv6_network_gateway" placeholder="e.g. 2001:db8::1" />
</div>
</div>
<!-- !subnet-gateway-inputs -->
<!-- iprange-auxaddr-inputs -->
<div class="form-group">
<label for="ipv6_network_iprange" class="col-sm-2 col-lg-1 control-label text-left">IP range</label>
<div class="col-sm-4 col-lg-5">
<input type="text" class="form-control" ng-model="formValues.IPV6.IPRange" id="ipv6_network_iprange" placeholder="e.g. 2001:db8::/64" />
</div>
<label for="ipv6_network_auxaddr" class="col-sm-2 col-lg-1 control-label text-left">Exclude IPs</label>
<div class="col-sm-4 col-lg-5">
<input type="text" class="form-control" ng-model="formValues.IPV6.AuxAddress" id="ipv6_network_auxaddr" placeholder="e.g. my-router=2001:db8::1" />
</div>
</div>
<!-- !iprange-auxaddr-inputs -->

18
app/docker/views/networks/edit/network.html
View file

@ -41,9 +41,21 @@
<td>Internal</td>
<td>{{ network.Internal }}</td>
</tr>
<tr ng-if="network.IPAM.Config.length > 0" ng-repeat="config in network.IPAM.Config">
<td>Subnet - {{ config.Subnet }}</td>
<td>Gateway - {{ config.Gateway }}</td>
<tr ng-if="network.IPAM.IPV4Configs.length > 0" ng-repeat-start="config in network.IPAM.IPV4Configs">
<td>IPV4 Subnet - {{ config.Subnet }}</td>
<td>IPV4 Gateway - {{ config.Gateway }}</td>
</tr>
<tr ng-if="network.IPAM.IPV4Configs.length > 0" ng-repeat-end>
<td>IPV4 IP range - {{ config.IPRange }}</td>
<td>IPV4 Excluded Ips - {{ config.AuxAddress }}</td>
</tr>
<tr ng-if="network.IPAM.IPV6Configs.length > 0" ng-repeat-start="config in network.IPAM.IPV6Configs">
<td>IPV6 Subnet - {{ config.Subnet }}</td>
<td>IPV6 Gateway - {{ config.Gateway }}</td>
</tr>
<tr ng-if="network.IPAM.IPV6Configs.length > 0" ng-repeat-end>
<td>IPV6 IP range - {{ config.IPRange }}</td>
<td>IPV6 Excluded Ips - {{ config.AuxAddress }}</td>
</tr>
</tbody>
</table>

4
app/docker/views/networks/edit/networkController.js
View file

@ -1,3 +1,5 @@
import DockerNetworkHelper from 'Docker/helpers/networkHelper';
angular.module('portainer.docker').controller('NetworkController', [
'$scope',
'$state',
@ -101,6 +103,8 @@ angular.module('portainer.docker').controller('NetworkController', [
if (endpointProvider !== 'VMWARE_VIC') {
getContainersInNetwork(data);
}
$scope.network.IPAM.IPV4Configs = DockerNetworkHelper.getIPV4Configs($scope.network.IPAM.Config);
$scope.network.IPAM.IPV6Configs = DockerNetworkHelper.getIPV6Configs($scope.network.IPAM.Config);
})
.catch(function error(err) {
Notifications.error('Failure', err, 'Unable to retrieve network info');

6
app/docker/views/networks/networksController.js
View file

@ -1,4 +1,5 @@
import _ from 'lodash-es';
import DockerNetworkHelper from 'Docker/helpers/networkHelper';
angular.module('portainer.docker').controller('NetworksController', [
'$q',
@ -71,6 +72,11 @@ angular.module('portainer.docker').controller('NetworksController', [
} else {
$scope.networks = networks;
}
_.forEach($scope.networks, (network) => {
network.IPAM.IPV4Configs = DockerNetworkHelper.getIPV4Configs(network.IPAM.Config);
network.IPAM.IPV6Configs = DockerNetworkHelper.getIPV6Configs(network.IPAM.Config);
});
})
.catch((err) => {
$scope.networks = [];