fixup! Add kubernetes host to the no proxy list

eclipse-che · Jan 18, 2024 · 711e1c0 · 711e1c0
1 parent a63ceed
commit 711e1c0
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 7 deletions.
diff --git a/controllers/che/proxy.go b/controllers/che/proxy.go
@@ -41,9 +41,6 @@ func GetProxyConfiguration(deployContext *chetypes.DeployContext) (*chetypes.Pro
 			return nil, err
 		}
 
-		// Add kubernetes host to the no proxy list.
-		cheClusterProxyConf.NoProxy = deploy.MergeNonProxy(cheClusterProxyConf.NoProxy, os.Getenv("KUBERNETES_SERVICE_HOST"))
-
 		// If proxy configuration exists in CR then cluster wide proxy configuration is ignored
 		// Non proxy hosts are merged
 		if cheClusterProxyConf.HttpProxy != "" {
@@ -54,10 +51,17 @@ func GetProxyConfiguration(deployContext *chetypes.DeployContext) (*chetypes.Pro
 			}
 			// Add cluster-wide trusted CA certs, if any
 			cheClusterProxyConf.TrustedCAMapName = clusterWideProxyConf.TrustedCAMapName
+			// Add kubernetes host to the no proxy list.
+			cheClusterProxyConf.NoProxy = deploy.MergeNonProxy(cheClusterProxyConf.NoProxy, os.Getenv("KUBERNETES_SERVICE_HOST"))
 			return cheClusterProxyConf, nil
 		} else {
-			clusterWideProxyConf.NoProxy = deploy.MergeNonProxy(clusterWideProxyConf.NoProxy, cheClusterProxyConf.NoProxy)
-			return clusterWideProxyConf, nil
+			// add openshift conf check
+			if clusterWideProxyConf.HttpProxy != "" {
+				// Add kubernetes host to the no proxy list.
+				cheClusterProxyConf.NoProxy = deploy.MergeNonProxy(cheClusterProxyConf.NoProxy, os.Getenv("KUBERNETES_SERVICE_HOST"))
+				clusterWideProxyConf.NoProxy = deploy.MergeNonProxy(clusterWideProxyConf.NoProxy, cheClusterProxyConf.NoProxy)
+				return clusterWideProxyConf, nil
+			}
 		}
 	}
 
@@ -66,6 +70,10 @@ func GetProxyConfiguration(deployContext *chetypes.DeployContext) (*chetypes.Pro
 	if err != nil {
 		return nil, err
 	}
-	cheClusterProxyConf.NoProxy = deploy.MergeNonProxy(cheClusterProxyConf.NoProxy, ".svc")
+	if cheClusterProxyConf.HttpProxy != "" {
+		// Add kubernetes host to the no proxy list.
+		cheClusterProxyConf.NoProxy = deploy.MergeNonProxy(cheClusterProxyConf.NoProxy, os.Getenv("KUBERNETES_SERVICE_HOST"))
+		cheClusterProxyConf.NoProxy = deploy.MergeNonProxy(cheClusterProxyConf.NoProxy, ".svc")
+	}
 	return cheClusterProxyConf, nil
 }
diff --git a/pkg/deploy/proxy.go b/pkg/deploy/proxy.go
@@ -122,7 +122,9 @@ func ReadCheClusterProxyConfiguration(ctx *chetypes.DeployContext) (*chetypes.Pr
 }
 
 func MergeNonProxy(noProxy1 string, noProxy2 string) string {
-	if noProxy1 == "" {
+	if noProxy1 == "" && noProxy2 == "" {
+		return ""
+	} else if noProxy1 == "" {
 		return noProxy2
 	} else if noProxy2 == "" {
 		return noProxy1