Merge pull request #6333 from devtron-labs/fix-chart-repo-delete

vikramdevtron · web-flow · commit 6e394374dd5a · 2025-01-29T11:59:57.000+05:30
fix: error in deleting chart repo from global config
diff --git a/client/argocdServer/repoCredsK8sClient/repoCreds.go b/client/argocdServer/repoCredsK8sClient/repoCreds.go
@@ -573,7 +573,7 @@ func (impl *RepositoryCredsK8sClientImpl) DeleteChartRepository(argoK8sConfig *a
 		retryCount = retryCount + 1
 
 		var isFoundInArgoCdCm bool
-		cm, err := impl.K8sService.GetConfigMap(argoK8sConfig.AcdConfigMapName, argoK8sConfig.AcdConfigMapName, k8sClient)
+		cm, err := impl.K8sService.GetConfigMap(argoK8sConfig.AcdNamespace, argoK8sConfig.AcdConfigMapName, k8sClient)
 		if err != nil {
 			return err
 		}

Original file line number	Diff line number	Diff line change
`@@ -573,7 +573,7 @@ func (impl RepositoryCredsK8sClientImpl) DeleteChartRepository(argoK8sConfig a`
`573`	`573`	`retryCount = retryCount + 1`
`574`	`574`
`575`	`575`	`var isFoundInArgoCdCm bool`
`576`		`- cm, err := impl.K8sService.GetConfigMap(argoK8sConfig.AcdConfigMapName, argoK8sConfig.AcdConfigMapName, k8sClient)`
	`576`	`+ cm, err := impl.K8sService.GetConfigMap(argoK8sConfig.AcdNamespace, argoK8sConfig.AcdConfigMapName, k8sClient)`
`577`	`577`	`if err != nil {`
`578`	`578`	`return err`
`579`	`579`	`}`