Merge pull request #374 from 0xff-dev/fix-helm-install

bjwswang · web-flow · commit 3d25e65d187a · 2023-10-18T09:49:48.000+08:00
fix: unsupported namespace setting during creation
diff --git a/pkg/helm/common.go b/pkg/helm/common.go
@@ -88,6 +88,7 @@ func NewHelmWrapper(getter genericclioptions.RESTClientGetter, namespace string,
 	}); err != nil {
 		return nil, err
 	}
+	settings.SetNamespace(namespace)
 	buf := new(bytes.Buffer)
 	registryClient, err := registry.NewClient(
 		registry.ClientOptDebug(settings.Debug),
@@ -234,7 +235,7 @@ func (h *HelmWrapper) Install(ctx context.Context, logger logr.Logger, client *a
 		}
 	}
 
-	// client.Namespace = settings.Namespace()
+	client.Namespace = settings.Namespace()
 
 	// Create context and prepare the handle of SIGTERM
 	// ctx := context.Background()

Original file line number	Diff line number	Diff line change
`@@ -88,6 +88,7 @@ func NewHelmWrapper(getter genericclioptions.RESTClientGetter, namespace string,`
`88`	`88`	`}); err != nil {`
`89`	`89`	`return nil, err`
`90`	`90`	`}`
	`91`	`+ settings.SetNamespace(namespace)`
`91`	`92`	`buf := new(bytes.Buffer)`
`92`	`93`	`registryClient, err := registry.NewClient(`
`93`	`94`	`registry.ClientOptDebug(settings.Debug),`
`@@ -234,7 +235,7 @@ func (h HelmWrapper) Install(ctx context.Context, logger logr.Logger, client a`
`234`	`235`	`}`
`235`	`236`	`}`
`236`	`237`
`237`		`- // client.Namespace = settings.Namespace()`
	`238`	`+ client.Namespace = settings.Namespace()`
`238`	`239`
`239`	`240`	`// Create context and prepare the handle of SIGTERM`
`240`	`241`	`// ctx := context.Background()`