Embed GO

OctopusDeploy · Mar 15, 2024 · 41a76d9 · 41a76d9
1 parent c211a35
commit 41a76d9
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 2 deletions.
diff --git a/source/Octopus.Tentacle/Kubernetes/Scripts/RunningKubernetesPod.cs b/source/Octopus.Tentacle/Kubernetes/Scripts/RunningKubernetesPod.cs
@@ -37,6 +37,14 @@ public delegate RunningKubernetesPod Factory(
             using var reader = new StreamReader(stream!, Encoding.UTF8);
             return await reader.ReadToEndAsync();
         });
+
+        static readonly AsyncLazy<byte[]> BootstrapRunnerExe = new(async () =>
+        {
+            using var stream = typeof(RunningKubernetesPod).Assembly.GetManifestResourceStream("Octopus.Tentacle.Kubernetes.bootstrap");
+            var mem = new MemoryStream();
+            await stream!.CopyToAsync(mem);
+            return mem.ToArray();
+        });
 
         readonly IScriptWorkspace workspace;
         readonly ScriptTicket scriptTicket;
@@ -313,6 +321,7 @@ async Task CreatePod(IScriptLogWriter writer, string? imagePullSecretName, Cance
 
             //write the bootstrap runner script to the workspace
             workspace.WriteFile("bootstrapRunner.sh", await BootstrapRunnerScript.Task);
+            workspace.WriteAllBytes("bootstrap", await BootstrapRunnerExe.Task);
 
             var scriptName = Path.GetFileName(workspace.BootstrapScriptFilePath);
 
@@ -342,8 +351,8 @@ async Task CreatePod(IScriptLogWriter writer, string? imagePullSecretName, Cance
                             Command = new List<string> { "bash" },
                             Args = new List<string>
                                 {
-                                    $"/octopus/Work/{scriptTicket.TaskId}/bootstrapRunner.sh",
-                                    $"/octopus/Work/{scriptTicket.TaskId}",
+                                    $"/octopus/Work/{scriptTicket.TaskId}/bootstrap",
+                                    //$"/octopus/Work/{scriptTicket.TaskId}",
                                     $"/octopus/Work/{scriptTicket.TaskId}/{scriptName}"
                                 }.Concat(workspace.ScriptArguments ?? Array.Empty<string>())
                                 .ToList(),

diff --git a/source/Octopus.Tentacle/Kubernetes/bootstrap b/source/Octopus.Tentacle/Kubernetes/bootstrap
diff --git a/source/Octopus.Tentacle/Octopus.Tentacle.csproj b/source/Octopus.Tentacle/Octopus.Tentacle.csproj
@@ -128,5 +128,9 @@
 	  <EmbeddedResource Include="Kubernetes\bootstrapRunner.sh">
 	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
 	  </EmbeddedResource>
+	  <None Remove="Kubernetes\bootstrap" />
+	  <EmbeddedResource Include="Kubernetes\bootstrap">
+	    <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+	  </EmbeddedResource>
 	</ItemGroup>
 </Project>
diff --git a/source/Octopus.Tentacle/Scripts/IScriptWorkspace.cs b/source/Octopus.Tentacle/Scripts/IScriptWorkspace.cs
@@ -22,5 +22,6 @@ public interface IScriptWorkspace
         string LogFilePath { get; }
         void WriteFile(string filename, string contents);
         Stream OpenFileStreamForReading(string filename);
+        void WriteAllBytes(string filename, byte[] contents);
     }
 }
diff --git a/source/Octopus.Tentacle/Scripts/ScriptWorkspace.cs b/source/Octopus.Tentacle/Scripts/ScriptWorkspace.cs
@@ -35,6 +35,7 @@ public ScriptWorkspace(
         const string LogFileName = "Output.log";
         public string LogFilePath => GetLogFilePath(WorkingDirectory);
         public void WriteFile(string filename, string contents) => FileSystem.OverwriteFile(ResolvePath(filename), contents);
+        public void WriteAllBytes(string filename, byte[] contents) => FileSystem.WriteAllBytes(ResolvePath(filename), contents);
 
         public Stream OpenFileStreamForReading(string filename) => FileSystem.OpenFile(ResolvePath(filename), FileMode.Open, FileAccess.Read, FileShare.ReadWrite);