and she's working

OctopusDeploy · Dec 2, 2024 · dcf09f6 · dcf09f6
1 parent 2e8ebb1
commit dcf09f6
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/installer/Octopus.Tentacle.Installer/Product.wxs b/installer/Octopus.Tentacle.Installer/Product.wxs
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <Wix xmlns="http://schemas.microsoft.com/wix/2006/wi" xmlns:netfx="http://schemas.microsoft.com/wix/NetFxExtension">
   <?define TargetFramework = "{TargetFramework}" ?>
   <?if $(var.Platform) = x64 ?>
@@ -14,7 +14,7 @@
     - Product/Version      : Change this every major build
     - Product/UpgradeCode  : Never change this
   -->
-  <Product Id="*" Name="Octopus Deploy Tentacle" Language="1033" Version="8.1.1518" Manufacturer="Octopus Deploy Pty. Ltd." UpgradeCode="1B32E04F-49C2-4907-8879-A556986F7F16">
+  <Product Id="*" Name="Octopus Deploy Tentacle" Language="1033" Version="8.2.2506" Manufacturer="Octopus Deploy Pty. Ltd." UpgradeCode="1B32E04F-49C2-4907-8879-A556986F7F16">
     <Package InstallerVersion="200" Compressed="yes" Description="Octopus Deploy Tentacle" Platform="$(var.Platform)" InstallScope="perMachine" />
     <Media Id="1" Cabinet="Files.cab" EmbedCab="yes" />
     <Property Id="MSIFASTINSTALL" Value="3" />

diff --git a/source/Octopus.Tentacle/Kubernetes/KubernetesRawScriptPodCreator.cs b/source/Octopus.Tentacle/Kubernetes/KubernetesRawScriptPodCreator.cs
@@ -45,7 +45,7 @@ protected override async Task<IList<V1Container>> CreateInitContainers(StartKube
                 Image = command.PodImageConfiguration?.Image ?? await containerResolver.GetContainerImageForCluster(),
                 ImagePullPolicy = KubernetesConfig.ScriptPodPullPolicy,
                 Command = new List<string> { "sh", "-c", GetInitExecutionScript("/nfs-mount", homeDir, workspacePath) },
-                VolumeMounts = new List<V1VolumeMount> { new("/nfs-mount", "init-nfs-volume"), new(homeDir, "tentacle-home"), new ("/root/.config/helm/registry", "helm_registry_config_dir") },
+                VolumeMounts = new List<V1VolumeMount> { new("/nfs-mount", "init-nfs-volume"), new(homeDir, "tentacle-home"), new ("/root/.config/helm/registry", "helm-registry-config-dir") },
                 Resources = new V1ResourceRequirements
                 {
                     Requests = new Dictionary<string, ResourceQuantity>

diff --git a/source/Octopus.Tentacle/Kubernetes/KubernetesScriptPodCreator.cs b/source/Octopus.Tentacle/Kubernetes/KubernetesScriptPodCreator.cs
@@ -234,7 +234,7 @@ await CreateScriptContainer(command, podName, scriptName, homeDir, workspacePath
 
         protected virtual async Task<IList<V1Container>> CreateInitContainers(StartKubernetesScriptCommandV1 command, string podName, string homeDir, string workspacePath)
         {
-            return new List<V1Container> { await helmUpgradeInitContainer.Create(podName, "secretName", "helm-registry-config-dir") };
+            return new List<V1Container> { await helmUpgradeInitContainer.Create(podName, "agent-upgrade", "helm-registry-config-dir") };
         }
 
         IList<V1Volume> CreateVolumes(StartKubernetesScriptCommandV1 command)
@@ -337,7 +337,7 @@ protected async Task<V1Container> CreateScriptContainer(StartKubernetesScriptCom
                 VolumeMounts = new List<V1VolumeMount>
                 {
                     new(homeDir, "tentacle-home"),
-                    new("/root/.config/helm/registry/", "helm_registry_config_dir") // this is an empty directory populated by the init container.
+                    new("/root/.config/helm/registry/", "helm-registry-config-dir") // this is an empty directory populated by the init container.
                 },
                 Env = new List<V1EnvVar>
                 {