Skip to content

fix: cm cs rc 28 #6329

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 3 commits into from
Jan 28, 2025
Merged

fix: cm cs rc 28 #6329

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
64ffa44
removed teh duplicate append for cm cs
RajeevRanjan27 Jan 28, 2025
1b85988
added down script for the build infra cm cs
RajeevRanjan27 Jan 28, 2025
6cf1278
modified the down script
RajeevRanjan27 Jan 28, 2025
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: 7 additions & 5 deletions pkg/pipeline/WorkflowService.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,18 +175,18 @@ func (impl *WorkflowServiceImpl) createWorkflowTemplate(workflowRequest *types.W
}
} else {
if shouldAddExistingCmCsInWorkflow {
workflowConfigMaps, workflowSecrets, err = impl.addExistingCmCsInWorkflowForCDStage(workflowRequest, workflowConfigMaps, workflowSecrets)
cdStageConfigMaps, cdStageSecrets, err := impl.addExistingCmCsInWorkflowForCDStage(workflowRequest)
if err != nil {
impl.Logger.Errorw("error occurred while adding existing cm/ cs", "err", err)
return bean3.WorkflowTemplate{}, err
}
cdStageConfigMaps, cdStageSecrets, err := impl.prepareCmCsForWorkflowTemplate(workflowRequest, workflowConfigMaps, workflowSecrets)
cdStageModifiedConfigMaps, cdStageModifiedSecrets, err := impl.prepareCmCsForWorkflowTemplate(workflowRequest, cdStageConfigMaps, cdStageSecrets)
if err != nil {
impl.Logger.Errorw("error occurred while preparing cd stage cm/ cs for workflow template", "err", err)
return bean3.WorkflowTemplate{}, err
}
workflowConfigMaps = append(workflowConfigMaps, cdStageConfigMaps...)
workflowSecrets = append(workflowSecrets, cdStageSecrets...)
workflowConfigMaps = append(workflowConfigMaps, cdStageModifiedConfigMaps...)
workflowSecrets = append(workflowSecrets, cdStageModifiedSecrets...)
}
}
// internally inducing BlobStorageCmName and BlobStorageSecretName for getting logs, caches and artifacts from
Expand Down Expand Up @@ -273,7 +273,9 @@ func (impl *WorkflowServiceImpl) appendGlobalCMCS(workflowRequest *types.Workflo
return workflowConfigMaps, workflowSecrets, nil
}

func (impl *WorkflowServiceImpl) addExistingCmCsInWorkflowForCDStage(workflowRequest *types.WorkflowRequest, workflowConfigMaps []bean.ConfigSecretMap, workflowSecrets []bean.ConfigSecretMap) ([]bean.ConfigSecretMap, []bean.ConfigSecretMap, error) {
func (impl *WorkflowServiceImpl) addExistingCmCsInWorkflowForCDStage(workflowRequest *types.WorkflowRequest) ([]bean.ConfigSecretMap, []bean.ConfigSecretMap, error) {
workflowConfigMaps := make([]bean.ConfigSecretMap, 0)
workflowSecrets := make([]bean.ConfigSecretMap, 0)
existingConfigMap, existingSecrets, err := impl.configMapService.GetCmCsForPrePostStageTrigger(workflowRequest.Scope, workflowRequest.AppId, workflowRequest.EnvironmentId, false)
if err != nil {
impl.Logger.Errorw("failed to get configmap data", "err", err)
Expand Down
4 changes: 4 additions & 0 deletions scripts/sql/31602800_build_infra_cm_cs.down.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,8 @@ DROP TABLE IF EXISTS "public"."infra_config_trigger_history";
-- Drop Sequence for infra_config_trigger_history
DROP SEQUENCE IF EXISTS "public"."id_seq_infra_config_trigger_history";

--hard deleting the entries
DELETE FROM "public"."infra_profile_configuration"
WHERE key = 8 or key =9;

END;
Loading