Merge pull request #429 from jhadvig/bz1835551

Bug 1835551: Inject proxy envars to console-operator deployment
openshift · May 14, 2020 · 67e5ffb · 67e5ffb
2 parents d33a1b5 + b16b148
commit 67e5ffb
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 0 deletions.
diff --git a/manifests/07-operator.yaml b/manifests/07-operator.yaml
@@ -3,6 +3,8 @@ kind: Deployment
 metadata:
   name: console-operator
   namespace: openshift-console-operator
+  annotations:
+    config.openshift.io/inject-proxy: console-operator
 spec:
   replicas: 1
   selector:

diff --git a/pkg/console/controllers/route/controller.go b/pkg/console/controllers/route/controller.go
@@ -437,6 +437,7 @@ func clientWithCA(caPool *x509.CertPool) *http.Client {
 	return &http.Client{
 		Timeout: 5 * time.Second,
 		Transport: &http.Transport{
+			Proxy: http.ProxyFromEnvironment,
 			TLSClientConfig: &tls.Config{
 				RootCAs: caPool,
 			},