Skip to content

Commit 9d58f09

Browse files
committed
nil check in envOverride.chart
1 parent 3d19466 commit 9d58f09

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

pkg/deployment/manifest/ManifestCreationService.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@ import (
3838
bean3 "github.com/devtron-labs/devtron/pkg/deployment/manifest/bean"
3939
"github.com/devtron-labs/devtron/pkg/deployment/manifest/deployedAppMetrics"
4040
"github.com/devtron-labs/devtron/pkg/deployment/manifest/deploymentTemplate"
41+
"github.com/devtron-labs/devtron/pkg/deployment/manifest/deploymentTemplate/adapter"
4142
bean2 "github.com/devtron-labs/devtron/pkg/deployment/manifest/deploymentTemplate/bean"
4243
"github.com/devtron-labs/devtron/pkg/deployment/manifest/deploymentTemplate/chartRef"
4344
"github.com/devtron-labs/devtron/pkg/deployment/manifest/deploymentTemplate/read"
@@ -472,10 +473,9 @@ func (impl *ManifestCreationServiceImpl) getEnvOverrideForLastSavedConfigTrigger
472473
impl.logger.Errorw("error in creating envConfig", "data", envOverride, "error", err)
473474
return nil, err
474475
}
476+
envOverride = adapter.EnvOverrideDBToDTO(envOverrideDBObj)
475477
}
476-
if envOverride != nil {
477-
envOverride.Chart = chart
478-
}
478+
envOverride.Chart = chart
479479
} else if envOverride.Id > 0 && !envOverride.IsOverride {
480480
_, span = otel.Tracer("orchestrator").Start(ctx, "chartRepository.FindLatestChartForAppByAppId")
481481
chart, err = impl.chartRepository.FindLatestChartForAppByAppId(overrideRequest.AppId)

0 commit comments

Comments
 (0)