Skip to content

Commit b90e419

Browse files
authored
fixing values file name='values.yaml' (#6457)
1 parent b9e171d commit b90e419

File tree

1 file changed

+12
-0
lines changed

1 file changed

+12
-0
lines changed

pkg/pipeline/DeploymentPipelineConfigService.go

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2277,6 +2277,10 @@ func (impl *CdPipelineConfigServiceImpl) createCdPipeline(ctx context.Context, a
22772277
)
22782278
if pipeline.IsExternalArgoAppLinkRequest() {
22792279
overrideCreateRequest, err := impl.parseEnvOverrideCreateRequestForExternalAcdApp(deploymentConfig, latestChart, app, userId, pipeline, appLevelAppMetricsEnabled)
2280+
if err != nil {
2281+
impl.logger.Errorw("error in parsing override request for external acd app", "appId", app.Id, "err", err)
2282+
return 0, err
2283+
}
22802284
envOverride, updatedAppMetrics, err = impl.propertiesConfigService.CreateIfRequired(overrideCreateRequest, tx)
22812285
if err != nil {
22822286
impl.logger.Errorw("error in creating env override", "appId", app.Id, "envId", envOverride.TargetEnvironment, "err", err)
@@ -2501,6 +2505,14 @@ func (impl *CdPipelineConfigServiceImpl) GetValuesAndChartMetadataForExternalArg
25012505
return file.Data, helmChart.Metadata, nil
25022506
}
25032507
}
2508+
if valuesFileName == "values.yaml" && helmChart.Values != nil {
2509+
byteValues, err := json.Marshal(helmChart.Values)
2510+
if err != nil {
2511+
impl.logger.Errorw("error in json Marshal values", "values", helmChart.Values, "err", err)
2512+
return nil, nil, err
2513+
}
2514+
return byteValues, helmChart.Metadata, nil
2515+
}
25042516
return nil, nil, errors2.New(fmt.Sprintf("values file with name %s not found in chart", valuesFileName))
25052517
}
25062518

0 commit comments

Comments
 (0)