bug 1798921 BYO VPC proxy

openshift · Feb 12, 2020 · f49470a · f49470a
1 parent 25f4dc7
commit f49470a
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 16 deletions.
diff --git a/installing/installing_aws/installing-aws-private.adoc b/installing/installing_aws/installing-aws-private.adoc
@@ -48,8 +48,7 @@ include::modules/installation-configuration-parameters.adoc[leveloffset=+2]
 
 include::modules/installation-aws-config-yaml.adoc[leveloffset=+2]
 
-// Removing; Proxy not supported for AWS IPI for 4.2
-// include::modules/installation-configure-proxy.adoc[leveloffset=+2]
+include::modules/installation-configure-proxy.adoc[leveloffset=+2]
 
 include::modules/installation-launching-installer.adoc[leveloffset=+1]
 

diff --git a/installing/installing_aws/installing-aws-vpc.adoc b/installing/installing_aws/installing-aws-vpc.adoc
@@ -44,8 +44,7 @@ include::modules/installation-configuration-parameters.adoc[leveloffset=+2]
 
 include::modules/installation-aws-config-yaml.adoc[leveloffset=+2]
 
-// Removing; Proxy not supported for AWS IPI for 4.2
-// include::modules/installation-configure-proxy.adoc[leveloffset=+2]
+include::modules/installation-configure-proxy.adoc[leveloffset=+2]
 
 include::modules/installation-launching-installer.adoc[leveloffset=+1]
 

diff --git a/installing/installing_azure/installing-azure-private.adoc b/installing/installing_azure/installing-azure-private.adoc
@@ -34,8 +34,7 @@ include::modules/installation-configuration-parameters.adoc[leveloffset=+2]
 
 include::modules/installation-azure-config-yaml.adoc[leveloffset=+2]
 
-// Removing; Proxy not supported for Azure IPI for 4.2
-// include::modules/installation-configure-proxy.adoc[leveloffset=+2]
+include::modules/installation-configure-proxy.adoc[leveloffset=+2]
 
 include::modules/installation-launching-installer.adoc[leveloffset=+1]
 

diff --git a/installing/installing_azure/installing-azure-vnet.adoc b/installing/installing_azure/installing-azure-vnet.adoc
@@ -30,8 +30,7 @@ include::modules/installation-configuration-parameters.adoc[leveloffset=+2]
 
 include::modules/installation-azure-config-yaml.adoc[leveloffset=+2]
 
-// Removing; Proxy not supported for Azure IPI for 4.2
-// include::modules/installation-configure-proxy.adoc[leveloffset=+2]
+include::modules/installation-configure-proxy.adoc[leveloffset=+2]
 
 include::modules/installation-launching-installer.adoc[leveloffset=+1]
 

diff --git a/installing/installing_gcp/installing-gcp-private.adoc b/installing/installing_gcp/installing-gcp-private.adoc
@@ -22,10 +22,9 @@ include::modules/private-clusters-default.adoc[leveloffset=+1]
 
 include::modules/private-clusters-about-gcp.adoc[leveloffset=+2]
 
-include::modules/cluster-entitlements.adoc[leveloffset=+1]
+include::modules/installation-about-custom-gcp-vpc.adoc[leveloffset=+1]
 
-//uncomment after GCP VPC merges
-//include::modules/installation-about-custom-gcp-vpc.adoc[leveloffset=+1]
+include::modules/cluster-entitlements.adoc[leveloffset=+1]
 
 include::modules/ssh-agent-using.adoc[leveloffset=+1]
 
@@ -37,8 +36,7 @@ include::modules/installation-configuration-parameters.adoc[leveloffset=+2]
 
 //include::modules/installation-gcp-config-yaml.adoc[leveloffset=+2]
 
-// Removing; Proxy not supported for GCP IPI for 4.2
-// include::modules/installation-configure-proxy.adoc[leveloffset=+2]
+include::modules/installation-configure-proxy.adoc[leveloffset=+2]
 
 include::modules/installation-launching-installer.adoc[leveloffset=+1]
 

diff --git a/installing/installing_gcp/installing-gcp-vpc.adoc b/installing/installing_gcp/installing-gcp-vpc.adoc
@@ -30,8 +30,7 @@ include::modules/installation-configuration-parameters.adoc[leveloffset=+2]
 
 include::modules/installation-gcp-config-yaml.adoc[leveloffset=+2]
 
-// Removing; Proxy not supported for GCP IPI for 4.2
-// include::modules/installation-configure-proxy.adoc[leveloffset=+2]
+include::modules/installation-configure-proxy.adoc[leveloffset=+2]
 
 include::modules/installation-launching-installer.adoc[leveloffset=+1]
 

diff --git a/networking/enable-cluster-wide-proxy.adoc b/networking/enable-cluster-wide-proxy.adoc
@@ -9,7 +9,7 @@ Production environments can deny direct access to the Internet and instead have
 
 [IMPORTANT]
 ====
-The cluster-wide proxy is only supported if you used a user-provisioned infrastructure installation for a supported provider.
+The cluster-wide proxy is only supported if you used a user-provisioned infrastructure installation or provide your own networking, such as a virtual private cloud or virual network, for a supported provider.
 ====
 
 .Prerequisites