Skip to content

Commit c29f582

Browse files
committed
feat: fix list releases issue
1 parent c2822d7 commit c29f582

6 files changed

Lines changed: 24 additions & 12 deletions

File tree

pkg/devspace/deploy/deployer/helm/deploy.go

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,11 @@ func (d *DeployConfig) Deploy(ctx *devspacecontext.Context, forceDeploy bool) (b
2929
hash = ""
3030
)
3131

32+
releaseNamespace := d.DeploymentConfig.Namespace
33+
if releaseNamespace == "" {
34+
releaseNamespace = ctx.KubeClient.Namespace()
35+
}
36+
3237
// Hash the chart directory if there is any
3338
_, err := os.Stat(ctx.ResolvePath(chartPath))
3439
if err == nil {
@@ -96,7 +101,7 @@ func (d *DeployConfig) Deploy(ctx *devspacecontext.Context, forceDeploy bool) (b
96101

97102
forceDeploy = forceDeploy || redeploy || deployCache.DeploymentConfigHash != deploymentConfigHash || helmCache.ValuesHash != deployValuesHash || helmCache.OverridesHash != helmOverridesHash || helmCache.ChartHash != hash
98103
if !forceDeploy {
99-
releases, err := d.Helm.ListReleases(ctx)
104+
releases, err := d.Helm.ListReleases(ctx, releaseNamespace)
100105
if err != nil {
101106
return false, err
102107
}
@@ -119,11 +124,7 @@ func (d *DeployConfig) Deploy(ctx *devspacecontext.Context, forceDeploy bool) (b
119124

120125
deployCache.DeploymentConfigHash = deploymentConfigHash
121126
helmCache.Release = releaseName
122-
if d.DeploymentConfig.Namespace != "" {
123-
helmCache.ReleaseNamespace = d.DeploymentConfig.Namespace
124-
} else {
125-
helmCache.ReleaseNamespace = ctx.KubeClient.Namespace()
126-
}
127+
helmCache.ReleaseNamespace = releaseNamespace
127128
helmCache.ChartHash = hash
128129
helmCache.ValuesHash = deployValuesHash
129130
helmCache.OverridesHash = helmOverridesHash

pkg/devspace/deploy/deployer/helm/status.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ func (d *DeployConfig) Status(ctx *devspacecontext.Context) (*deployer.StatusRes
2424
}
2525

2626
// Get all releases
27-
releases, err := d.Helm.ListReleases(ctx)
27+
releases, err := d.Helm.ListReleases(ctx, ctx.KubeClient.Namespace())
2828
if err != nil {
2929
return &deployer.StatusResult{
3030
Name: d.DeploymentConfig.Name,

pkg/devspace/helm/types/interface.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ type Client interface {
1010
InstallChart(ctx *devspacecontext.Context, releaseName string, releaseNamespace string, values map[string]interface{}, helmConfig *latest.HelmConfig) (*Release, error)
1111
Template(ctx *devspacecontext.Context, releaseName, releaseNamespace string, values map[string]interface{}, helmConfig *latest.HelmConfig) (string, error)
1212
DeleteRelease(ctx *devspacecontext.Context, releaseName string, releaseNamespace string) error
13-
ListReleases(ctx *devspacecontext.Context) ([]*Release, error)
13+
ListReleases(ctx *devspacecontext.Context, releaseNamespace string) ([]*Release, error)
1414
}
1515

1616
// Release is the helm release struct

pkg/devspace/helm/v3/client.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ func (c *client) InstallChart(ctx *devspacecontext.Context, releaseName string,
8888
return nil, err
8989
}
9090

91-
releases, err := c.ListReleases(ctx)
91+
releases, err := c.ListReleases(ctx, releaseNamespace)
9292
if err != nil {
9393
return nil, err
9494
}
@@ -157,11 +157,11 @@ func (c *client) DeleteRelease(ctx *devspacecontext.Context, releaseName string,
157157
return nil
158158
}
159159

160-
func (c *client) ListReleases(ctx *devspacecontext.Context) ([]*types.Release, error) {
160+
func (c *client) ListReleases(ctx *devspacecontext.Context, namespace string) ([]*types.Release, error) {
161161
args := []string{
162162
"list",
163163
"--namespace",
164-
ctx.KubeClient.Namespace(),
164+
namespace,
165165
"--max",
166166
strconv.Itoa(0),
167167
"--output",

pkg/devspace/pipeline/engine/basichandler/handler.go

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,12 @@ func NewBasicExecHandler() types.ExecHandler {
6767
type execHandler struct{}
6868

6969
func (e *execHandler) ExecHandler(ctx context.Context, args []string) error {
70+
select {
71+
case <-ctx.Done():
72+
return interp.NewExitStatus(255)
73+
default:
74+
}
75+
7076
if len(args) > 0 {
7177
hc := interp.HandlerCtx(ctx)
7278

pkg/devspace/pipeline/engine/pipelinehandler/handler.go

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,14 +93,19 @@ type execHandler struct {
9393
}
9494

9595
func (e *execHandler) ExecHandler(ctx context.Context, args []string) error {
96+
select {
97+
case <-ctx.Done():
98+
return interp.NewExitStatus(255)
99+
default:
100+
}
101+
96102
if len(args) > 0 {
97103
// handle special pipeline commands
98104
handled, err := e.handlePipelineCommands(ctx, args[0], args[1:])
99105
if handled || err != nil {
100106
return err
101107
}
102108
}
103-
104109
return e.basicHandler.ExecHandler(ctx, args)
105110
}
106111

0 commit comments

Comments
 (0)