Skip to content
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

Jump to bottom

Bump helm version used in test to 3.12.3 #1158

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Bump helm version used in test to 3.12.3 #1158

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
786ac55
Bump helm version used in test to 3.12.3
zentron Oct 11, 2023
023a5db
Print helm version in logs
zentron Oct 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion source/Calamari.Common/Features/Scripting/Python/InstallDependencies.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import importlib
import importlib
import subprocess
import sys

Expand Down
2 changes: 1 addition & 1 deletion source/Calamari.Tests/KubernetesFixtures/Helm3UpgradeFixture.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,6 @@ public async Task CustomHelmExeInPackage_RelativePath()
await TestCustomHelmExeInPackage_RelativePath("3.0.1");
}

protected override string ExplicitExeVersion => "3.0.2";
protected override string ExplicitExeVersion => "3.12.3";
}
}
4 changes: 3 additions & 1 deletion source/Calamari/Kubernetes/Conventions/HelmUpgradeConvention.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -346,17 +346,19 @@ static bool TryGenerateVariablesFile(RunningDeployment deployment, out string fi
void CheckHelmToolVersion(string customHelmExecutable, HelmVersion selectedVersion)
{
log.Verbose($"Helm version selected: {selectedVersion}");

StringBuilder stdout = new StringBuilder();
var result = SilentProcessRunner.ExecuteCommand(customHelmExecutable ?? "helm", "version --client --short", Environment.CurrentDirectory, output => stdout.Append(output), error => { });


if (result.ExitCode != 0)
log.Warn("Unable to retrieve the Helm tool version");

var toolVersion = HelmVersionParser.ParseVersion(stdout.ToString());

if (!toolVersion.HasValue)
log.Warn("Unable to parse the Helm tool version text: " + stdout);

log.Verbose($"Helm version reported: {toolVersion}");
if (toolVersion.Value != selectedVersion)
log.Warn($"The Helm tool version '{toolVersion.Value}' ('{stdout}') doesn't match the Helm version selected '{selectedVersion}'");
}
Expand Down