Skip to content

fix: onboard acd app #6457

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Mar 19, 2025
Merged

fix: onboard acd app #6457

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 12 additions & 0 deletions pkg/pipeline/DeploymentPipelineConfigService.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2277,6 +2277,10 @@ func (impl *CdPipelineConfigServiceImpl) createCdPipeline(ctx context.Context, a
)
if pipeline.IsExternalArgoAppLinkRequest() {
overrideCreateRequest, err := impl.parseEnvOverrideCreateRequestForExternalAcdApp(deploymentConfig, latestChart, app, userId, pipeline, appLevelAppMetricsEnabled)
if err != nil {
impl.logger.Errorw("error in parsing override request for external acd app", "appId", app.Id, "err", err)
return 0, err
}
envOverride, updatedAppMetrics, err = impl.propertiesConfigService.CreateIfRequired(overrideCreateRequest, tx)
if err != nil {
impl.logger.Errorw("error in creating env override", "appId", app.Id, "envId", envOverride.TargetEnvironment, "err", err)
Expand Down Expand Up @@ -2501,6 +2505,14 @@ func (impl *CdPipelineConfigServiceImpl) GetValuesAndChartMetadataForExternalArg
return file.Data, helmChart.Metadata, nil
}
}
if valuesFileName == "values.yaml" && helmChart.Values != nil {
byteValues, err := json.Marshal(helmChart.Values)
if err != nil {
impl.logger.Errorw("error in json Marshal values", "values", helmChart.Values, "err", err)
return nil, nil, err
}
return byteValues, helmChart.Metadata, nil
}
return nil, nil, errors2.New(fmt.Sprintf("values file with name %s not found in chart", valuesFileName))
}

Expand Down
Loading