Remove ImprovedHelmTemplateValuesFeatureToggle & usage (#1316)

OctopusDeploy · Aug 13, 2024 · 5459c1d · 5459c1d
1 parent 43069c9
commit 5459c1d
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/source/Calamari.Common/FeatureToggles/OctopusFeatureToggle.cs b/source/Calamari.Common/FeatureToggles/OctopusFeatureToggle.cs
@@ -4,7 +4,6 @@ namespace Calamari.Common.FeatureToggles
 {
     public static class OctopusFeatureToggles
     {
-        public static readonly OctopusFeatureToggle ImprovedHelmTemplateValuesFeatureToggle = new OctopusFeatureToggle("improved-helm-template-values");
         public static readonly OctopusFeatureToggle NonPrimaryGitDependencySupportFeatureToggle = new OctopusFeatureToggle("non-primary-git-dependency-support");
 
         public class OctopusFeatureToggle

diff --git a/source/Calamari/Kubernetes/Conventions/HelmUpgradeConvention.cs b/source/Calamari/Kubernetes/Conventions/HelmUpgradeConvention.cs
@@ -171,11 +171,9 @@ static void SetResetValuesParameter(RunningDeployment deployment, StringBuilder
 
         void SetValuesParameters(RunningDeployment deployment, StringBuilder sb)
         {
-            if (OctopusFeatureToggles.ImprovedHelmTemplateValuesFeatureToggle.IsEnabled(deployment.Variables))
-            {
-                SetOrderedTemplateValues(deployment, sb);
-            }
+            SetOrderedTemplateValues(deployment, sb);
 
+            //We leave the remaining values here as the users may not have migrated to the new structure
             foreach (var additionalValuesFile in AdditionalValuesFiles(deployment))
             {
                 sb.Append($" --values \"{additionalValuesFile}\"");