Skip to content

Add an agent knob that allows to specify driver when creating docker network #3751

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rumyax merged 7 commits into from
Feb 18, 2022
Merged

Add an agent knob that allows to specify driver when creating docker network #3751

Show file tree
Hide file tree
Changes from 4 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
5d1bd8a
adding UseNatDriver knob
rumyax Feb 17, 2022
c0db5c8
allow to choose driver
rumyax Feb 17, 2022
c919601
warning if specified driver not found
rumyax Feb 17, 2022
45314d2
warning msg improved
rumyax Feb 17, 2022
c27bb31
warning message in pipeline logs
rumyax Feb 18, 2022
7afa6d0
Merge branch 'master' into users/DenisRumyantsev/docker-network-creat…
DaniilShmelev Feb 18, 2022
0508c92
Add DockerNetworkCreateDriver as runtime knob
rumyax Feb 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/Agent.Sdk/Knob/AgentKnobs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,12 @@ public class AgentKnobs
new EnvironmentKnobSource("AGENT_DOCKER_MTU_VALUE"),
new BuiltInDefaultKnobSource(string.Empty));

public static readonly Knob DockerNetworkCreateDriver = new Knob(
nameof(DockerNetworkCreateDriver),
"Allow to specify which driver will be used when creating docker network",
new EnvironmentKnobSource("AZP_AGENT_DOCKER_NETWORK_CREATE_DRIVER"),
new BuiltInDefaultKnobSource(string.Empty));

// Directory structure
public static readonly Knob AgentToolsDirectory = new Knob(
nameof(AgentToolsDirectory),
Expand Down
29 changes: 22 additions & 7 deletions src/Agent.Worker/Container/DockerCommandManager.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,18 +227,33 @@ public async Task<int> DockerNetworkCreate(IExecutionContext context, string net
var usingWindowsContainers = context.Containers.Where(x => x.ExecutionOS != PlatformUtil.OS.Windows).Count() == 0;
var networkDrivers = await ExecuteDockerCommandAsync(context, "info", "-f \"{{range .Plugins.Network}}{{println .}}{{end}}\"");
var valueMTU = AgentKnobs.MTUValueForContainerJobs.GetValue(_knobContext).AsString();
var driver = AgentKnobs.DockerNetworkCreateDriver.GetValue(_knobContext).AsString();
string optionMTU = "";

if (!String.IsNullOrEmpty(valueMTU)) {

if (!String.IsNullOrEmpty(valueMTU))
{
optionMTU = $"-o \"com.docker.network.driver.mtu={valueMTU}\"";
}
}

if (usingWindowsContainers && networkDrivers.Contains("nat"))
string options = $"create --label {DockerInstanceLabel} {network} {optionMTU}";

if (!String.IsNullOrEmpty(driver))
{
if (networkDrivers.Contains(driver))
{
options += $" --driver {driver}";
}
else
{
Trace.Warning($"Specified '{driver}' driver not found!");
}
}
else if (usingWindowsContainers && networkDrivers.Contains("nat"))
{
return await ExecuteDockerCommandAsync(context, "network", $"create --label {DockerInstanceLabel} {network} {optionMTU} --driver nat", context.CancellationToken);
options += $" --driver nat";
}

return await ExecuteDockerCommandAsync(context, "network", $"create --label {DockerInstanceLabel} {network} {optionMTU}", context.CancellationToken);
return await ExecuteDockerCommandAsync(context, "network", options, context.CancellationToken);
}

public async Task<int> DockerNetworkRemove(IExecutionContext context, string network)
Expand Down Expand Up @@ -420,4 +435,4 @@ await processInvoker.ExecuteAsync(
return output;
}
}
}
}