Read trusted CA configmaps only from installation namespace

Signed-off-by: Mykola Morhun <mmorhun@redhat.com>
eclipse-che · Oct 6, 2021 · 2195827 · 2195827
1 parent 072f3c0
commit 2195827
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 1 deletion.
diff --git a/controllers/checlusterbackup/backup_data_collector.go b/controllers/checlusterbackup/backup_data_collector.go
@@ -220,7 +220,10 @@ func backupConfigMaps(bctx *BackupContext, destDir string) (bool, error) {
 		return true, err
 	}
 
-	fakeDeployContext := &deploy.DeployContext{ClusterAPI: deploy.ClusterAPI{Client: bctx.r.client}}
+	fakeDeployContext := &deploy.DeployContext{
+		ClusterAPI: deploy.ClusterAPI{Client: bctx.r.client},
+		CheCluster: bctx.cheCR,
+	}
 	caBundlesConfigmaps, err := deploy.GetCACertsConfigMaps(fakeDeployContext)
 	if err != nil {
 		return false, err

diff --git a/pkg/deploy/tls.go b/pkg/deploy/tls.go
@@ -595,6 +595,7 @@ func GetCACertsConfigMaps(deployContext *DeployContext) ([]corev1.ConfigMap, err
 	cheComponetLabelSelectorRequirement, _ := labels.NewRequirement(KubernetesPartOfLabelKey, selection.Equals, []string{CheEclipseOrg})
 	listOptions := &client.ListOptions{
 		LabelSelector: labels.NewSelector().Add(*cheComponetLabelSelectorRequirement).Add(*caBundleLabelSelectorRequirement),
+		Namespace:     deployContext.CheCluster.GetNamespace(),
 	}
 	if err := deployContext.ClusterAPI.Client.List(context.TODO(), CACertsConfigMapList, listOptions); err != nil {
 		return nil, err