Include additional cluster-wide trusted CA into Che

Signed-off-by: Mykola Morhun <mmorhun@redhat.com>
eclipse-che · Mar 15, 2021 · 3b3ea49 · 3b3ea49
1 parent 9f241d0
commit 3b3ea49
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/pkg/controller/che/proxy.go b/pkg/controller/che/proxy.go
@@ -48,14 +48,21 @@ func (r *ReconcileChe) getProxyConfiguration(checluster *orgv1.CheCluster) (*dep
 			} else {
 				cheClusterProxyConf.NoProxy = deploy.MergeNonProxy(cheClusterProxyConf.NoProxy, ".svc")
 			}
+			// Add cluster-wide trusted CA certs
+			if clusterWideProxyConf.TrustedCAMapName != "" {
+				cheClusterProxyConf.TrustedCAMapName = clusterWideProxyConf.TrustedCAMapName
+			}
 			return cheClusterProxyConf, nil
 		} else if clusterWideProxyConf.HttpProxy != "" {
 			clusterWideProxyConf.NoProxy = deploy.MergeNonProxy(clusterWideProxyConf.NoProxy, cheClusterProxyConf.NoProxy)
 			return clusterWideProxyConf, nil
 		}
 
-		// proxy isn't configured
-		return &deploy.Proxy{}, nil
+		// Proxy isn't configured
+		// However add cluster-wide trusted CA certificates, if any, to Che
+		return &deploy.Proxy{
+			TrustedCAMapName: clusterWideProxyConf.TrustedCAMapName,
+		}, nil
 	}
 
 	// OpenShift 3.x and k8s