Skip to content

Commit 7479e66

Browse files
authored
Merge pull request #2160 from tukobadnyanoba/add-release-name-in-environment-variable
replaced name in helm with releaseName field
2 parents e2f796d + 568b84c commit 7479e66

2 files changed

Lines changed: 16 additions & 5 deletions

File tree

pkg/devspace/config/versions/latest/schema.go

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -780,6 +780,8 @@ type RollingUpdateConfig struct {
780780

781781
// HelmConfig defines the specific helm options used during deployment
782782
type HelmConfig struct {
783+
// ReleaseName of the helm configuration
784+
ReleaseName string `yaml:"releaseName,omitempty" json:"releaseName,omitempty"`
783785
// Chart holds the chart configuration and where DevSpace can find the chart
784786
Chart *ChartConfig `yaml:"chart,omitempty" json:"chart,omitempty" jsonschema:"required"`
785787
// Values are additional values that should get passed to deploying this chart

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

Lines changed: 14 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,16 @@ import (
2727

2828
// Deploy deploys the given deployment with helm
2929
func (d *DeployConfig) Deploy(ctx devspacecontext.Context, forceDeploy bool) (bool, error) {
30-
var (
30+
var releaseName string
31+
if d.DeploymentConfig.Helm.ReleaseName != "" {
32+
releaseName = d.DeploymentConfig.Helm.ReleaseName
33+
} else {
3134
releaseName = d.DeploymentConfig.Name
32-
chartPath = d.DeploymentConfig.Helm.Chart.Name
33-
hash = ""
35+
}
36+
37+
var (
38+
chartPath = d.DeploymentConfig.Helm.Chart.Name
39+
hash = ""
3440
)
3541

3642
releaseNamespace := ctx.KubeClient().Namespace()
@@ -152,9 +158,12 @@ func (d *DeployConfig) Deploy(ctx devspacecontext.Context, forceDeploy bool) (bo
152158
}
153159

154160
func (d *DeployConfig) internalDeploy(ctx devspacecontext.Context, overwriteValues map[string]interface{}, out io.Writer) (*types.Release, error) {
155-
var (
161+
var releaseName string
162+
if d.DeploymentConfig.Helm.ReleaseName != "" {
163+
releaseName = d.DeploymentConfig.Helm.ReleaseName
164+
} else {
156165
releaseName = d.DeploymentConfig.Name
157-
)
166+
}
158167
releaseNamespace := ctx.KubeClient().Namespace()
159168
if d.DeploymentConfig.Namespace != "" {
160169
releaseNamespace = d.DeploymentConfig.Namespace

0 commit comments

Comments
 (0)