Skip to content

fix: argocd-cm empty data label nil pointer fix #3443

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 11 commits into from
Jun 7, 2023
Merged

fix: argocd-cm empty data label nil pointer fix #3443

Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
10d246c
config map data nil pointer fix
prakash100198 May 29, 2023
85c284d
Merge branch 'main' into argocd-cm-data-nil-pointer-check-added
prakash100198 May 29, 2023
9628039
check for nil config map
prakash100198 May 30, 2023
3509c03
creating secret for public chart repo
prakash100198 Jun 5, 2023
3cd13c6
Merge branch 'main' into argocd-cm-data-nil-pointer-check-added
prakash100198 Jun 5, 2023
3a0b6f3
delete chart repo based on it's presence in argocd-cm
prakash100198 Jun 6, 2023
4e7dc98
code for unique chart name while adding a chart repo
prakash100198 Jun 6, 2023
cf43284
secret creation doesn't support uppercase letters hence adding checks
prakash100198 Jun 7, 2023
9315887
Merge branch 'main' into argocd-cm-data-nil-pointer-check-added
prakash100198 Jun 7, 2023
ae4b1f6
minor change
prakash100198 Jun 7, 2023
8402952
minor fix
prakash100198 Jun 7, 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
14 changes: 8 additions & 6 deletions pkg/chartRepo/ChartRepositoryService.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -172,13 +172,15 @@ func (impl *ChartRepositoryServiceImpl) CreateChartRepo(request *ChartRepoDto) (
if err != nil {
return nil, err
}
data, err := impl.updateRepoData(cm.Data, request)
if err != nil {
impl.logger.Warnw(" config map update failed", "err", err)
continue
if cm.Data != nil {
data, err := impl.updateRepoData(cm.Data, request)
if err != nil {
impl.logger.Warnw(" config map update failed", "err", err)
continue
}
cm.Data = data
_, err = impl.K8sUtil.UpdateConfigMap(impl.aCDAuthConfig.ACDConfigMapNamespace, cm, client)
}
cm.Data = data
_, err = impl.K8sUtil.UpdateConfigMap(impl.aCDAuthConfig.ACDConfigMapNamespace, cm, client)
} else {
secretLabel := make(map[string]string)
secretLabel[LABEL] = REPOSITORY
Expand Down