Docker/portainer
Docker/portainer
1
0
Fork 0
mirror of https://github.com/portainer/portainer.git synced 2025-07-30 02:39:41 +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) {