Skip to content

fix: External cm and secret in jobs not getting added as env variable in container #3815

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 5 commits into from
Aug 28, 2023
Merged

fix: External cm and secret in jobs not getting added as env variable in container #3815

Changes from 4 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
5b950b1
add external cm cs in jobs
Ashish-devtron Aug 22, 2023
6b8cb6f
add external cm cs in jobs
Ashish-devtron Aug 22, 2023
412f377
add external cm cs in jobs
Ashish-devtron Aug 23, 2023
0b7ab47
add external cm cs in jobs
Ashish-devtron Aug 23, 2023
71c011b
add volumes in template
Ashish-devtron Aug 24, 2023
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: 8 additions & 10 deletions pkg/pipeline/WorkflowService.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -378,7 +378,7 @@ func (impl *WorkflowServiceImpl) SubmitWorkflow(workflowRequest *WorkflowRequest
}

if isJob {
ciTemplate, err = getCiTemplateWithConfigMapsAndSecrets(&configMaps, &secrets, ciTemplate, existingConfigMap, existingSecrets)
ciTemplate, err = getCiTemplateWithConfigMapsAndSecrets(existingConfigMap, existingSecrets, ciTemplate)
}
if impl.ciConfig.UseBlobStorageConfigInCiWorkflow || !workflowRequest.IsExtRun {
gcpBlobConfig := workflowRequest.GcpBlobConfig
Expand Down Expand Up @@ -589,25 +589,23 @@ func (impl *WorkflowServiceImpl) SubmitWorkflow(workflowRequest *WorkflowRequest
func getConfigMapsAndSecrets(workflowRequest *WorkflowRequest, existingConfigMap *bean3.ConfigMapJson, existingSecrets *bean3.ConfigSecretJson) (bean3.ConfigMapJson, bean3.ConfigSecretJson, error) {
configMaps := bean3.ConfigMapJson{}
secrets := bean3.ConfigSecretJson{}
for _, cm := range existingConfigMap.Maps {
for index, cm := range existingConfigMap.Maps {
if cm.External {
continue
}
cm.Name = cm.Name + "-" + strconv.Itoa(workflowRequest.WorkflowId) + "-" + CI_WORKFLOW_NAME
existingConfigMap.Maps[index] = cm
configMaps.Maps = append(configMaps.Maps, cm)
}
for i := range configMaps.Maps {
configMaps.Maps[i].Name = configMaps.Maps[i].Name + "-" + strconv.Itoa(workflowRequest.WorkflowId) + "-" + CI_WORKFLOW_NAME
}

for _, s := range existingSecrets.Secrets {
for index, s := range existingSecrets.Secrets {
if s.External {
continue
}
s.Name = s.Name + "-" + strconv.Itoa(workflowRequest.WorkflowId) + "-" + CI_WORKFLOW_NAME
existingSecrets.Secrets[index] = s
secrets.Secrets = append(secrets.Secrets, s)
}
for i := range secrets.Secrets {
secrets.Secrets[i].Name = secrets.Secrets[i].Name + "-" + strconv.Itoa(workflowRequest.WorkflowId) + "-" + CI_WORKFLOW_NAME
}
return configMaps, secrets, nil
}

Expand Down Expand Up @@ -751,7 +749,7 @@ func processConfigMap(impl *WorkflowServiceImpl, configMaps *bean3.ConfigMapJson
}
return configsMapping, nil
}
func getCiTemplateWithConfigMapsAndSecrets(configMaps *bean3.ConfigMapJson, secrets *bean3.ConfigSecretJson, ciTemplate v1alpha1.Template, existingConfigMap *bean3.ConfigMapJson, existingSecrets *bean3.ConfigSecretJson) (v1alpha1.Template, error) {
func getCiTemplateWithConfigMapsAndSecrets(configMaps *bean3.ConfigMapJson, secrets *bean3.ConfigSecretJson, ciTemplate v1alpha1.Template) (v1alpha1.Template, error) {
var secretMap []bean3.ConfigSecretMap
for _, cs := range secrets.Secrets {
secretMap = append(secretMap, *cs)
Expand Down