Merge pull request #13619 from jerolimov/use-http-proxy-in-dev-console-proxies

OCPBUGS-29757: Use HTTP proxy configuration from environment variables in dev-console proxies, so that our backend proxies works fine on airgapped clusters

Author: openshift-merge-bot[bot]

pkg/devconsole/proxy/proxy.go

@@ -70,16 +70,21 @@ func serve(r *http.Request) (ProxyResponse, error) {
 	}
 	serviceRequest.URL.RawQuery = query.Encode()
 
-	var serviceClient *http.Client
+	var serviceTransport *http.Transport
 	if request.AllowInsecure {
-		serviceTransport := &http.Transport{
-			TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
-		}
-		serviceClient = &http.Client{
-			Transport: serviceTransport,
+		serviceTransport = &http.Transport{
+			Proxy: http.ProxyFromEnvironment,
+			TLSClientConfig: &tls.Config{
+				InsecureSkipVerify: true,
+			},
 		}
 	} else {
-		serviceClient = &http.Client{}
+		serviceTransport = &http.Transport{
+			Proxy: http.ProxyFromEnvironment,
+		}
+	}
+	serviceClient := &http.Client{
+		Transport: serviceTransport,
 	}
 
 	serviceResponse, err := serviceClient.Do(serviceRequest)

pkg/knative/handler.go

@@ -247,16 +247,21 @@ func sendPost(invokeRequest InvokeServiceRequestBody, endpoint string) (invokeRe
 		}
 	}
 
-	var serviceClient *http.Client
+	var serviceTransport *http.Transport
 	if invokeRequest.AllowInsecure {
-		serviceTransport := &http.Transport{
-			TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
-		}
-		serviceClient = &http.Client{
-			Transport: serviceTransport,
+		serviceTransport = &http.Transport{
+			Proxy: http.ProxyFromEnvironment,
+			TLSClientConfig: &tls.Config{
+				InsecureSkipVerify: true,
+			},
 		}
 	} else {
-		serviceClient = &http.Client{}
+		serviceTransport = &http.Transport{
+			Proxy: http.ProxyFromEnvironment,
+		}
+	}
+	serviceClient := &http.Client{
+		Transport: serviceTransport,
 	}
 
 	serviceResponse, err := serviceClient.Do(serviceRequest)