Skip to content

fix: rollback fix #5972

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
Oct 8, 2024
Merged

fix: rollback fix #5972

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
18 changes: 9 additions & 9 deletions pkg/deployment/manifest/ManifestCreationService.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -257,7 +257,7 @@ func (impl *ManifestCreationServiceImpl) GetValuesOverrideForTrigger(overrideReq
configMapJson, err = impl.getConfigMapAndSecretJsonV2(newCtx, request, envOverride)
if err != nil {
impl.logger.Errorw("error in fetching config map n secret ", "err", err)
configMapJson = nil
configMapJson.MergedJson = nil
}
appLabelJsonByte, err = impl.appCrudOperationService.GetAppLabelsForDeployment(newCtx, overrideRequest.AppId, overrideRequest.AppName, overrideRequest.EnvName)
if err != nil {
Expand All @@ -267,15 +267,15 @@ func (impl *ManifestCreationServiceImpl) GetValuesOverrideForTrigger(overrideReq
mergedValues, err := impl.mergeOverrideValues(envOverride, releaseOverrideJson, configMapJson.MergedJson, appLabelJsonByte, strategy)
appName := pipeline.DeploymentAppName
var k8sErr error
mergedValues, k8sErr = impl.updatedExternalCmCsHashForTrigger(newCtx, overrideRequest.ClusterId,
envOverride.Namespace, mergedValues, configMapJson.ExternalCmList, configMapJson.ExternalCsList)
if k8sErr != nil {
impl.logger.Errorw("error in updating external cm cs hash for trigger",
"clusterId", overrideRequest.ClusterId, "namespace", envOverride.Namespace, "err", k8sErr)
// error is not returned as it's not blocking for deployment process
// blocking deployments based on this use case can vary for user to user
}
if !envOverride.Environment.IsVirtualEnvironment {
mergedValues, k8sErr = impl.updatedExternalCmCsHashForTrigger(newCtx, overrideRequest.ClusterId,
envOverride.Namespace, mergedValues, configMapJson.ExternalCmList, configMapJson.ExternalCsList)
if k8sErr != nil {
impl.logger.Errorw("error in updating external cm cs hash for trigger",
"clusterId", overrideRequest.ClusterId, "namespace", envOverride.Namespace, "err", k8sErr)
// error is not returned as it's not blocking for deployment process
// blocking deployments based on this use case can vary for user to user
}
mergedValues, err = impl.autoscalingCheckBeforeTrigger(newCtx, appName, envOverride.Namespace, mergedValues, overrideRequest)
if err != nil {
impl.logger.Errorw("error in autoscaling check before trigger", "pipelineId", overrideRequest.PipelineId, "err", err)
Expand Down
Loading