Skip to content

Commit 8cbdcd3

Browse files
committed
Don't create provided namespace
Adding support for Helm 3 introduced creating namespaces because Helm does not do this automatically anymore. However, a regression was introduced that always creates namespaces, even if a dedicated namespace is provided via CLI flag. Signed-off-by: Reinhard Naegele <[email protected]>
1 parent ecd4546 commit 8cbdcd3

File tree

1 file changed

+10
-5
lines changed

1 file changed

+10
-5
lines changed

pkg/chart/chart.go

+10-5
Original file line numberDiff line numberDiff line change
@@ -16,11 +16,12 @@ package chart
1616

1717
import (
1818
"fmt"
19-
"github.com/Masterminds/semver"
2019
"io/ioutil"
2120
"path/filepath"
2221
"strings"
2322

23+
"github.com/Masterminds/semver"
24+
2425
"github.com/helm/chart-testing/v3/pkg/config"
2526
"github.com/helm/chart-testing/v3/pkg/exec"
2627
"github.com/helm/chart-testing/v3/pkg/tool"
@@ -541,8 +542,10 @@ func (t *Testing) doInstall(chart *Chart) error {
541542
namespace, release, releaseSelector, cleanup := t.generateInstallConfig(chart)
542543
defer cleanup()
543544

544-
if err := t.kubectl.CreateNamespace(namespace); err != nil {
545-
return err
545+
if t.config.Namespace != "" {
546+
if err := t.kubectl.CreateNamespace(namespace); err != nil {
547+
return err
548+
}
546549
}
547550
if err := t.helm.InstallWithValues(chart.Path(), valuesFile, namespace, release); err != nil {
548551
return err
@@ -579,8 +582,10 @@ func (t *Testing) doUpgrade(oldChart, newChart *Chart, oldChartMustPass bool) er
579582
namespace, release, releaseSelector, cleanup := t.generateInstallConfig(oldChart)
580583
defer cleanup()
581584

582-
if err := t.kubectl.CreateNamespace(namespace); err != nil {
583-
return err
585+
if t.config.Namespace != "" {
586+
if err := t.kubectl.CreateNamespace(namespace); err != nil {
587+
return err
588+
}
584589
}
585590
// Install previous version of chart. If installation fails, ignore this release.
586591
if err := t.helm.InstallWithValues(oldChart.Path(), valuesFile, namespace, release); err != nil {

0 commit comments

Comments
 (0)