move private networking to profile setting

Author: elasticroentgen

CloudController.cs

@@ -64,7 +64,7 @@ private async Task<string> GenerateName()
         return name;
     }
 
-    public async Task<Machine> CreateNewRunner(string arch, string size, string runnerToken, string targetName, bool isCustom = false, string profileName = "default", bool usePrivateNetworks = false)
+    public async Task<Machine> CreateNewRunner(string arch, string size, string runnerToken, string targetName, bool isCustom = false, string profileName = "default")
     {
 
         // Select VM size for job - All AMD 
@@ -164,7 +164,7 @@ public async Task<Machine> CreateNewRunner(string arch, string size, string runn
             }
             try
             {
-                var privateNetworks = usePrivateNetworks ? networks.Select(x => x.Id).ToList() : new List<long>();
+                var privateNetworks = profile.UsePrivateNetworks ? networks.Select(x => x.Id).ToList() : new List<long>();
 
                 newSrv = await _client.Server.Create(dataCenters[ct], imageId.Value, name, srvType.Value, userData: cloudInitcontent, sshKeysIds: srvKeys, privateNetoworksIds: privateNetworks);
                 success = true;

Models/RunnerProfile.cs

@@ -7,4 +7,5 @@ public class RunnerProfile
     public string OsImageName { get; set; }
     public bool IsCustomImage { get; set; }
     public string Name { get; set; }
+    public bool UsePrivateNetworks { get; set; }
 }

PoolManager.cs

@@ -558,7 +558,7 @@ private async Task<bool> CreateRunner(CreateRunnerTask rt)
                 TargetType.Organization => runner.Owner,
                 _ => throw new ArgumentOutOfRangeException()
             };
-            Machine newRunner = await _cc.CreateNewRunner(runner.Arch, runner.Size, rt.RunnerToken, targetName, runner.IsCustom, runner.Profile, runner.UsePrivateNetwork);
+            Machine newRunner = await _cc.CreateNewRunner(runner.Arch, runner.Size, rt.RunnerToken, targetName, runner.IsCustom, runner.Profile);
             _logger.LogInformation($"New Runner {newRunner.Name} [{runner.Size} on {runner.Arch}] entering pool for {targetName}.");
             MachineCreatedCount.Labels(runner.Owner, runner.Size).Inc();
 

Program.cs

@@ -340,10 +340,7 @@ private static async Task<IResult> RunnerStateReportHandler(HttpRequest request,
                         Arch = runner.Arch,
                         IPv4 = string.Empty,
                         IsCustom = runner.IsCustom,
-                        Owner = runner.Owner,
-                        UsePrivateNetwork = runner.UsePrivateNetwork
-                        
-
+                        Owner = runner.Owner
                     };
                     await db.Runners.AddAsync(newRunner);
                     await db.SaveChangesAsync();
@@ -632,8 +629,7 @@ private static async Task JobQueued(ILogger<Program> logger, string repoName, Li
             Arch = arch,
             IPv4 = string.Empty,
             IsCustom = isCustom,
-            Owner = owner,
-            UsePrivateNetwork = labels.Contains("use-cache-server")
+            Owner = owner
 
         };
         await db.Runners.AddAsync(newRunner);